Index: DOM/VKP/impl/KlantDataBepaler.cls.xml
===================================================================
diff -u -r36334 -r36510
--- DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 36334)
+++ DOM/VKP/impl/KlantDataBepaler.cls.xml	(.../KlantDataBepaler.cls.xml)	(revision 36510)
@@ -43,50 +43,61 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkSFS">
-<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
+<Method name="VerwerkDestil">
+<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
 <Implementation><![CDATA[
-	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.SFSKlantData = ..OpenKlantData(..KlantID, SFSPersonality)
+	#dim KlantData As DOM.VKP.impl.DestilKlantData = ..OpenKlantData(..KlantID, DestilPersonality)
 	
-	Do ..StelInKlantDataDtoVoorHandel(KlantData, SFSPersonality.GeefPrefix())
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DestilPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHaefeleBE">
-<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+<Method name="VerwerkDupont">
+<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
 <Implementation><![CDATA[
-	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.HaefeleBEKlantData = ..OpenKlantData(..KlantID, HaefeleBEPersonality)
+	#dim KlantData As DOM.VKP.impl.DupontKlantData = ..OpenKlantData(..KlantID, DupontPersonality)
 	
-	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleBEPersonality.GeefPrefix())
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DupontPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDestil">
-<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
+<Method name="VerwerkHein">
+<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
 <Implementation><![CDATA[
 	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.DestilKlantData = ..OpenKlantData(..KlantID, DestilPersonality)
+	#dim KlantData As DOM.VKP.impl.HeinKlantData = ..OpenKlantData(..KlantID, HeinPersonality)
 	
-	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DestilPersonality.GeefPrefix())
+	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, HeinPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkDupont">
-<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
+<Method name="VerwerkSFS">
+<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
 <Implementation><![CDATA[
-	Set ..KlantDataDto = ##class(DOM.common.dto.HandelKlantData).%New()
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
 	
-	#dim KlantData As DOM.VKP.impl.DupontKlantData = ..OpenKlantData(..KlantID, DupontPersonality)
+	#dim KlantData As DOM.VKP.impl.SFSKlantData = ..OpenKlantData(..KlantID, SFSPersonality)
 	
-	Do ..StelInKlantDataDtoVoorHandelAnoniem(KlantData, DupontPersonality.GeefPrefix())
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, SFSPersonality.GeefPrefix())
 ]]></Implementation>
 </Method>
 
+<Method name="VerwerkHaefeleBE">
+<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
+<Implementation><![CDATA[
+	Set ..KlantDataDto = ##class(DOM.common.dto.KlantData).%New()
+	
+	#dim KlantData As DOM.VKP.impl.HaefeleBEKlantData = ..OpenKlantData(..KlantID, HaefeleBEPersonality)
+	
+	Do ..StelInKlantDataDtoVoorHandel(KlantData, HaefeleBEPersonality.GeefPrefix())
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkKisch">
 <FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
 <Implementation><![CDATA[
@@ -126,19 +137,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="VerwerkHein">
-<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[
-	Set ..KlantDataDto = ##class(DOM.common.dto.HeinKlantData).%New()
-	
-	#dim KlantData As DOM.VKP.impl.HeinKlantData = ..OpenKlantData(..KlantID, HeinPersonality)
-	
-	Do ..StelInKlantDataDtoVoorHandel(KlantData, HeinPersonality.GeefPrefix())
-	
-	Set ..KlantDataDto.EmailAdres = KlantData.EmailAdres
-]]></Implementation>
-</Method>
-
 <Method name="StelInKlantDataDtoVoorHandel">
 <FormalSpec>KlantData:DOM.VKP.impl.KlantData,HandelPrefix:%String</FormalSpec>
 <Private>1</Private>