Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r65150 -r66343
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 66343)
@@ -417,7 +417,7 @@
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.SDGroupKlantData = ..OpenKlantData(..KlantID, DSGroupPersonality)
+	#dim KlantData As DOM.VKP.impl.DSGroupKlantData = ..OpenKlantData(..KlantID, DSGroupPersonality)
 	
 	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DSGroupPersonality.GeefPrefix())
 ]]></Implementation>
@@ -428,7 +428,7 @@
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.RiniKlantData = ..OpenKlantData(..KlantID, DeBisschopPersonality)
+	#dim KlantData As DOM.VKP.impl.DeBisschopKlantData = ..OpenKlantData(..KlantID, DeBisschopPersonality)
 	
 	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DeBisschopPersonality.GeefPrefix())
 ]]></Implementation>
@@ -439,7 +439,7 @@
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.RiniKlantData = ..OpenKlantData(..KlantID, DeceuninckDeforcePersonality)
+	#dim KlantData As DOM.VKP.impl.DeceuninckDeforceKlantData = ..OpenKlantData(..KlantID, DeceuninckDeforcePersonality)
 	
 	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DeceuninckDeforcePersonality.GeefPrefix())
 ]]></Implementation>
@@ -450,7 +450,7 @@
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.RiniKlantData = ..OpenKlantData(..KlantID, PierardPersonality)
+	#dim KlantData As DOM.VKP.impl.PierardKlantData = ..OpenKlantData(..KlantID, PierardPersonality)
 	
 	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, PierardPersonality.GeefPrefix())
 ]]></Implementation>
Index: vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r65150 -r66343
--- vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 65150)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 66343)
@@ -21,50 +21,42 @@
 
 <Method name="VerwerkHaefeleAT">
 <FormalSpec>HaefeleATPersonality:DOM.common.HaefeleATPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleCH">
 <FormalSpec>HaefeleCHPersonality:DOM.common.HaefeleCHPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleDK">
 <FormalSpec>HaefeleDKPersonality:DOM.common.HaefeleDKPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleFI">
 <FormalSpec>HaefeleFIPersonality:DOM.common.HaefeleFIPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleFR">
 <FormalSpec>HaefeleFRPersonality:DOM.common.HaefeleFRPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleIT">
 <FormalSpec>HaefeleITPersonality:DOM.common.HaefeleITPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHaefeleSE">
 <FormalSpec>HaefeleSEPersonality:DOM.common.HaefeleSEPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkOPO">
 <FormalSpec>OPOPersonality:DOM.common.OPOPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerwerkHahleOy">