Index: vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml
===================================================================
diff -u -r45217 -r45623
--- vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45217)
+++ vhTest/Mock/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45623)
@@ -8,10 +8,10 @@
 <Super>AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
-<Method name="GeefProductNummer">
-<FormalSpec>IdentNummer:%String,KlantNummer:%String</FormalSpec>
+<Method name="GeefProductId">
+<FormalSpec>IdentNummer:%String,KlantId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductNummer",IdentNummer,KlantNummer)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefProductId",IdentNummer,KlantId)
 ]]></Implementation>
 </Method>
 
Index: AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml
===================================================================
diff -u -r45306 -r45623
--- AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45306)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45623)
@@ -21,19 +21,19 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProductNummer">
-<FormalSpec>IdentNummer:%String,KlantNummer:%String</FormalSpec>
+<Method name="GeefProductId">
+<FormalSpec>IdentNummer:%String,KlantId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim SearchCriteria As BL.Prod.sub.pxSearchCriteria = ##class(BL.Prod.sub.pxSearchCriteria).Create($$$ProdCritUsageAll)
 	Set SearchCriteria.At="I"
 	Set SearchCriteria.SearchTxt = IdentNummer
-	Set SearchCriteria.VerifyCustomer = KlantNummer
+	Set SearchCriteria.VerifyCustomer = KlantId
 	#dim Producten As %List = ##class(BL.Prod.Search).SearchIndexAsList(SearchCriteria)
 	If ($LL(Producten) = 0) {
-		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Er is geen product gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantNummer _"!")
+		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Er is geen product gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantId _"!")
 	} ElseIf ($LL(Producten) > 1) {
-		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Er zijn meerdere producten gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantNummer _"!")
+		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Er zijn meerdere producten gevonden voor IdentNummer " _IdentNummer _" en klant " _KlantId _"!")
 	}
 	Quit $LG(Producten)
 ]]></Implementation>
Index: vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml
===================================================================
diff -u -r45217 -r45623
--- vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45217)
+++ vhTest/Fake/AXimpl/Dynamics/SalesOrderIn/Converter/ProductBepaler.cls.xml	(.../ProductBepaler.cls.xml)	(revision 45623)
@@ -7,8 +7,8 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler</Super>
 
-<Method name="GeefProductNummer">
-<FormalSpec>IdentNummer:%String,KlantNummer:%String</FormalSpec>
+<Method name="GeefProductId">
+<FormalSpec>IdentNummer:%String,KlantId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
@@ -23,8 +23,7 @@
 
 <Method name="ValideerProductNummer">
 <FormalSpec>ProductNummer:%String</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefProductNummerVoorLeverancierID">
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r45617 -r45623
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45617)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 45623)
@@ -84,7 +84,7 @@
 	Do OrderLevenCyclusServiceMock.VerwachtMethodCall("VoegToeProductVoorKlant",OrderMock,"DummyKlantID","DummyProductID",10).DanReturn(ProductOrderlijnMock).ExactAantalKeer(1)
 	
 	Set ProductBepalerMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
-	Do ProductBepalerMock.VerwachtMethodCall("GeefProductNummer","0.741.108.3","DummyKlantID").DanReturn("DummyProductID")
+	Do ProductBepalerMock.VerwachtMethodCall("GeefProductId","0.741.108.3","DummyKlantID").DanReturn("DummyProductID")
 	
 	Set OrderDocRef = ##class(DOM.VKP.DocumentReferenties).%New()
 	Set DocumentReferentiesRepositoryMock = ##class(vhTest.Mock.DOM.VKP.DocumentReferentiesRepository).%New()
Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r45617 -r45623
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 45617)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 45623)
@@ -176,7 +176,7 @@
 <Private>1</Private>
 <ReturnType>DOM.VKP.impl.DataM.DataMProductOrderlijn</ReturnType>
 <Implementation><![CDATA[
-	#dim ProductID As %String = ..ProductBepaler.GeefProductNummer(OrderLine.ItemId, Order.GeefKlantID())
+	#dim ProductID As %String = ..ProductBepaler.GeefProductId(OrderLine.ItemId, Order.GeefKlantID())
 	#dim ProductLijn As DOM.VKP.ProductOrderlijn = ..OrderLevenCyclusService.VoegToeProductVoorKlant(Order, Order.GeefKlantID(), ProductID, OrderLine.QtyOrdered)
 	
 	Quit ProductLijn