Index: vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml
===================================================================
diff -u -r42343 -r42390
--- vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
+++ vhUnitTest/AXimpl/Validator/Validate/Test.cls.xml	(.../Test.cls.xml)	(revision 42390)
@@ -5,7 +5,7 @@
 
 <Method name="Test: Envelope bevat geen enkel required veld">
 <Implementation><![CDATA[
-	set Envelope = ##class(AXaif.Message.Envelope).%New()
+	set Envelope = ##class(AXif.Dynamics.CustomerOut.Envelope).%New()
 	
 	set Validator = ##class(AXimpl.Validator).%New()
 	do Validator.Validate(Envelope)
Index: vhUnitTest/AXimpl/ResponseProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r42388 -r42390
--- vhUnitTest/AXimpl/ResponseProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 42388)
+++ vhUnitTest/AXimpl/ResponseProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 42390)
@@ -69,7 +69,7 @@
 	do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\File.txt")
 	
 	set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
-	do XmlCorrelaterStub.IndienMethodCall("GeefObjectVanBestand",Filename,"AXaif.Message.Envelope","Envelope").DanException(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"",$$$ERROR()))
+	do XmlCorrelaterStub.IndienMethodCall("GeefObjectVanBestand",Filename,"AXif.Dynamics.CustomerOut.Envelope","Envelope").DanException(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"",$$$ERROR()))
 	
 	set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
 	do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedResponseReceivedEvent",Filename,..Matches.Stream(Stream))