Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42579 -r42645
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42579)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42645)
@@ -36,7 +36,7 @@
 <FormalSpec>Request:%CacheString</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim Envelope As %CacheString = ..RequestGeneratorConfig.GetEnvelope(Request)
+	#dim Envelope As %CacheString = $classmethod(..RequestGeneratorConfig.GetRequestEnvelope(Request),"%New")
 	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
 	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
 	set Envelope.Header.Action = ..RequestGeneratorConfig.GetAction(Request)
Index: vhTest/Fake/AXimpl/ConfigOut.cls.xml
===================================================================
diff -u -r42644 -r42645
--- vhTest/Fake/AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42644)
+++ vhTest/Fake/AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42645)
@@ -21,7 +21,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GetEnvelope">
+<Method name="GetRequestEnvelope">
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
Index: AXimpl/ConfigOut.cls.xml
===================================================================
diff -u -r42644 -r42645
--- AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42644)
+++ AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42645)
@@ -35,11 +35,12 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GetEnvelope">
+<Method name="GetRequestEnvelope">
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	do:$$$Not($data(^AX.Config(..#Direction,"Envelope",Request.Command))) ##class(TECH.Exceptions.IllegalUsageException).Throw(Request.Command_" not supported")
+	quit ^AX.Config(..#Direction,"Envelope",Request.Command)
 	quit $classmethod(^AX.Config(..#Direction,"Envelope",Request.Command),"%New")
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/AXimpl/ConfigOut.cls.xml
===================================================================
diff -u -r42644 -r42645
--- vhTest/Mock/AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42644)
+++ vhTest/Mock/AXimpl/ConfigOut.cls.xml	(.../ConfigOut.cls.xml)	(revision 42645)
@@ -22,10 +22,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GetEnvelope">
+<Method name="GetRequestEnvelope">
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetEnvelope",Request)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GetRequestEnvelope",Request)
 ]]></Implementation>
 </Method>