Index: AXimpl/AifMessage/Converter/PurchaseInvoiceConverter.cls.xml
===================================================================
diff -u -r42152 -r42193
--- AXimpl/AifMessage/Converter/PurchaseInvoiceConverter.cls.xml	(.../PurchaseInvoiceConverter.cls.xml)	(revision 42152)
+++ AXimpl/AifMessage/Converter/PurchaseInvoiceConverter.cls.xml	(.../PurchaseInvoiceConverter.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -24,13 +24,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,AankoopFactuurRepository:DOM.AKP.AankoopFactuur.impl.AankoopFactuurRepository,AankoopAPI:DOM.AKP.AankoopAPI</FormalSpec>
+<FormalSpec>FirmaBepaler:AXimpl.InterneFirmaBepaler,AankoopFactuurRepository:DOM.AKP.AankoopFactuur.impl.AankoopFactuurRepository,AankoopAPI:DOM.AKP.AankoopAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AXimpl.InterneFirmaBepaler).%New())
 	set ..AankoopAPI = $$$Inject(AankoopAPI,##class(DOM.DomeinContext).Instance().GeefAankoopAPI())
 	set ..AankoopFactuurRepository = ##class(DOM.AKP.AankoopFactuur.impl.AankoopFactuurRepository).%New()
 	set ..Formatter = ##class(AXimpl.Formatter).%New()
Index: AX/Uitgaand/BKH/GrootboekRekeningSaldi/impl/DixfConverter.cls.xml
===================================================================
diff -u -r42113 -r42193
--- AX/Uitgaand/BKH/GrootboekRekeningSaldi/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42113)
+++ AX/Uitgaand/BKH/GrootboekRekeningSaldi/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -14,13 +14,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler</FormalSpec>
+<FormalSpec>FirmaBepaler:AXimpl.InterneFirmaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AX.common.impl.FirmaBepaler).%New())
+	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AXimpl.InterneFirmaBepaler).%New())
 	Set ..Formatter = ##class(AXimpl.Formatter).%New()
 	
 	Quit $$$OK
Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r42128 -r42193
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 42128)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 42193)
@@ -19,7 +19,7 @@
 </Property>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -35,7 +35,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
