Index: DOM/PM/Maatwerk/Calc/Common/IKCanonischeWaardeGenerator.cls.xml
===================================================================
diff -u -r68024 -r68039
--- DOM/PM/Maatwerk/Calc/Common/IKCanonischeWaardeGenerator.cls.xml	(.../IKCanonischeWaardeGenerator.cls.xml)	(revision 68024)
+++ DOM/PM/Maatwerk/Calc/Common/IKCanonischeWaardeGenerator.cls.xml	(.../IKCanonischeWaardeGenerator.cls.xml)	(revision 68039)
@@ -359,7 +359,7 @@
 	Set ..CanonischeWaarde = ..CanonischeWaarde 
 			_ ";" _ INKKenmerken.AantalLengtes
 			_ ";" _ INKKenmerken.IdentiekeLengtes
-			_ ";" _ INKKenmerken.ItemId
+			_ ";" _ INKKenmerken.HalffabrikaatIdentNummer
 			_ ";" _ INKKenmerken.LengteProduct
 			_ ";" _ INKKenmerken.Lengtes
 ]]></Implementation>
Index: APPS/PM/Maatwerk/dto/INKKenmerken.cls.xml
===================================================================
diff -u -r68022 -r68039
--- APPS/PM/Maatwerk/dto/INKKenmerken.cls.xml	(.../INKKenmerken.cls.xml)	(revision 68022)
+++ APPS/PM/Maatwerk/dto/INKKenmerken.cls.xml	(.../INKKenmerken.cls.xml)	(revision 68039)
@@ -13,7 +13,7 @@
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="IdentNummer">
+<Property name="HalffabrikaatIdentNummer">
 <Type>%String</Type>
 </Property>
 
Index: ECON/PM/Maatwerk/dto/InkKenmerken.cls.xml
===================================================================
diff -u -r68022 -r68039
--- ECON/PM/Maatwerk/dto/InkKenmerken.cls.xml	(.../InkKenmerken.cls.xml)	(revision 68022)
+++ ECON/PM/Maatwerk/dto/InkKenmerken.cls.xml	(.../InkKenmerken.cls.xml)	(revision 68039)
@@ -14,16 +14,16 @@
 <Parameter name="XMLNAME" value="Familie"/>
 </Property>
 
+<Property name="HalffabrikaatIdentNummer">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Halffabrikaatidentnummer"/>
+</Property>
+
 <Property name="IdentiekeLengtes">
 <Type>ECON.Boolean</Type>
 <Parameter name="XMLNAME" value="Identiekelengtes"/>
 </Property>
 
-<Property name="IdentNummer">
-<Type>ECON.String</Type>
-<Parameter name="XMLNAME" value="Identnummer"/>
-</Property>
-
 <Property name="LengteProduct">
 <Type>ECON.String</Type>
 <Parameter name="XMLNAME" value="Lengteproduct"/>
@@ -43,13 +43,30 @@
 <CodeMode>objectgenerator</CodeMode>
 <FormalSpec>KenmerkenArray:%ArrayOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-	#dim Code,Key,Keys,Properties,Property,PropertyType
+	#dim Code,Key,Keys,Properties,Property,PropertyType,XmlName,Found,Counter
 
-	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")	
+	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")
 	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
 	
 	set (Property,Key)=""
