Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r47120 -r47140
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47120)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47140)
@@ -3,6 +3,11 @@
 <Class name="vhUnitTest.AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="PartijApi">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VerkoopApi">
 <Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
@@ -11,12 +16,13 @@
 <Method name="Test: Per klant wordt nagegaan of het een bestaande klant betreft">
 <Implementation><![CDATA[
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1234").ExactAantalKeer(2)
-	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||9999").ExactAantalKeer(1)
+	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").ExactAantalKeer(1)
+	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||2222").ExactAantalKeer(1)
+	Do VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||3333").ExactAantalKeer(1)
 	
 	Set ..VerkoopApi = VerkoopApiMock
 	
-	Do ..GeefConverter().Convert(..GeefBerichtMixDrieKlanten())
+	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
 	
 	Do VerkoopApiMock.Verifieer()
 ]]></Implementation>
@@ -25,34 +31,44 @@
 <Method name="Test: Alle bestaande klanten worden opgehaald">
 <Implementation><![CDATA[
 	Set VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).%New()
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1234").DanReturn($$$True)
-	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||9999").DanReturn($$$False)
-	Do VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1234").ExactAantalKeer(2)
-	Do VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||9999").ExactAantalKeer(0)
+	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
+	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||2222").DanReturn($$$False)
+	Do VerkoopApiMock.IndienMethodCall("BestaatKlant","K||3333").DanReturn($$$True)
 	
+	#dim Klant1 As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New()
+	#dim Klant2 As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Fake.DOM.VKP.VanHoeckeKlant).%New()
+	
+	Set PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
+	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||1111").ExactAantalKeer(1).DanReturn(Klant1)
+	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||2222").ExactAantalKeer(0)
+	Do PartijApiMock.VerwachtMethodCall("GeefPartij","K||3333").ExactAantalKeer(1).DanReturn(Klant2)
+	
+	;Do Klant1.IndienMethodCall("ZetNaam","Klant1").DanDoeNiks()
+	;Do Klant2.IndienMethodCall("ZetNaam","Klant3").DanDoeNiks()
+	
 	Set ..VerkoopApi = VerkoopApiMock
+	Set ..PartijApi = PartijApiMock
 	
-	Do ..GeefConverter().Convert(..GeefBerichtMixDrieKlanten())
+	Do ..GeefConverter().Convert(..GeefBerichtMetDrieKlanten())
 	
-	Do VerkoopApiMock.Verifieer()
+	Do PartijApiMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..VerkoopApi)
+<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApi, ..VerkoopApi)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBerichtBestaandeKlant">
+<Method name="GeefBerichtMetEenKlant">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
 <Implementation><![CDATA[
-	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
-	
 	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust.CustAccount = $Piece(Klant.GeefID(),"||",2)
+	Set Cust.CustAccount = 01111
+	Set Cust.Name = "Klant1"
 	
 	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
 	Do CustOutQuery.Cust.Insert(Cust)
@@ -64,18 +80,19 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBerichtMixDrieKlanten">
+<Method name="GeefBerichtMetDrieKlanten">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
 <Implementation><![CDATA[
-	#dim Klant As DOM.VKP.VanHoeckeKlant = ##class(vhTest.Utils.DOM.VKP.VanHoeckeKlant).StandaardKlant()
-	
 	Set Cust1 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust1.CustAccount = $Piece(Klant.GeefID(),"||",2)
+	Set Cust1.CustAccount = 01111
+	Set Cust1.Name = "Klant1"
 	Set Cust2 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust2.CustAccount = "9999"
+	Set Cust2.CustAccount = 02222
+	Set Cust2.Name = "Klant2"
 	Set Cust3 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
-	Set Cust3.CustAccount = $Piece(Klant.GeefID(),"||",2)
+	Set Cust3.CustAccount = 03333
+	Set Cust3.Name = "Klant3"
 	
 	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
 	Do CustOutQuery.Cust.Insert(Cust1)
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r47120 -r47140
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47120)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47140)
@@ -3,19 +3,31 @@
 <Class name="AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="AxToAdminUtils">
+<Type>AXimpl.AxToAdminUtils</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijApi">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VerkoopApi">
 <Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..PartijApi = $$$Inject(PartijApi,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..VerkoopApi = $$$Inject(VerkoopApi,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	Set ..AxToAdminUtils = ##class(AXimpl.AxToAdminUtils).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -27,7 +39,7 @@
 	Set AxdEntityCustIterator = ##class(TECH.ListIterator).%New(CustOutQuery.Cust)
 	While AxdEntityCustIterator.HasNext() {
 		#dim Cust as AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = AxdEntityCustIterator.Next()
-		#dim KlantId As %String = "K||"_##class(TECH.StringUtils).LeftTrim(Cust.CustAccount,"0")
+		#dim KlantId As %String = ..AxToAdminUtils.ConvertCustomerID(Cust.CustAccount)
 		
 		If (..VerkoopApi.BestaatKlant(KlantId)) {
 			Do ..UpdateKlant(Cust, KlantId)
@@ -41,7 +53,10 @@
 <Method name="UpdateKlant">
 <FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,KlantId:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(KlantId)
+<Implementation><![CDATA[
+	#dim Klant As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(KlantId)
+	
+	;Do Klant.ZetNaam(Cust.Name)
 ]]></Implementation>
 </Method>