Index: vhUnitTest/APPS/TRANSP/GLS/impl/TestEtiketBouwerResponseVisitor.cls.xml
===================================================================
diff -u -r29059 -r40510
--- vhUnitTest/APPS/TRANSP/GLS/impl/TestEtiketBouwerResponseVisitor.cls.xml	(.../TestEtiketBouwerResponseVisitor.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/GLS/impl/TestEtiketBouwerResponseVisitor.cls.xml	(.../TestEtiketBouwerResponseVisitor.cls.xml)	(revision 40510)
@@ -18,14 +18,14 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	;Arrange
-	#dim Response As %String = ##class(APPS.TRANSP.GLS.Bericht.dto.FreightResponse).%New()
+	#dim Response As %String = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightResponse).%New()
 	Set Response.T979 = Input
 	
 	;Act
-	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.impl.EtiketBouwerResponseVisitor).%New()
+	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
 	Do EtiketBouwerVisitor.VerwerkFreightResponse(Response)
-	#dim Etiket As APPS.TRANSP.GLS.Etiket.Etiket = EtiketBouwerVisitor.GeefEtiket()		
-	#dim VerwerkteResponse As APPS.TRANSP.GLS.Bericht.dto.FreightResponse = Etiket.Response
+	#dim Etiket As APPS.TRANSP.GLS.GLSv1.impl.Etiket.Base = EtiketBouwerVisitor.GeefEtiket()		
+	#dim VerwerkteResponse As APPS.TRANSP.GLS.GLSv1.Bericht.dto.FreightResponse = Etiket.Response
 	
 	;Assert
 	Do $$$AssertEquals(VerwerkteResponse.T979,"22720256904005")
@@ -35,14 +35,14 @@
 <Method name="TestT8902InParcelResponse">
 <Implementation><![CDATA[
 	;Arrange
-	#dim Response As %String = ##class(APPS.TRANSP.GLS.Bericht.dto.ParcelResponse).%New()
+	#dim Response As %String = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse).%New()
 	Set Response.T8902 = "Test15CharsLang"
 	
 	;Act
-	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.impl.EtiketBouwerResponseVisitor).%New()
+	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
 	Do EtiketBouwerVisitor.VerwerkParcelResponse(Response)
-	#dim Etiket As APPS.TRANSP.GLS.Etiket.Etiket = EtiketBouwerVisitor.GeefEtiket()
-	#dim VerwerkteResponse As APPS.TRANSP.GLS.Bericht.dto.ParcelResponse = Etiket.Response
+	#dim Etiket As APPS.TRANSP.GLS.GLSv1.impl.Etiket.Base = EtiketBouwerVisitor.GeefEtiket()
+	#dim VerwerkteResponse As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse = Etiket.Response
 	
 	;Assert
 	Do $$$AssertEquals(VerwerkteResponse.T8902,##class(TECH.StringUtils).AddTrailingSpace("Test15CharsLang",123),"Trailing space toegevoegd.")
@@ -53,14 +53,14 @@
 <Method name="TestT8903InParcelResponse">
 <Implementation><![CDATA[
 	;Arrange
-	#dim Response As %String = ##class(APPS.TRANSP.GLS.Bericht.dto.ParcelResponse).%New()
+	#dim Response As %String = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse).%New()
 	Set Response.T8903 = "T]nog tekst]nog iets]nog wat]abc"
 	
 	;Act
-	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.impl.EtiketBouwerResponseVisitor).%New()
+	Set EtiketBouwerVisitor = ##class(APPS.TRANSP.GLS.GLSv1.impl.EtiketBouwerResponseVisitor).%New()
 	Do EtiketBouwerVisitor.VerwerkParcelResponse(Response)
-	#dim Etiket As APPS.TRANSP.GLS.Etiket.Etiket = EtiketBouwerVisitor.GeefEtiket()
-	#dim VerwerkteResponse As APPS.TRANSP.GLS.Bericht.dto.ParcelResponse = Etiket.Response
+	#dim Etiket As APPS.TRANSP.GLS.GLSv1.impl.Etiket.Base = EtiketBouwerVisitor.GeefEtiket()
+	#dim VerwerkteResponse As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelResponse = Etiket.Response
 	
 	;Assert
 	Do $$$AssertEquals(VerwerkteResponse.T8903,##class(TECH.StringUtils).AddTrailingSpace("T|nog tekst|nog iets|nog wat|abc",127),"Trailing space toegevoegd.")