Index: APPS/VKP/Maatwerk/LadeRegistratie/impl/IDataOphaler.cls.xml
===================================================================
diff -u -r53528 -r55526
--- APPS/VKP/Maatwerk/LadeRegistratie/impl/IDataOphaler.cls.xml	(.../IDataOphaler.cls.xml)	(revision 53528)
+++ APPS/VKP/Maatwerk/LadeRegistratie/impl/IDataOphaler.cls.xml	(.../IDataOphaler.cls.xml)	(revision 55526)
@@ -134,7 +134,7 @@
 					Set ORDNr=$P(TLRec,"\",27)
 					Set OLNr=$P(TLRec,"\",28)
 					Set ..Registratie.AxInventTransId=$P(TLRec,"\",55)
-					Set ..Registratie.AxMaatwerkGenerischItemId=$P(TLRec,"\",57)
+					Set ..Registratie.AxItemId=$P(TLRec,"\",57)
 					Set ..Registratie.AxConfigId=$P(TLRec,"\",56)
 
 					If ORDNr,OLNr
@@ -145,10 +145,11 @@
 							Set ORDRec=$G(^KOD(KLNr,"F",ORDNr,1))
 							Set ..Registratie.KlantID=KLNr
 							Set ..Registratie.OrderID=ORDNr
+							Set ..Registratie.AxOrderId=$P(ORDRec,"\",58)
 							Set ..Registratie.CommissieRef=$P(ORDRec,"\",19)
 							Set OLRec=$G(^KOD(KLNr,"F",ORDNr,OLNr))
 							Set:..Registratie.AxInventTransId="" ..Registratie.AxInventTransId=$P(OLRec,"\",55)
-							Set:..Registratie.AxMaatwerkGenerischItemId="" ..Registratie.AxMaatwerkGenerischItemId=$P(OLRec,"\",57)
+							Set:..Registratie.AxItemId="" ..Registratie.AxMaatwerkGenerischItemId=$P(OLRec,"\",57)
 							Set:..Registratie.AxConfigId="" ..Registratie.AxConfigId=$P(OLRec,"\",56)
 
 						}
Index: APPS/VKP/Maatwerk/LadeRegistratie/impl/Registratie.cls.xml
===================================================================
diff -u -r53243 -r55526
--- APPS/VKP/Maatwerk/LadeRegistratie/impl/Registratie.cls.xml	(.../Registratie.cls.xml)	(revision 53243)
+++ APPS/VKP/Maatwerk/LadeRegistratie/impl/Registratie.cls.xml	(.../Registratie.cls.xml)	(revision 55526)
@@ -23,10 +23,6 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="BaseArticleID">
-<Type>%String</Type>
-</Property>
-
 <Property name="ExterneVariantID">
 <Type>%String</Type>
 </Property>
@@ -72,10 +68,14 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="AxMaatwerkGenerischItemId">
+<Property name="AxItemId">
 <Type>%String</Type>
 </Property>
 
+<Property name="AxOrderId">
+<Type>%String</Type>
+</Property>
+
 <Index name="Registratie">
 <Properties>RegistratieCode</Properties>
 </Index>
@@ -119,7 +119,7 @@
 <Value>PRNr</Value>
 </Value>
 <Value name="6">
-<Value>BaseArticleID</Value>
+<Value>AxOrderId</Value>
 </Value>
 <Value name="7">
 <Value>ExterneVariantID</Value>
@@ -155,7 +155,7 @@
 <Value>AxConfigId</Value>
 </Value>
 <Value name="18">
-<Value>AxMaatwerkGenerischItemId</Value>
+<Value>AxItemId</Value>
 </Value>
 </Data>
 </Storage>
Index: AXimpl/PM/Kenmerk/ConvertAll.cls.xml
===================================================================
diff -u -r54529 -r55526
--- AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 54529)
+++ AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 55526)
@@ -58,7 +58,7 @@
 <Method name="ConverteerOne">
 <FormalSpec>ProductID:%String,PRNr:%String,RecID:%String</FormalSpec>
 <Implementation><![CDATA[
-	If '##class(Kenmerken).%ExistsId(ProductID)&&..UpdateOnly
+	If '(##class(Kenmerken).%ExistsId(ProductID)&&..UpdateOnly)
 	{
 		Do ##class(Kenmerken).%DeleteId(ProductID)
 		Set GenTyp=$P($$GENTYP^HAD(PRNr),"\")