Index: vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml
===================================================================
diff -u -r29059 -r40545
--- vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml	(.../TestResponse.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/GLS/CommunicatieService/TestResponse.cls.xml	(.../TestResponse.cls.xml)	(revision 40545)
@@ -5,74 +5,74 @@
 
 <Method name="TestGeenFoutenMetOKE000">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = "OK"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeenFoutenMetLegeE000">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = ""
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeenFoutenMetNumeriekeE000">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E000 = "123456"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeenFoutenMetToegestandeFoutE000">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	
 	set Response.E000 = "no errors have occured"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 	
 	set Response.E000 = "ADA"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertFalse(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestMetFoutenInE013">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.ParcelResponse).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse).%New()
 	set Response.E013 = "ONBEKENDE FOUT"	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertTrue(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestMetFouten">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E001 = "We hebben een error gekregen van GLS"
 	
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
 	do $$$AssertTrue(CommunicatieService.ResponseBevatFout(Response))
 ]]></Implementation>
 </Method>
 
 <Method name="TestGeefFout">
 <Implementation><![CDATA[
-	set Response = ##class(APPS.TRANSP.GLS.Bericht.dto.Response).%New()
+	set Response = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response).%New()
 	set Response.E006 = "Dit is een foutmelding."
 
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
-	#dim Error As APPS.TRANSP.GLS.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
+	#dim Error As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
 	do $$$AssertEquals("not able to make the routing : Dit is een foutmelding.",Error.Omschrijving)
 	do $$$AssertEquals("E006",Error.ErrorCode)
 ]]></Implementation>
@@ -101,10 +101,10 @@
 <Method name="AssertFoutNiveau">
 <FormalSpec>Property:%String,VerwachtNiveau:TECH.Exceptions.enu.Niveau,Type:%String(VALUELIST=",P,F")="P"</FormalSpec>
 <Implementation><![CDATA[
-	set CommunicatieService = ##class(APPS.TRANSP.GLS.impl.CommunicatieService).%New()
-	#dim Response As APPS.TRANSP.GLS.Bericht.dto.ErrorResponse = $select(Type="P":##class(APPS.TRANSP.GLS.Bericht.dto.ParcelErrorResponse).%New(),1:##class(APPS.TRANSP.GLS.Bericht.dto.FreightErrorResponse).%New())
+	set CommunicatieService = ##class(APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate).%New()
+	#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ErrorResponse = $select(Type="P":##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelErrorResponse).%New(),1:##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightErrorResponse).%New())
 	set $property(Response,Property)="Foutmelding"
-	#dim Error As APPS.TRANSP.GLS.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
+	#dim Error As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error = CommunicatieService.GeefFoutInResponse(Response)
 	do $$$AssertEquals(VerwachtNiveau,Error.Niveau , Error.ErrorCode)
 ]]></Implementation>
 </Method>