Index: vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32682 -r32683
--- vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32682)
+++ vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32683)
@@ -26,7 +26,7 @@
 <Method name="Test: UPS Response converteerder">
 <Implementation><![CDATA[
 	#dim ResponseConverteerder As APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder).%New()
-	#dim Response As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateResponse = ..GeefResponse()
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponse()
 	#dim TransportOfferte As APPS.TRANSP.OfferteService.dto.OfferteData = ResponseConverteerder.Converteer(Response)
 	#dim TestTransportOfferte As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefTransportOfferte()
 	
@@ -43,8 +43,8 @@
 <Method name="Test: UPS Response Valideerder">
 <Implementation><![CDATA[
 	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValidator = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValidator).%New()
-	#dim Response As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateResponse = ..GeefResponse()
-	#dim Request As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest = ..GeefRequest()
+	#dim Response As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse = ..GeefResponse()
+	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
 	
 	Do ResponseValideerder.Valideer(Response, Request)
 	
@@ -56,17 +56,17 @@
 <Implementation><![CDATA[
 	#dim BerekenInputConverteerder As APPS.TRANSP.UPS.impl.Rate.BerekenInputConverteerder  = ##class(APPS.TRANSP.UPS.impl.Rate.BerekenInputConverteerder).%New()
 	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ..GeefBerekenInput()
-	#dim Request As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest = BerekenInputConverteerder.Converteer(BerekenInput)
-	#dim TestRequest As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest = ..GeefRequest()
+	#dim Request As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = BerekenInputConverteerder.Converteer(BerekenInput)
+	#dim TestRequest As APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest = ..GeefRequest()
 
 	Do $$$AssertObject(Request.Shipment.Shipper.Address , TestRequest.Shipment.Shipper.Address)
 	Do $$$AssertObject(Request.Request.TransactionReference  , TestRequest.Request.TransactionReference)
 	Do $$$AssertObject(Request.Shipment.ShipTo.Address , TestRequest.Shipment.ShipTo.Address)
 	Do $$$AssertEquals(Request.Shipment.Package.Count(),TestRequest.Shipment.Package.Count())
 	
 	For Item=1:1:Request.Shipment.Package.Count() {
-		#dim Package As APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType = Request.Shipment.Package.GetAt(Item)
-		#dim TestPackage As APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType = TestRequest.Shipment.Package.GetAt(Item)
+		#dim Package As APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType = Request.Shipment.Package.GetAt(Item)
+		#dim TestPackage As APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType = TestRequest.Shipment.Package.GetAt(Item)
 
 		Do $$$AssertObject(Package.PackagingType , TestPackage.PackagingType  )
 
@@ -102,9 +102,9 @@
 
 <Method name="GeefResponse">
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.iml.Rate.Service.rate.RateResponse</ReturnType>
+<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse</ReturnType>
 <Implementation><![CDATA[
-	Set Response = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.RateResponse).%New()
+	Set Response = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateResponse).%New()
 
 	Set Response.Response.ResponseStatus.Code = "1"
 	Set Response.Response.ResponseStatus.Description = "Success"
@@ -113,7 +113,7 @@
 	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
 
 	For Item=1:1:5 {
-		Set RatedShipment = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.RatedShipmentType).%New()
+		Set RatedShipment = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RatedShipmentType).%New()
 		
 		Set RatedShipment.Service.Code = Item
 		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
@@ -179,9 +179,9 @@
 
 <Method name="GeefRequest">
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest</ReturnType>
+<ReturnType>APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest</ReturnType>
 <Implementation><![CDATA[
-	#dim Request As APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.RateRequest).%New()
+	Set Request = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.RateRequest).%New()
 	
 	Do Request.Request.RequestOption.SetAt("Shop",1)
 	Set Request.Request.TransactionReference.CustomerContext = "1"
@@ -198,7 +198,7 @@
 	Set Request.Shipment.ShipTo.Address.CountryCode = "BE" 
 	Set Request.Shipment.ShipTo.Address.PostalCode = "9100" 
 	
-	Set PackageItem1 = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType).%New()
+	Set PackageItem1 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
 	Set PackageItem1.Dimensions.Height = 500
 	Set PackageItem1.Dimensions.Width = 10
 	Set PackageItem1.Dimensions.Length = 100
@@ -208,7 +208,7 @@
 	Set PackageItem1.PackagingType.Description = "Package/customer supplied"
 	Do Request.Shipment.Package.SetAt(PackageItem1,1)
 
-	Set PackageItem2 = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType).%New()
+	Set PackageItem2 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
 	Set PackageItem2.Dimensions.Height = 1000
 	Set PackageItem2.Dimensions.Width = 20
 	Set PackageItem2.Dimensions.Length = 200
@@ -218,7 +218,7 @@
 	Set PackageItem2.PackagingType.Description = "Package/customer supplied"
 	Do Request.Shipment.Package.SetAt(PackageItem2,2)
 	
-	Set PackageItem3 = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType).%New()
+	Set PackageItem3 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
 	Set PackageItem3.Dimensions.Height = 1500
 	Set PackageItem3.Dimensions.Width = 30
 	Set PackageItem3.Dimensions.Length = 300
@@ -228,7 +228,7 @@
 	Set PackageItem3.PackagingType.Description = "Package/customer supplied"
 	Do Request.Shipment.Package.SetAt(PackageItem3,3)
 
-	Set PackageItem4 = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType).%New()
+	Set PackageItem4 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
 	Set PackageItem4.Dimensions.Height = 2000
 	Set PackageItem4.Dimensions.Width = 40
 	Set PackageItem4.Dimensions.Length = 400
@@ -238,7 +238,7 @@
 	Set PackageItem4.PackagingType.Description = "Package/customer supplied"
 	Do Request.Shipment.Package.SetAt(PackageItem4,4)
 
-	Set PackageItem5 = ##class(APPS.TRANSP.UPS.iml.Rate.Service.rate.PackageType).%New()
+	Set PackageItem5 = ##class(APPS.TRANSP.UPS.impl.Rate.Service.rate.PackageType).%New()
 	Set PackageItem5.Dimensions.Height = 2500
 	Set PackageItem5.Dimensions.Width = 50
 	Set PackageItem5.Dimensions.Length = 500