Index: AXimpl/AifMessage/EventHandler/CustomerCreator.cls.xml
===================================================================
diff -u -r42127 -r42128
--- AXimpl/AifMessage/EventHandler/CustomerCreator.cls.xml	(.../CustomerCreator.cls.xml)	(revision 42127)
+++ AXimpl/AifMessage/EventHandler/CustomerCreator.cls.xml	(.../CustomerCreator.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantGemaaktEvent:TECH.Events.KlantMaakEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXimpl.Request).%New("Customer/Create",KlantGemaaktEvent.Data.GeefKlantID())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: AXimpl/AifGenerator.cls.xml
===================================================================
diff -u -r42127 -r42128
--- AXimpl/AifGenerator.cls.xml	(.../AX/Uitgaand/common/impl/AifGenerator.cls.xml)	(revision 42127)
+++ AXimpl/AifGenerator.cls.xml	(.../AXimpl/Generator.cls.xml)	(revision 42128)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="AX.Uitgaand.common.impl.AifGenerator">
+<Class name="AXimpl.Generator">
 <Super>TECH.Mockable</Super>
 
 <Property name="FileWriter">
Index: vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r42127 -r42128
--- vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 42127)
+++ vhTest/Fake/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 42128)
@@ -5,7 +5,7 @@
 Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>AX.Uitgaand.common.impl.AifGenerator</Super>
+<Super>AXimpl.Generator</Super>
 
 <Method name="Generate">
 <FormalSpec>Command:AXimpl.Request</FormalSpec>
