Index: APPS/OV/OrderVerwerkingAPI.cls.xml
===================================================================
diff -u -r29059 -r31706
--- APPS/OV/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 29059)
+++ APPS/OV/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 31706)
@@ -21,7 +21,7 @@
 <Method name="GeefOrderBevestigingWachtrijAfhandelaar">
 <Abstract>1</Abstract>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
-<ReturnType>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</ReturnType>
+<ReturnType>APPS.OV.OrderBevestiging.WachtrijAfhandelaar</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/APPS/OV/OrderVerwerkingAPI.cls.xml
===================================================================
diff -u -r29059 -r31706
--- vhTest/Mock/APPS/OV/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/OV/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 31706)
@@ -34,7 +34,7 @@
 
 <Method name="GeefOrderBevestigingWachtrijAfhandelaar">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
-<ReturnType>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</ReturnType>
+<ReturnType>APPS.OV.OrderBevestiging.WachtrijAfhandelaar</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefOrderBevestigingWachtrijAfhandelaar",KlantID)
 ]]></Implementation>
 </Method>
Index: APPS/OV/impl/OrderVerwerkingAPI.cls.xml
===================================================================
diff -u -r31323 -r31706
--- APPS/OV/impl/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 31323)
+++ APPS/OV/impl/OrderVerwerkingAPI.cls.xml	(.../OrderVerwerkingAPI.cls.xml)	(revision 31706)
@@ -5,7 +5,7 @@
 
 <Method name="GeefKlantInstellingenService">
 <ReturnType>APPS.common.KlantInstellingenService</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.OV.impl.KlantInstellingenServiceVanHoecke).%New()
+<Implementation><![CDATA[	Quit ##class(APPS.OV.impl.KlantInstellingenServiceVanHoecke).%New()
 ]]></Implementation>
 </Method>
 
@@ -14,18 +14,18 @@
 <ReturnType>APPS.OV.OrderBevestiging.OrderBevestiger</ReturnType>
 <Implementation><![CDATA[
 	#dim OrderBevestiger As APPS.OV.OrderBevestiging.OrderBevestiger
-	#dim Afhandelaar As APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar
+	#dim Afhandelaar As APPS.OV.OrderBevestiging.WachtrijAfhandelaar
 	
 	if (KlantID = ##class(DOM.VKP.enu.Klant).SFS()) {
-		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerSFS).%New()
-	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
-		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel).%New()
-		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerMetWachtrij).%New(Afhandelaar)
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestiger.OrderBevestigerSFS).%New()
 	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) {
-		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG).%New()
-		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerMetWachtrij).%New(Afhandelaar)
+		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.WachtrijAfhandelaar.DKG).%New()
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestiger.OrderBevestigerMetWachtrij).%New(Afhandelaar)
+	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
+		set Afhandelaar = ##class(APPS.OV.OrderBevestiging.impl.WachtrijAfhandelaar.Bruynzeel).%New()
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestiger.OrderBevestigerMetWachtrij).%New(Afhandelaar)
 	} else {
-		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigerDummy).%New()
+		set OrderBevestiger = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestiger.OrderBevestigerDummy).%New()
 	}
 	
 	quit OrderBevestiger
@@ -34,19 +34,19 @@
 
 <Method name="GeefOrderBevestigingWachtrijAfhandelaar">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
-<ReturnType>APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar</ReturnType>
+<ReturnType>APPS.OV.OrderBevestiging.WachtrijAfhandelaar</ReturnType>
 <Implementation><![CDATA[
-	#dim OrderBevestigingWachtrijAfhandelaar As APPS.OV.OrderBevestiging.OrderBevestigingWachtrijAfhandelaar
+	#dim WachtrijAfhandelaar As APPS.OV.OrderBevestiging.WachtrijAfhandelaar
 	
-	if (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
-		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Bruynzeel).%New()
-	} elseif (KlantID = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) {
-		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.DKG).%New()
-	} else {
-		set OrderBevestigingWachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.OrderBevestigingWachtrijAfhandelaar.Dummy).%New()
+	If (KlantID = ##class(DOM.VKP.enu.Klant).Bruynzeel()) {
+		Set WachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.WachtrijAfhandelaar.Bruynzeel).%New()
+	} Elseif (KlantID = ##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) {
+		Set WachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.WachtrijAfhandelaar.DKG).%New()
+	} Else {
+		Set WachtrijAfhandelaar = ##class(APPS.OV.OrderBevestiging.impl.WachtrijAfhandelaar.Dummy).%New()
 	}
 	
-	quit OrderBevestigingWachtrijAfhandelaar
+	Quit WachtrijAfhandelaar
 ]]></Implementation>
 </Method>
 </Class>