Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42124 -r42334
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42124)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42334)
@@ -4,12 +4,12 @@
 <Super>TECH.Mockable</Super>
 
 <Property name="FirmaBepaler">
-<Type>AX.common.impl.FirmaBepaler</Type>
+<Type>AXimpl.InterneFirmaBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Property name="MessageManager">
-<Type>AX.Uitgaand.common.impl.MessageManager</Type>
+<Type>AXimpl.MessageManager</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,14 +19,14 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MessageManager:AX.Uitgaand.common.impl.MessageManager</FormalSpec>
+<FormalSpec>MessageManager:AXimpl.MessageManager</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..FirmaBepaler = ##class(AX.common.impl.FirmaBepaler).%New()
-	set ..MessageManager = $$$Inject(MessageManager,##class(AX.Uitgaand.common.impl.MessageManager).%New())
+	set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
+	set ..MessageManager = $$$Inject(MessageManager,##class(AXimpl.MessageManager).%New())
 	set ..RequestGeneratorConfig = ##class(AXimpl.RequestGeneratorConfig).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -36,7 +36,7 @@
 <FormalSpec>Request:%CacheString</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim Envelope As %CacheString = $$$If($classname(Request)["Aif",##class(AXaif.Message.Envelope).%New(), ##class(AXBizTalk.Crm.Customer.Envelope).%New())
+	#dim Envelope As %CacheString = ..RequestGeneratorConfig.GetEnvelope(Request)
 	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
 	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
 	set Envelope.Header.Action = ..RequestGeneratorConfig.GetAction(Request)