Index: ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml
===================================================================
diff -u -r39920 -r39989
--- ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39920)
+++ ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39989)
@@ -240,8 +240,8 @@
 <Implementation><![CDATA[
 	#dim Code,Key,Keys,Properties,Property
 
-	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(..%ClassName(1),.Keys)	
-	do arrProperties^vhLib.Class(..%ClassName(1),.Properties,"A","A","A",1)
+	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys)	
+	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=""
@@ -261,8 +261,8 @@
 <Implementation><![CDATA[
 	#dim Code,Key,Keys,Properties,Property
 
-	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(..%ClassName(1),.Keys)
-	do arrProperties^vhLib.Class(..%ClassName(1),.Properties,"A","A","A",1)
+	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys)
+	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
 	
 	do %code.WriteLine($$$TAB_"set KenmerkenArray = ##class(%ArrayOfDataTypes).%New()")