+	set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
 	set ..FileWriter = $$$Inject(FileWriter,##class(AXimpl.FileWriter).%New())
 	set ..EventRaiser = $$$Inject(EventRaiser,##class(AXimpl.AifMessage.EventRaiser).%New())
 	set ..RequestComposer = $$$Inject(RequestComposer,##class(AXimpl.RequestComposer).%New())
Index: vhTest/Mock/AX/common/impl/FirmaBepaler.cls.xml
===================================================================
diff -u -r34686 -r42193
--- vhTest/Mock/AX/common/impl/FirmaBepaler.cls.xml	(.../FirmaBepaler.cls.xml)	(revision 34686)
+++ vhTest/Mock/AX/common/impl/FirmaBepaler.cls.xml	(.../FirmaBepaler.cls.xml)	(revision 42193)
@@ -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.common.impl.FirmaBepaler,Tools.Mock.MockClassBase</Super>
+<Super>AXimpl.InterneFirmaBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="GeefInitialen">
FishEye: Tag 42193 refers to a dead (removed) revision in file `AX/common/impl/FirmaBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42160 -r42193
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42160)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.Mockable</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -25,7 +25,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
+	set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
 	set ..MessageManager = $$$Inject(MessageManager,##class(AX.Uitgaand.common.impl.MessageManager).%New())
 	set ..RequestGeneratorConfig = ##class(AXimpl.RequestGeneratorConfig).%New()
 	Quit $$$OK
Index: AX/Uitgaand/VKP/OpenstaandeLeverancierFactuur/impl/DixfConverter.cls.xml
===================================================================
diff -u -r42113 -r42193
--- AX/Uitgaand/VKP/OpenstaandeLeverancierFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42113)
+++ AX/Uitgaand/VKP/OpenstaandeLeverancierFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,13 +29,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,AankoopAPI:DOM.AKP.AankoopAPI</FormalSpec>
+<FormalSpec>FirmaBepaler:AXimpl.InterneFirmaBepaler,AankoopAPI:DOM.AKP.AankoopAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AX.common.impl.FirmaBepaler).%New())
+	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AXimpl.InterneFirmaBepaler).%New())
 	Set ..AankoopAPI = $$$Inject(AankoopAPI,##class(DOM.DomeinContext).Instance().GeefAankoopAPI())
 	
 	Set ..Formatter = ##class(AXimpl.Formatter).%New()
Index: AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml
===================================================================
diff -u -r36470 -r42193
--- AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 36470)
+++ AX/Uitgaand/BKH/OpenstaandeVerkoopFactuur/impl/TransactionRepository.cls.xml	(.../TransactionRepository.cls.xml)	(revision 42193)
@@ -8,7 +8,7 @@
 </Property>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -23,7 +23,7 @@
 	
 	set ..ClassMethodExecuter = ##class(TECH.Executer.impl.ClassMethod).%New()
 	set ..ClassName = "AX.Uitgaand.BKH.OpenstaandeVerkoopFactuur.data.Transactions"_##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_BKH_OpenstaandeVerkoopFactuur_Transaction_Storage")
-	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
+	set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
 	
 	quit $$$OK
 ]]></Implementation>
Index: AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml
===================================================================
diff -u -r42113 -r42193
--- AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42113)
+++ AX/Uitgaand/VKP/OpenstaandeKlantFactuur/impl/DixfConverter.cls.xml	(.../DixfConverter.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -34,13 +34,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,VerkoopAPI:DOM.VKP.VerkoopAPI,OrderAPI:DOM.VKP.OrderAPI</FormalSpec>
+<FormalSpec>FirmaBepaler:AXimpl.InterneFirmaBepaler,VerkoopAPI:DOM.VKP.VerkoopAPI,OrderAPI:DOM.VKP.OrderAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AX.common.impl.FirmaBepaler).%New())
+	Set ..FirmaBepaler = $$$Inject(FirmaBepaler, ##class(AXimpl.InterneFirmaBepaler).%New())
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set ..OrderAPI = $$$Inject(OrderAPI,##class(DOM.DomeinContext).Instance().GeefOrderAPI())	
 	
Index: AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml
===================================================================
diff -u -r42152 -r42193
--- AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml	(.../SalesInvoiceConverter.cls.xml)	(revision 42152)
+++ AXimpl/AifMessage/Converter/SalesInvoiceConverter.cls.xml	(.../SalesInvoiceConverter.cls.xml)	(revision 42193)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -45,13 +45,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>FirmaBepaler:AX.common.impl.FirmaBepaler,VerkoopAPI:DOM.VKP.VerkoopAPI,OrderAPI:DOM.VKP.OrderAPI,Utils:AXimpl.Utils</FormalSpec>
+<FormalSpec>FirmaBepaler:AXimpl.InterneFirmaBepaler,VerkoopAPI:DOM.VKP.VerkoopAPI,OrderAPI:DOM.VKP.OrderAPI,Utils:AXimpl.Utils</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AXimpl.InterneFirmaBepaler).%New())
 	set ..Utils = $$$Inject(Utils,##class(AXimpl.Utils).%New())
 	
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
Index: AXimpl/FirmaBepaler.cls.xml
===================================================================
diff -u -r34686 -r42193
--- AXimpl/FirmaBepaler.cls.xml	(.../AX/common/impl/FirmaBepaler.cls.xml)	(revision 34686)
+++ AXimpl/FirmaBepaler.cls.xml	(.../AXimpl/InterneFirmaBepaler.cls.xml)	(revision 42193)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="AX.common.impl.FirmaBepaler">
+<Class name="AXimpl.InterneFirmaBepaler">
 <Super>TECH.Mockable</Super>
 
 <Property name="InterneFirmaBepaler">
Index: vhTest/Fake/AX/common/impl/FirmaBepaler.cls.xml
===================================================================
diff -u -r41918 -r42193
--- vhTest/Fake/AX/common/impl/FirmaBepaler.cls.xml	(.../FirmaBepaler.cls.xml)	(revision 41918)
+++ vhTest/Fake/AX/common/impl/FirmaBepaler.cls.xml	(.../FirmaBepaler.cls.xml)	(revision 42193)
@@ -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.common.impl.FirmaBepaler</Super>
+<Super>AXimpl.InterneFirmaBepaler</Super>
 
 <Method name="GeefInitialen">
 <ReturnType>AX.common.enu.InterneFirmaInitialen</ReturnType>
Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r42127 -r42193
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42127)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42193)
@@ -14,7 +14,7 @@
 </Property>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -39,13 +39,13 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PartijAPI:DOM.PARTIJ.PartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,FirmaBepaler:AX.common.impl.FirmaBepaler</FormalSpec>
+<FormalSpec>PartijAPI:DOM.PARTIJ.PartijAPI,VerkoopAPI:DOM.VKP.VerkoopAPI,FirmaBepaler:AXimpl.InterneFirmaBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AX.common.impl.FirmaBepaler).%New())
+	set ..FirmaBepaler = $$$Inject(FirmaBepaler,##class(AXimpl.InterneFirmaBepaler).%New())
 	
 	set ..Formatter = ##class(AXimpl.Formatter).%New()
 	set ..Validator = ##class(AX.common.impl.Validator).%New()