FishEye: Tag 42128 refers to a dead (removed) revision in file `AX/Uitgaand/common/impl/AifGenerator.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml
===================================================================
diff -u -r42127 -r42128
--- AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 42127)
+++ AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 42128)
@@ -9,7 +9,7 @@
 </Property>
 
 <Property name="Generator">
-<Type>AX.Uitgaand.common.impl.AifGenerator</Type>
+<Type>AXimpl.Generator</Type>
 <Private>1</Private>
 </Property>
 
@@ -26,14 +26,14 @@
 </Method>
 
 <Method name="%OnNew">
-<FormalSpec>MessageRepository:AX.AifMessage.MessageRepository,Generator:AX.Uitgaand.common.impl.AifGenerator</FormalSpec>
+<FormalSpec>MessageRepository:AX.AifMessage.MessageRepository,Generator:AXimpl.Generator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..MessageRepository = $$$Inject(MessageRepository, ##class(AXdata.AifMessage.MessageRepository).%New())
-	Set ..Generator = $$$Inject(Generator, ##class(AX.Uitgaand.common.impl.AifGenerator).%New())
+	Set ..Generator = $$$Inject(Generator, ##class(AXimpl.Generator).%New())
 	Set ..ErrorFinder = ##class(AXimpl.AifMessage.ResponseErrorFinder).%New()
 	Quit $$$OK
 ]]></Implementation>
Index: AXimpl/AifMessage/EventHandler/SalesInvoiceCreator.cls.xml
===================================================================
diff -u -r42127 -r42128
--- AXimpl/AifMessage/EventHandler/SalesInvoiceCreator.cls.xml	(.../SalesInvoiceCreator.cls.xml)	(revision 42127)
+++ AXimpl/AifMessage/EventHandler/SalesInvoiceCreator.cls.xml	(.../SalesInvoiceCreator.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>VerkoopfactuurGemaaktEvent:DOM.VKP.event.VerkoopfactuurGemaaktEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXimpl.Request).%New("SalesInvoice/Create",VerkoopfactuurGemaaktEvent.Data.GeefFactuurID())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r42127 -r42128
--- vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 42127)
+++ vhTest/Mock/AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 42128)
@@ -6,7 +6,7 @@
 Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
 Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>AX.Uitgaand.common.impl.AifGenerator,Tools.Mock.MockClassBase</Super>
+<Super>AXimpl.Generator,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="Generate">
Index: AXimpl/AifMessage/EventHandler/CustomerUpdaterPart1.cls.xml
===================================================================
diff -u -r42127 -r42128
--- AXimpl/AifMessage/EventHandler/CustomerUpdaterPart1.cls.xml	(.../CustomerUpdaterPart1.cls.xml)	(revision 42127)
+++ AXimpl/AifMessage/EventHandler/CustomerUpdaterPart1.cls.xml	(.../CustomerUpdaterPart1.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantWijzigEvent:TECH.Events.KlantWijzigEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXimpl.Request).%New("Customer/UpdatePart1",KlantWijzigEvent.Data.GeefKlantID())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r42127 -r42128
--- vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42127)
+++ vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42128)
@@ -35,7 +35,7 @@
 	
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create",KlantId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -56,7 +56,7 @@
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/UpdatePart1",KlantId))
 		
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -97,7 +97,7 @@
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"ReadResponse.xml")
 	#dim ReadResponse As AXaif.Message.Envelope = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/UpdatePart2",KlantId,ReadResponse))
 		
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -119,7 +119,7 @@
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -141,7 +141,7 @@
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -177,7 +177,7 @@
 	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.AifMessage.EventRaiser).%New()
 	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent","PurchaseInvoice/Create",AankoopFactuur.GeefID(),$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
 
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,EventRaiserMock)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,EventRaiserMock)
 	do Generator.Generate(##class(AXimpl.Request).%New("PurchaseInvoice/Create",AankoopFactuur.GeefID()))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
@@ -199,7 +199,7 @@
 	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.AifMessage.EventRaiser).%New()
 	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent",$$$ElkeWaarde).ExactAantalKeer(0)
 	
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)
+	set Generator = ##class(AXimpl.Generator).%New(RequestComposerStub,FileWriterMock,EventRaiserMock)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create","K||1234"))
 	
 	do FileWriterMock.Verifieer()
Index: AXimpl/BizTalkMessage/EventHandler/CustomerUpdate.cls.xml
===================================================================
diff -u -r37965 -r42128
--- AXimpl/BizTalkMessage/EventHandler/CustomerUpdate.cls.xml	(.../CustomerUpdate.cls.xml)	(revision 37965)
+++ AXimpl/BizTalkMessage/EventHandler/CustomerUpdate.cls.xml	(.../CustomerUpdate.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantWijzigEvent:TECH.Events.KlantWijzigEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXBizTalk.Crm.Customer.Request).%New("Crm/Customer",KlantWijzigEvent.Data.GeefKlantID())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: AXimpl/BizTalkMessage/EventHandler/CustomerAddressDelete.cls.xml
===================================================================
diff -u -r38336 -r42128
--- AXimpl/BizTalkMessage/EventHandler/CustomerAddressDelete.cls.xml	(.../CustomerAddressDelete.cls.xml)	(revision 38336)
+++ AXimpl/BizTalkMessage/EventHandler/CustomerAddressDelete.cls.xml	(.../CustomerAddressDelete.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantAdresVerwijderdEvent:DOM.VKP.VanHoeckeKlant.event.KlantAdresVerwijderdEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXBizTalk.Crm.Customer.Request).%New("Crm/CustomerAddressDelete",KlantAdresVerwijderdEvent.Data.GeefKlantAdresId())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: AXimpl/BizTalkMessage/EventHandler/CustomerAddressUpdate.cls.xml
===================================================================
diff -u -r38331 -r42128
--- AXimpl/BizTalkMessage/EventHandler/CustomerAddressUpdate.cls.xml	(.../CustomerAddressUpdate.cls.xml)	(revision 38331)
+++ AXimpl/BizTalkMessage/EventHandler/CustomerAddressUpdate.cls.xml	(.../CustomerAddressUpdate.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantAdresWijzigEvent:DOM.VKP.VanHoeckeKlant.event.KlantAdresGewijzigdEvent</FormalSpec>
 <Implementation><![CDATA[
-	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	set Generator = ##class(AXimpl.Generator).%New()
 	set Request = ##class(AXBizTalk.Crm.Customer.Request).%New("Crm/CustomerAddressUpsert",KlantAdresWijzigEvent.Data.GeefKlantAdresId())
 	do Generator.Generate(Request)
 ]]></Implementation>
Index: AXimpl/BizTalkMessage/EventHandler/CustomerAddressInsert.cls.xml
===================================================================
diff -u -r38332 -r42128
--- AXimpl/BizTalkMessage/EventHandler/CustomerAddressInsert.cls.xml	(.../CustomerAddressInsert.cls.xml)	(revision 38332)
+++ AXimpl/BizTalkMessage/EventHandler/CustomerAddressInsert.cls.xml	(.../CustomerAddressInsert.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>KlantAdresGemaaktEvent:DOM.VKP.VanHoeckeKlant.event.KlantAdresGemaaktEvent</FormalSpec>
 <Implementation><![CDATA[
-	Set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	Set Generator = ##class(AXimpl.Generator).%New()
 	Set Request = ##class(AXBizTalk.Crm.Customer.Request).%New("Crm/CustomerAddressUpsert",KlantAdresGemaaktEvent.Data.GeefKlantAdresId())
 	Do Generator.Generate(Request)
 ]]></Implementation>
Index: AXimpl/BizTalkMessage/EventHandler/AgendaAdresUpdate.cls.xml
===================================================================
diff -u -r38468 -r42128
--- AXimpl/BizTalkMessage/EventHandler/AgendaAdresUpdate.cls.xml	(.../AgendaAdresUpdate.cls.xml)	(revision 38468)
+++ AXimpl/BizTalkMessage/EventHandler/AgendaAdresUpdate.cls.xml	(.../AgendaAdresUpdate.cls.xml)	(revision 42128)
@@ -7,7 +7,7 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>AgendaAdresWijzigEvent:BL.Derde.Agenda.event.AgendaAdresGewijzigdEvent</FormalSpec>
 <Implementation><![CDATA[
-	Set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New()
+	Set Generator = ##class(AXimpl.Generator).%New()
 	Set Request = ##class(AXBizTalk.Crm.Geolocation.Request).%New("Crm/GeolocationUpsert",AgendaAdresWijzigEvent.Data.GeefAdresID())
 	Do Generator.Generate(Request)
 ]]></Implementation>