Index: APPS/common/impl/DataService.cls.xml
===================================================================
diff -u -r29059 -r46455
--- APPS/common/impl/DataService.cls.xml	(.../DataService.cls.xml)	(revision 29059)
+++ APPS/common/impl/DataService.cls.xml	(.../DataService.cls.xml)	(revision 46455)
@@ -5,6 +5,22 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject,APPS.common.DataService</Super>
 
+<Property name="KlantDataBepaler">
+<Type>DOM.VKP.KlantDataBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefPersonalityData">
 <FormalSpec>PersonalityID:%String</FormalSpec>
 <ReturnType>DOM.common.dto.PersonalityData</ReturnType>
@@ -14,7 +30,7 @@
 	Set PersonalityData = ##class(DOM.common.dto.PersonalityData).%New()
 	Set PersonalityData.ID = PersonalityID
 	Set PersonalityData.Code = PersonalityID
-	Set PersonalityData.Naam = Personality.GeefKlant().Naam
+	Set PersonalityData.Naam = Personality.GeefNaam()
 	
 	Quit PersonalityData
 ]]></Implementation>
@@ -24,9 +40,8 @@
 <FormalSpec>PartijID:DOM.common.PartijID</FormalSpec>
 <ReturnType>DOM.common.dto.KlantData</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantDataBepaler As DOM.VKP.KlantDataBepaler = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlantDataBepaler()
 	#dim Personality As DOM.common.Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(DOM.common.enu.Personality).VanHoecke())
-	Quit KlantDataBepaler.GeefKlantData(Personality, PartijID)
+	Quit ..KlantDataBepaler.GeefKlantData(Personality, PartijID)
 ]]></Implementation>
 </Method>