Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml
===================================================================
diff -u -r47166 -r47275
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 47166)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 47275)
@@ -14,7 +14,7 @@
 </Property>
 
 <Property name="ProductLookup">
-<Type>AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler</Type>
+<Type>AXimpl.Admin.Common.ProductBepaler</Type>
 <Private>1</Private>
 </Property>
 
@@ -29,15 +29,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductItemConverter:AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,ProductAPI:DOM.PM.ProductAPI,ProductLookup:AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler,MailAPI:TECH.Mail.MailAPI,Logger:vhLib.Logger</FormalSpec>
+<FormalSpec>ProductItemConverter:AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,ProductAPI:DOM.PM.ProductAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,MailAPI:TECH.Mail.MailAPI,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..ProductItemConverter = $$$Inject(ProductItemConverter,##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter).%New())
 	set ..ProductAPI = $$$Inject(ProductAPI,##class(DOM.DomeinContext).Instance().GeefProductAPI())
-	Set ..ProductLookup = $$$Inject(ProductLookup, ##class(AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New())
+	Set ..ProductLookup = $$$Inject(ProductLookup, ##class(AXimpl.Admin.Common.ProductBepaler).%New())
 	Set ..MailAPI = $$$Inject(MailAPI,##class(TECH.Context).Instance().GeefMailAPI())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml
===================================================================
diff -u -r47173 -r47275
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47173)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47275)
@@ -18,7 +18,7 @@
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().Nooit()
 	
-	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
+	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("")
 		
 	#dim ProductAPIMock as vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
@@ -67,7 +67,7 @@
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(Principaal)).DanDoeNiks().ExactAantalKeer(1)
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR)).DanDoeNiks().ExactAantalKeer(1)
 	
-	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.ProductBepaler).%New()
+	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("SOPRProductId")
 	
 	Set ProductMock = ##class(vhTest.Mock.DOM.PM.Product).%New()