Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml
===================================================================
diff -u -r37427 -r37448
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37427)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/TransportFirmaBepalerFactory/GeefTransportFirmaBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37448)
@@ -16,8 +16,8 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##Super()
-	Set ..VanHoeckeTransportFirmaBepalerClassName = "WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler"
-	Set ..HeinTransportFirmaBepalerClassName = "WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler"
+	Set ..VanHoeckeTransportFirmaBepalerClassName = ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.TransportFirmaBepaler).%ClassName(1)
+	Set ..HeinTransportFirmaBepalerClassName = ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.TransportFirmaBepaler).%ClassName(1)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r37426 -r37448
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37426)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37448)
@@ -16,8 +16,8 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##Super()
-	Set ..VanHoeckeLandenBepalerClassName = "WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler"
-	Set ..HeinLandenBepalerClassName = "WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler"
+	Set ..VanHoeckeLandenBepalerClassName = ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler).%ClassName(1)
+	Set ..HeinLandenBepalerClassName = ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler).%ClassName(1)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/VerkoopprijsBerekenaarFactory/GeefVerkoopprijsBerekenaar/Test.cls.xml
===================================================================
diff -u -r37428 -r37448
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/VerkoopprijsBerekenaarFactory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37428)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/VerkoopprijsBerekenaarFactory/GeefVerkoopprijsBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 37448)
@@ -16,8 +16,8 @@
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##Super()
-	Set ..VanHoeckeVerkoopprijsBerekenaarClassName = "WS.EC.Unishop.InternationaleZending.VanHoecke.impl.VerkoopprijsBerekenaar"
-	Set ..HeinVerkoopprijsBerekenaarClassName = "WS.EC.Unishop.InternationaleZending.Hein.impl.VerkoopprijsBerekenaar"
+	Set ..VanHoeckeVerkoopprijsBerekenaarClassName = ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.VerkoopprijsBerekenaar).%ClassName(1)
+	Set ..HeinVerkoopprijsBerekenaarClassName = ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.VerkoopprijsBerekenaar).%ClassName(1)
 ]]></Implementation>
 </Method>