Index: vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml
===================================================================
diff -u -r30400 -r33279
--- vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 30400)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/WinkelkarService/Base.cls.xml	(.../Base.cls.xml)	(revision 33279)
@@ -38,12 +38,11 @@
 	do ##super(aTestName)
 	
 	#dim MailAPI As vhUnitTest.TECH.Mail.impl.MailAPIMock = ##class(vhUnitTest.TECH.Mail.impl.MailAPIMock).MockInstance()
-	#dim ECommerceAPIMock As APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
-	#dim WebshopSessionServiceFake As APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
+	#dim ECommerceAPIStub As vhTest.Mock.APPS.EC.ECommerceAPI = ##class(vhTest.Mock.APPS.EC.ECommerceAPI).MockInstance()	
+	#dim WebshopSessionServiceStub As vhTest.Mock.APPS.EC.WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	
-	do WebshopSessionServiceFake.IndienMethodCall("GeefVanHoeckeSessie",##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
-	do ECommerceAPIMock.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceFake)
-	do ECommerceAPIMock.IndienMethodCall("GeefWinkelkarService").DanReturn(..WinkelkarService)
+	Do WebshopSessionServiceStub.IndienMethodCall("GeefVanHoeckeSessie", ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()).DanReturn(##class(APPS.EC.impl.VanHoeckeWebshopSessie).%New($$$DummyString))
+	Do ECommerceAPIStub.IndienMethodCall("GeefWebshopSessionService").DanReturn(WebshopSessionServiceStub)
 ]]></Implementation>
 </Method>