Index: vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml
===================================================================
diff -u -r42293 -r42343
--- vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml	(.../Test.cls.xml)	(revision 42293)
+++ vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -16,7 +16,7 @@
 
 <Method name="Test: FirstBest field from Customer is invalid">
 <Implementation><![CDATA[
-	set Envelope = ##class(AXaif.Message.Envelope).%New()
+	set Envelope = ##class(AXif.Dynamics.CustomerOut.Envelope).%New()
 	set Envelope.Body.MessageParts.Customer.DocPurpose = "Some Invalid Value"
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("#5802")
Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r42335 -r42343
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42335)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -95,7 +95,7 @@
 	
 	set XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"ReadResponse.xml")
-	#dim ReadResponse As AXaif.Message.Envelope = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXif.Dynamics.CustomerOut.Envelope).%ClassName(1),"Envelope")
+	#dim ReadResponse As %CacheString = XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXif.Dynamics.CustomerOut.Envelope).%ClassName(1),"Envelope")
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/UpdatePart2",KlantId,ReadResponse))
Index: vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml
===================================================================
diff -u -r42292 -r42343
--- vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42292)
+++ vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -8,7 +8,7 @@
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
 	set MessageManager = ##class(AXimpl.MessageManager).%New()
-	#dim Message As AXaif.Message.Envelope = MessageManager.Import(FullFilename)
+	#dim Message As %CacheString = MessageManager.Import(FullFilename)
 	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"SchemaValidationFailed")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Reason.Text.GetAt("EN-US"),"Invalid document schema.")
@@ -21,7 +21,7 @@
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
 	set MessageManager = ##class(AXimpl.MessageManager).%New()
-	#dim Message As AXaif.Message.Envelope = MessageManager.Import(FullFilename)
+	#dim Message As %CacheString = MessageManager.Import(FullFilename)
 	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"DuplicateMessage")
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Reason.Text.GetAt("EN-US"),"Duplicate message. Message has already been processed.")
Index: vhUnitTest/AXimpl/EventHandler/RequestLogger/Log/Test.cls.xml
===================================================================
diff -u -r42276 -r42343
--- vhUnitTest/AXimpl/EventHandler/RequestLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 42276)
+++ vhUnitTest/AXimpl/EventHandler/RequestLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -14,7 +14,7 @@
 	
 	#dim Command As %String = "Customer/Create"
 	#dim Id As %String = "K||1000"
-	#dim Envelope As AXaif.Message.Envelope = ##class(AXaif.Message.Envelope).%New()
+	#dim Envelope As AXif.Dynamics.CustomerOut.Envelope = ##class(AXif.Dynamics.CustomerOut.Envelope).%New()
 	Set Envelope.Header.Action = "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
 	Set Envelope.Header.MessageId = "{12345-123-ABC}"
 	Set Envelope.Header.Company = "VHBE"
Index: vhUnitTest/AXimpl/EventRaiser/Test.cls.xml
===================================================================
diff -u -r42278 -r42343
--- vhUnitTest/AXimpl/EventRaiser/Test.cls.xml	(.../Test.cls.xml)	(revision 42278)
+++ vhUnitTest/AXimpl/EventRaiser/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -9,7 +9,7 @@
 	
 	set EventRaiser = ##class(AXimpl.EventRaiser).%New(PubSubEventRaiserSpy)
 	
-	set Message = ##class(AXaif.Message.Envelope).%New()
+	#dim Message As %CacheString = ""
 	set Stream = ##class(%GlobalCharacterStream).%New()
 	do Stream.Write("SomeStreamData")
 	do EventRaiser.RaiseRequestSendEvent("Customer/Read","K||1000",Message,Stream)
@@ -31,7 +31,7 @@
 	
 	set EventRaiser = ##class(AXimpl.EventRaiser).%New(PubSubEventRaiserSpy)
 	
-	set Message = ##class(AXaif.Message.Envelope).%New()
+	#dim Message As %CacheString = ""
 	set Stream = ##class(%GlobalCharacterStream).%New()
 	do Stream.Write("SomeStreamData")
 	do EventRaiser.RaiseResponseReceivedEvent(Message,Stream)
@@ -51,7 +51,7 @@
 	
 	set EventRaiser = ##class(AXimpl.EventRaiser).%New(PubSubEventRaiserSpy)
 	
-	set Message = ##class(AXaif.Message.Envelope).%New()
+	#dim Message As %CacheString = ""
 	set Stream = ##class(%GlobalCharacterStream).%New()
 	do Stream.Write("SomeStreamData")
 	do EventRaiser.RaiseCorruptedResponseReceivedEvent("E:\File.xml",Stream)
Index: vhUnitTest/AXimpl/EventHandler/ResponseLogger/Log/Test.cls.xml
===================================================================
diff -u -r42276 -r42343
--- vhUnitTest/AXimpl/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 42276)
+++ vhUnitTest/AXimpl/EventHandler/ResponseLogger/Log/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
@@ -29,7 +29,7 @@
 </Property>
 
 <Property name="ResponseMessage">
-<Type>AXaif.Message.Envelope</Type>
+<Type>AXif.Dynamics.CustomerOut.Envelope</Type>
 <Private>1</Private>
 </Property>
 
@@ -67,7 +67,7 @@
 	
 	Set ..FailedMessageRepositoryMock = ##class(vhTest.Mock.AX.AifMessage.FailedMessageRepository).%New()
 	
-	Set ..ResponseMessage = ##class(AXaif.Message.Envelope).%New()
+	Set ..ResponseMessage = ##class(AXif.Dynamics.CustomerOut.Envelope).%New()
 	Set ..ResponseMessage.Header.MessageId = "{654321-ABC-7654321}"
 	Set ..ResponseMessage.Header.RequestMessageId = "{123456-ABC-1234567}"