-	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+	set objCompiledClass = ##class(%Library.CompiledClass).%OpenId(##class(ECON.PM.Maatwerk.dto.InkKenmerken).%ClassName(1))	
+	
+	for { set Key = $order(Keys(Key)) quit:Key=""
+		Set Found = 0
+		Set Counter = 1
+		while ('Found) {
+			set Property = objCompiledClass.Properties.GetAt(Counter).Name
+			set XmlName = objCompiledClass.Properties.GetAt(Counter).Parameters.GetAt("XMLNAME")
+			
+			Set:'$length(XmlName) XmlName = Property
+			
+			If (XmlName = $Piece(Key,".",3)) {		//Data.Kenmerken. ....
+				Set Found = 1	
+			}
+			
+			Set Counter = Counter +1
+		}
+				
 		set PropertyType = $LG( $G(Properties(Property)), 1)
 		set Code = $$subFromArrayGenerateKenmerkCode(Property, Key, PropertyType)
 		do %code.WriteLine($$$TAB_Code)
@@ -74,15 +91,32 @@
 <CodeMode>objectgenerator</CodeMode>
 <ReturnType>%ArrayOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	#dim Code,Key,Keys,Properties,Property
+	#dim Code,Key,Keys,Properties,Property,XmlName,Found,Counter
 
 	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")
 	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
 	
 	do %code.WriteLine($$$TAB_"set KenmerkenArray = ##class(%ArrayOfDataTypes).%New()")
 	
 	set (Property,Key)=""
-	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+	set objCompiledClass = ##class(%Library.CompiledClass).%OpenId(##class(ECON.PM.Maatwerk.dto.InkKenmerken).%ClassName(1))
+	
+	for { set Key = $order(Keys(Key)) quit:Key=""
+		Set Found = 0
+		Set Counter = 1
+		while ('Found) {
+			set Property = objCompiledClass.Properties.GetAt(Counter).Name
+			set XmlName = objCompiledClass.Properties.GetAt(Counter).Parameters.GetAt("XMLNAME")
+			
+			Set:'$length(XmlName) XmlName = Property
+			
+			If (XmlName = $Piece(Key,".",3)) {		//Data.Kenmerken. ....
+				Set Found = 1	
+			}
+			
+			Set Counter = Counter +1
+		}
+				
 		set Code = "do:$length(.."_Property_") KenmerkenArray.SetAt(.."_Property_","""_Key_""")"
 		do %code.WriteLine($$$TAB_Code)
 	}
@@ -106,16 +140,16 @@
 <Value>AantalLengtes</Value>
 </Value>
 <Value name="4">
-<Value>IdentiekeLengtes</Value>
+<Value>HalffabrikaatIdentNummer</Value>
 </Value>
 <Value name="5">
-<Value>LengteProduct</Value>
+<Value>IdentiekeLengtes</Value>
 </Value>
 <Value name="6">
-<Value>Lengtes</Value>
+<Value>LengteProduct</Value>
 </Value>
 <Value name="7">
-<Value>IdentNummer</Value>
+<Value>Lengtes</Value>
 </Value>
 </Data>
 </Storage>
Index: APPS/PM/Maatwerk/impl/KenmerkenValidator/INK.cls.xml
===================================================================
diff -u -r68024 -r68039
--- APPS/PM/Maatwerk/impl/KenmerkenValidator/INK.cls.xml	(.../INK.cls.xml)	(revision 68024)
+++ APPS/PM/Maatwerk/impl/KenmerkenValidator/INK.cls.xml	(.../INK.cls.xml)	(revision 68039)
@@ -9,7 +9,7 @@
 	#dim OngeldigeProperties As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
 	
 	Do:(InkKenmerken.AantalLengtes = "") OngeldigeProperties.Insert("AantalLengtes")
-	Do:(InkKenmerken.IdentNummer = "") OngeldigeProperties.Insert("IdentNummer")
+	Do:(InkKenmerken.HalffabrikaatIdentNummer = "") OngeldigeProperties.Insert("HalffabrikaatIdentNummer")
 	Do:(InkKenmerken.LengteProduct = "") OngeldigeProperties.Insert("LengteProduct")
 	
 	If (OngeldigeProperties.Count()) {
Index: APPS/PM/Maatwerk/impl/DtoNaarKenmerkVisitor.cls.xml
===================================================================
diff -u -r68023 -r68039
--- APPS/PM/Maatwerk/impl/DtoNaarKenmerkVisitor.cls.xml	(.../DtoNaarKenmerkVisitor.cls.xml)	(revision 68023)
+++ APPS/PM/Maatwerk/impl/DtoNaarKenmerkVisitor.cls.xml	(.../DtoNaarKenmerkVisitor.cls.xml)	(revision 68039)
@@ -261,7 +261,7 @@
 	
 	Set ..IngegevenKenmerken.AantalLengtes = INKKenmerken.AantalLengtes
 	Set ..IngegevenKenmerken.IdentiekeLengtes = INKKenmerken.IdentiekeLengtes
-	Set ..IngegevenKenmerken.IdentNummer = INKKenmerken.IdentNummer
+	Set ..IngegevenKenmerken.HalffabrikaatIdentNummer = INKKenmerken.HalffabrikaatIdentNummer
 	Set ..IngegevenKenmerken.LengteProduct = INKKenmerken.LengteProduct	
 	Set ..IngegevenKenmerken.Lengtes = INKKenmerken.Lengtes
 	
Index: DOM/PM/Maatwerk/Calc/Common/impl/INKKenmerken.cls.xml
===================================================================
diff -u -r68022 -r68039
--- DOM/PM/Maatwerk/Calc/Common/impl/INKKenmerken.cls.xml	(.../INKKenmerken.cls.xml)	(revision 68022)
+++ DOM/PM/Maatwerk/Calc/Common/impl/INKKenmerken.cls.xml	(.../INKKenmerken.cls.xml)	(revision 68039)
@@ -13,7 +13,7 @@
 <Type>%Boolean</Type>
 </Property>
 
-<Property name="IdentNummer">
+<Property name="HalffabrikaatIdentNummer">
 <Type>%String</Type>
 </Property>
 
@@ -54,6 +54,7 @@
 <Type>%Library.CacheStorage</Type>
 <DefaultData>INKKenmerkenDefaultData</DefaultData>
 <Data name="INKKenmerkenDefaultData">
+<Structure>listnode</Structure>
 <Subscript>"INKKenmerken"</Subscript>
 <Value name="1">
 <Value>AantalLengtes</Value>
@@ -62,17 +63,14 @@
 <Value>IdentiekeLengtes</Value>
 </Value>
 <Value name="3">
-<Value>ItemId</Value>
+<Value>HalffabrikaatIdentNummer</Value>
 </Value>
 <Value name="4">
 <Value>LengteProduct</Value>
 </Value>
 <Value name="5">
 <Value>Lengtes</Value>
 </Value>
-<Value name="6">
-<Value>IdentNummer</Value>
-</Value>
 </Data>
 </Storage>
 </Class>