diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
index 6f48edc1a..bf56c65ef 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -59,13 +59,13 @@
         <field id="impact_code" xsi:type="AttributeEnum">
           <values>
             <value id="manual">
-              <enum_code>manual</enum_code>
+              <code>manual</code>
             </value>
             <value id="computed">
-              <enum_code>computed</enum_code>
+              <code>computed</code>
             </value>
             <value id="not_impacted">
-              <enum_code>not_impacted</enum_code>
+              <code>not_impacted</code>
             </value>
           </values>
           <sql>impact_code</sql>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index 9a82a24eb..ef5ec06c9 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -43,7 +43,7 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="approved">approved
-              <enum_code>approved</enum_code>
+              <code>approved</code>
               <style>
                 <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -51,7 +51,7 @@
               </style>
             </value>
             <value id="assigned">assigned
-              <enum_code>assigned</enum_code>
+              <code>assigned</code>
               <style>
                 <main_color>#2C5382</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -59,7 +59,7 @@
               </style>
             </value>
             <value id="closed">
-              <enum_code>closed</enum_code>
+              <code>closed</code>
               <style>
                 <main_color>#E1E7EC</main_color>
                 <complementary_color>#6E7A8A</complementary_color>
@@ -67,13 +67,13 @@
               </style>
             </value>
             <value id="implemented">
-              <enum_code>implemented</enum_code>
+              <code>implemented</code>
             </value>
             <value id="monitored">
-              <enum_code>monitored</enum_code>
+              <code>monitored</code>
             </value>
             <value id="new">
-              <enum_code>new</enum_code>
+              <code>new</code>
               <style>
                 <main_color>#2C5382</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -81,7 +81,7 @@
               </style>
             </value>
             <value id="notapproved">
-              <enum_code>notapproved</enum_code>
+              <code>notapproved</code>
               <style>
                 <main_color>#B83280</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -89,7 +89,7 @@
               </style>
             </value>
             <value id="plannedscheduled">
-              <enum_code>plannedscheduled</enum_code>
+              <code>plannedscheduled</code>
               <style>
                 <main_color>#F6AE55</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -97,7 +97,7 @@
               </style>
             </value>
             <value id="rejected">
-              <enum_code>rejected</enum_code>
+              <code>rejected</code>
               <style>
                 <main_color>#B83280</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -105,7 +105,7 @@
               </style>
             </value>
             <value id="validated">
-              <enum_code>validated</enum_code>
+              <code>validated</code>
               <style>
                 <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -214,10 +214,10 @@
         <field id="outage" xsi:type="AttributeEnum">
           <values>
             <value id="yes">
-              <enum_code>yes</enum_code>
+              <code>yes</code>
             </value>
             <value id="no">
-              <enum_code>no</enum_code>
+              <code>no</code>
             </value>
           </values>
           <sql>outage</sql>
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index b113b8831..74504c75a 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -42,7 +42,7 @@
                 <field id="status" xsi:type="AttributeEnum">
                     <values>
                         <value id="new">
-                            <enum_code>new</enum_code>
+                            <code>new</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -50,7 +50,7 @@
                             </style>
                         </value>
                         <value id="assigned">
-                            <enum_code>assigned</enum_code>
+                            <code>assigned</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -58,10 +58,10 @@
                             </style>
                         </value>
                         <value id="planned">
-                            <enum_code>planned</enum_code>
+                            <code>planned</code>
                         </value>
                         <value id="approved">
-                            <enum_code>approved</enum_code>
+                            <code>approved</code>
                             <style>
                                 <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -69,7 +69,7 @@
                             </style>
                         </value>
                         <value id="closed">
-                            <enum_code>closed</enum_code>
+                            <code>closed</code>
                             <style>
                                 <main_color>#E1E7EC</main_color>
                                 <complementary_color>#6E7A8A</complementary_color>
@@ -77,7 +77,7 @@
                             </style>
                         </value>
                         <value id="rejected">
-                            <enum_code>rejected</enum_code>
+                            <code>rejected</code>
                             <style>
                                 <main_color>#B83280</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -97,22 +97,22 @@
                 <field id="category" xsi:type="AttributeEnum">
                     <values>
                         <value id="hardware">
-                            <enum_code>hardware</enum_code>
+                            <code>hardware</code>
                         </value>
                         <value id="software">
-                            <enum_code>software</enum_code>
+                            <code>software</code>
                         </value>
                         <value id="system">
-                            <enum_code>system</enum_code>
+                            <code>system</code>
                         </value>
                         <value id="network">
-                            <enum_code>network</enum_code>
+                            <code>network</code>
                         </value>
                         <value id="application">
-                            <enum_code>application</enum_code>
+                            <code>application</code>
                         </value>
                         <value id="other">
-                            <enum_code>other</enum_code>
+                            <code>other</code>
                         </value>
                     </values>
                     <sql>category</sql>
@@ -165,10 +165,10 @@
                 <field id="outage" xsi:type="AttributeEnum">
                     <values>
                         <value id="yes">
-                            <enum_code>yes</enum_code>
+                            <code>yes</code>
                         </value>
                         <value id="no">
-                            <enum_code>no</enum_code>
+                            <code>no</code>
                         </value>
                     </values>
                     <sql>outage</sql>
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 3bc6e2e49..6f2094501 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -51,13 +51,13 @@
 				<field id="business_criticity" xsi:type="AttributeEnum">
 					<values>
 						<value id="high">
-							<enum_code>high</enum_code>
+							<code>high</code>
 						</value>
 						<value id="medium">
-							<enum_code>medium</enum_code>
+							<code>medium</code>
 						</value>
 						<value id="low">
-							<enum_code>low</enum_code>
+							<code>low</code>
 						</value>
 					</values>
 					<sql>business_criticity</sql>
@@ -309,16 +309,16 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="production">
-							<enum_code>production</enum_code>
+							<code>production</code>
 						</value>
 						<value id="implementation">
-							<enum_code>implementation</enum_code>
+							<code>implementation</code>
 						</value>
 						<value id="stock">
-							<enum_code>stock</enum_code>
+							<code>stock</code>
 						</value>
 						<value id="obsolete">
-							<enum_code>obsolete</enum_code>
+							<code>obsolete</code>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1582,7 +1582,7 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="active">
-							<enum_code>active</enum_code>
+							<code>active</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -1590,7 +1590,7 @@
 							</style>
 						</value>
 						<value id="inactive">
-							<enum_code>inactive</enum_code>
+							<code>inactive</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -1734,7 +1734,7 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="active">
-							<enum_code>active</enum_code>
+							<code>active</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -1742,7 +1742,7 @@
 							</style>
 						</value>
 						<value id="inactive">
-							<enum_code>inactive</enum_code>
+							<code>inactive</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -1902,7 +1902,7 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="active">
-							<enum_code>active</enum_code>
+							<code>active</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -1910,7 +1910,7 @@
 							</style>
 						</value>
 						<value id="inactive">
-							<enum_code>inactive</enum_code>
+							<code>inactive</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -3037,19 +3037,19 @@
 				<field id="type" xsi:type="AttributeEnum">
 					<values>
 						<value id="Middleware">
-							<enum_code>Middleware</enum_code>
+							<code>Middleware</code>
 						</value>
 						<value id="DBServer">
-							<enum_code>DBServer</enum_code>
+							<code>DBServer</code>
 						</value>
 						<value id="PCSoftware">
-							<enum_code>PCSoftware</enum_code>
+							<code>PCSoftware</code>
 						</value>
 						<value id="OtherSoftware">
-							<enum_code>OtherSoftware</enum_code>
+							<code>OtherSoftware</code>
 						</value>
 						<value id="WebServer">
-							<enum_code>WebServer</enum_code>
+							<code>WebServer</code>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -3501,10 +3501,10 @@
 				<field id="perpetual" xsi:type="AttributeEnum">
 					<values>
 						<value id="yes">
-							<enum_code>yes</enum_code>
+							<code>yes</code>
 						</value>
 						<value id="no">
-							<enum_code>no</enum_code>
+							<code>no</code>
 						</value>
 					</values>
 					<sql>perpetual</sql>
@@ -4183,58 +4183,58 @@
 				<field id="type" xsi:type="AttributeEnum">
 					<values>
 						<value id="NetworkDevice">
-							<enum_code>NetworkDevice</enum_code>
+							<code>NetworkDevice</code>
 						</value>
 						<value id="Server">
-							<enum_code>Server</enum_code>
+							<code>Server</code>
 						</value>
 						<value id="SANSwitch">
-							<enum_code>SANSwitch</enum_code>
+							<code>SANSwitch</code>
 						</value>
 						<value id="StorageSystem">
-							<enum_code>StorageSystem</enum_code>
+							<code>StorageSystem</code>
 						</value>
 						<value id="Rack">
-							<enum_code>Rack</enum_code>
+							<code>Rack</code>
 						</value>
 						<value id="Enclosure">
-							<enum_code>Enclosure</enum_code>
+							<code>Enclosure</code>
 						</value>
 						<value id="PC">
-							<enum_code>PC</enum_code>
+							<code>PC</code>
 						</value>
 						<value id="Tablet">
-							<enum_code>Tablet</enum_code>
+							<code>Tablet</code>
 						</value>
 						<value id="Phone">
-							<enum_code>Phone</enum_code>
+							<code>Phone</code>
 						</value>
 						<value id="MobilePhone">
-							<enum_code>MobilePhone</enum_code>
+							<code>MobilePhone</code>
 						</value>
 						<value id="Printer">
-							<enum_code>Printer</enum_code>
+							<code>Printer</code>
 						</value>
 						<value id="DiskArray">
-							<enum_code>DiskArray</enum_code>
+							<code>DiskArray</code>
 						</value>
 						<value id="NAS">
-							<enum_code>NAS</enum_code>
+							<code>NAS</code>
 						</value>
 						<value id="TapeLibrary">
-							<enum_code>TapeLibrary</enum_code>
+							<code>TapeLibrary</code>
 						</value>
 						<value id="IPPhone">
-							<enum_code>IPPhone</enum_code>
+							<code>IPPhone</code>
 						</value>
 						<value id="Peripheral">
-							<enum_code>Peripheral</enum_code>
+							<code>Peripheral</code>
 						</value>
 						<value id="PowerSource">
-							<enum_code>PowerSource</enum_code>
+							<code>PowerSource</code>
 						</value>
 						<value id="PDU">
-							<enum_code>PDU</enum_code>
+							<code>PDU</code>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -5776,10 +5776,10 @@
 				<field id="connection_type" xsi:type="AttributeEnum">
 					<values>
 						<value id="uplink">
-							<enum_code>uplink</enum_code>
+							<code>uplink</code>
 						</value>
 						<value id="downlink">
-							<enum_code>downlink</enum_code>
+							<code>downlink</code>
 						</value>
 					</values>
 					<sql>type</sql>
@@ -6178,13 +6178,13 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="production">
-							<enum_code>production</enum_code>
+							<code>production</code>
 						</value>
 						<value id="implementation">
-							<enum_code>implementation</enum_code>
+							<code>implementation</code>
 						</value>
 						<value id="obsolete">
-							<enum_code>obsolete</enum_code>
+							<code>obsolete</code>
 						</value>
 					</values>
 					<sql>status</sql>
diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
index 72a70989e..7b1a8d44b 100644
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
@@ -850,10 +850,10 @@
         <field id="type" xsi:type="AttributeEnum">
           <values>
             <value id="laptop">
-              <enum_code>laptop</enum_code>
+              <code>laptop</code>
             </value>
             <value id="desktop">
-              <enum_code>desktop</enum_code>
+              <code>desktop</code>
             </value>
           </values>
           <sql>type</sql>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index c7b7342c4..e91caebd5 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -43,7 +43,7 @@
 					<always_load_in_tables>true</always_load_in_tables>
 					<values>
 						<value id="new">
-							<enum_code>new</enum_code>
+							<code>new</code>
 							<style>
 								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -51,7 +51,7 @@
 							</style>
 						</value>
 						<value id="assigned">
-							<enum_code>assigned</enum_code>
+							<code>assigned</code>
 							<style>
 								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -59,7 +59,7 @@
 							</style>
 						</value>
 						<value id="pending">
-							<enum_code>pending</enum_code>
+							<code>pending</code>
 							<style>
 								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -67,7 +67,7 @@
 							</style>
 						</value>
 						<value id="escalated_tto">
-							<enum_code>escalated_tto</enum_code>
+							<code>escalated_tto</code>
 							<style>
 								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -75,7 +75,7 @@
 							</style>
 						</value>
 						<value id="escalated_ttr">
-							<enum_code>escalated_ttr</enum_code>
+							<code>escalated_ttr</code>
 							<style>
 								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -83,7 +83,7 @@
 							</style>
 						</value>
 						<value id="resolved">
-							<enum_code>resolved</enum_code>
+							<code>resolved</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -91,7 +91,7 @@
 							</style>
 						</value>
 						<value id="closed">
-							<enum_code>closed</enum_code>
+							<code>closed</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -112,13 +112,13 @@
 				<field id="impact" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 					</values>
 					<sql>impact</sql>
@@ -129,16 +129,16 @@
 				<field id="priority" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<dependencies>
@@ -152,16 +152,16 @@
 				<field id="urgency" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<sql>urgency</sql>
@@ -171,16 +171,16 @@
 				<field id="origin" xsi:type="AttributeEnum">
 					<values>
 						<value id="mail">
-							<enum_code>mail</enum_code>
+							<code>mail</code>
 						</value>
 						<value id="phone">
-							<enum_code>phone</enum_code>
+							<code>phone</code>
 						</value>
 						<value id="portal">
-							<enum_code>portal</enum_code>
+							<code>portal</code>
 						</value>
 						<value id="monitoring">
-							<enum_code>monitoring</enum_code>
+							<code>monitoring</code>
 						</value>
 					</values>
 					<sql>origin</sql>
@@ -225,10 +225,10 @@
 				<field id="escalation_flag" xsi:type="AttributeEnum">
 					<values>
 						<value id="yes">
-							<enum_code>yes</enum_code>
+							<code>yes</code>
 						</value>
 						<value id="no">
-							<enum_code>no</enum_code>
+							<code>no</code>
 						</value>
 					</values>
 					<sql>escalation_flag</sql>
@@ -364,25 +364,25 @@
 				<field id="resolution_code" xsi:type="AttributeEnum">
 					<values>
 						<value id="assistance">
-							<enum_code>assistance</enum_code>
+							<code>assistance</code>
 						</value>
 						<value id="other">
-							<enum_code>other</enum_code>
+							<code>other</code>
 						</value>
 						<value id="software patch">
-							<enum_code>software patch</enum_code>
+							<code>software patch</code>
 						</value>
 						<value id="training">
-							<enum_code>training</enum_code>
+							<code>training</code>
 						</value>
 						<value id="hardware repair">
-							<enum_code>hardware repair</enum_code>
+							<code>hardware repair</code>
 						</value>
 						<value id="system update">
-							<enum_code>system update</enum_code>
+							<code>system update</code>
 						</value>
 						<value id="bug fixed">
-							<enum_code>bug fixed</enum_code>
+							<code>bug fixed</code>
 						</value>
 					</values>
 					<sql>resolution_code</sql>
@@ -454,16 +454,16 @@
 				<field id="user_satisfaction" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<sql>user_satisfaction</sql>
diff --git a/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
index 651f1b6e9..58910d5de 100755
--- a/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
+++ b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
@@ -82,16 +82,16 @@
         <field id="domain" xsi:type="AttributeEnum">
           <values>
             <value id="Network">
-              <enum_code>Network</enum_code>
+              <code>Network</code>
             </value>
             <value id="Server">
-              <enum_code>Server</enum_code>
+              <code>Server</code>
             </value>
             <value id="Application">
-              <enum_code>Application</enum_code>
+              <code>Application</code>
             </value>
             <value id="Desktop">
-              <enum_code>Desktop</enum_code>
+              <code>Desktop</code>
             </value>
           </values>
           <sql>domain</sql>
diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index f0f271c8f..7091add58 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -42,7 +42,7 @@
                 <field id="status" xsi:type="AttributeEnum">
                     <values>
                         <value id="new">
-                            <enum_code>new</enum_code>
+                            <code>new</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -50,7 +50,7 @@
                             </style>
                         </value>
                         <value id="assigned">
-                            <enum_code>assigned</enum_code>
+                            <code>assigned</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -58,7 +58,7 @@
                             </style>
                         </value>
                         <value id="resolved">
-                            <enum_code>resolved</enum_code>
+                            <code>resolved</code>
                             <style>
                                 <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -66,7 +66,7 @@
                             </style>
                         </value>
                         <value id="closed">
-                            <enum_code>closed</enum_code>
+                            <code>closed</code>
                             <style>
                                 <main_color>#E1E7EC</main_color>
                                 <complementary_color>#6E7A8A</complementary_color>
@@ -122,13 +122,13 @@
                 <field id="impact" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                     </values>
                     <sql>impact</sql>
@@ -139,16 +139,16 @@
                 <field id="urgency" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                         <value id="4">
-                            <enum_code>4</enum_code>
+                            <code>4</code>
                         </value>
                     </values>
                     <sql>urgency</sql>
@@ -159,16 +159,16 @@
                 <field id="priority" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                         <value id="4">
-                            <enum_code>4</enum_code>
+                            <code>4</code>
                         </value>
                     </values>
                     <sql>priority</sql>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index 6e590316e..e23ba2d00 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -44,7 +44,7 @@
 					<always_load_in_tables>true</always_load_in_tables>
 					<values>
 						<value id="new">
-							<enum_code>new</enum_code>
+							<code>new</code>
 							<style>
 								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -52,7 +52,7 @@
 							</style>
 						</value>
 						<value id="waiting_for_approval">
-							<enum_code>waiting_for_approval</enum_code>
+							<code>waiting_for_approval</code>
 							<style>
 								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -60,7 +60,7 @@
 							</style>
 						</value>
 						<value id="approved">
-							<enum_code>approved</enum_code>
+							<code>approved</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -68,7 +68,7 @@
 							</style>
 						</value>
 						<value id="rejected">
-							<enum_code>rejected</enum_code>
+							<code>rejected</code>
 							<style>
 								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -76,7 +76,7 @@
 							</style>
 						</value>
 						<value id="assigned">
-							<enum_code>assigned</enum_code>
+							<code>assigned</code>
 							<style>
 								<main_color>#2C5382</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -84,7 +84,7 @@
 							</style>
 						</value>
 						<value id="pending">
-							<enum_code>pending</enum_code>
+							<code>pending</code>
 							<style>
 								<main_color>#F6AE55</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -92,7 +92,7 @@
 							</style>
 						</value>
 						<value id="escalated_tto">
-							<enum_code>escalated_tto</enum_code>
+							<code>escalated_tto</code>
 							<style>
 								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -100,7 +100,7 @@
 							</style>
 						</value>
 						<value id="escalated_ttr">
-							<enum_code>escalated_ttr</enum_code>
+							<code>escalated_ttr</code>
 							<style>
 								<main_color>#B83280</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -108,7 +108,7 @@
 							</style>
 						</value>
 						<value id="resolved">
-							<enum_code>resolved</enum_code>
+							<code>resolved</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -116,7 +116,7 @@
 							</style>
 						</value>
 						<value id="closed">
-							<enum_code>closed</enum_code>
+							<code>closed</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -136,7 +136,7 @@
 				<field id="request_type" xsi:type="AttributeEnum">
 					<values>
 						<value id="service_request">
-							<enum_code>service_request</enum_code>
+							<code>service_request</code>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -147,13 +147,13 @@
 				<field id="impact" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 					</values>
 					<sql>impact</sql>
@@ -164,16 +164,16 @@
 				<field id="priority" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<dependencies>
@@ -187,16 +187,16 @@
 				<field id="urgency" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<sql>urgency</sql>
@@ -206,13 +206,13 @@
 				<field id="origin" xsi:type="AttributeEnum">
 					<values>
 						<value id="mail">
-							<enum_code>mail</enum_code>
+							<code>mail</code>
 						</value>
 						<value id="phone">
-							<enum_code>phone</enum_code>
+							<code>phone</code>
 						</value>
 						<value id="portal">
-							<enum_code>portal</enum_code>
+							<code>portal</code>
 						</value>
 					</values>
 					<sql>origin</sql>
@@ -271,10 +271,10 @@
 				<field id="escalation_flag" xsi:type="AttributeEnum">
 					<values>
 						<value id="yes">
-							<enum_code>yes</enum_code>
+							<code>yes</code>
 						</value>
 						<value id="no">
-							<enum_code>no</enum_code>
+							<code>no</code>
 						</value>
 					</values>
 					<sql>escalation_flag</sql>
@@ -412,14 +412,14 @@
 				<field id="resolution_code" xsi:type="AttributeEnum">
 					<values>
 						<value id="assistance">
-							<enum_code>assistance</enum_code>
+							<code>assistance</code>
 						</value>
 						<value id="other">
-							<enum_code>other</enum_code>
+							<code>other</code>
 						</value>
 						<value id="software patch">software patch</value>
 						<value id="training">
-							<enum_code>training</enum_code>
+							<code>training</code>
 						</value>
 						<value id="hardware repair">hardware repair</value>
 						<value id="system update">system update</value>
@@ -499,16 +499,16 @@
 				<field id="user_satisfaction" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<sql>user_satisfaction</sql>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index aee66d483..bd5afb4a2 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -44,7 +44,7 @@
                     <always_load_in_tables>true</always_load_in_tables>
                     <values>
                         <value id="new">
-                            <enum_code>new</enum_code>
+                            <code>new</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -52,7 +52,7 @@
                             </style>
                         </value>
                         <value id="waiting_for_approval">
-                            <enum_code>waiting_for_approval</enum_code>
+                            <code>waiting_for_approval</code>
                             <style>
                                 <main_color>#F6AE55</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -60,7 +60,7 @@
                             </style>
                         </value>
                         <value id="approved">
-                            <enum_code>approved</enum_code>
+                            <code>approved</code>
                             <style>
                                 <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -68,7 +68,7 @@
                             </style>
                         </value>
                         <value id="rejected">
-                            <enum_code>rejected</enum_code>
+                            <code>rejected</code>
                             <style>
                                 <main_color>#B83280</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -76,7 +76,7 @@
                             </style>
                         </value>
                         <value id="assigned">
-                            <enum_code>assigned</enum_code>
+                            <code>assigned</code>
                             <style>
                                 <main_color>#2C5382</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -84,7 +84,7 @@
                             </style>
                         </value>
                         <value id="pending">
-                            <enum_code>pending</enum_code>
+                            <code>pending</code>
                             <style>
                                 <main_color>#F6AE55</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -92,7 +92,7 @@
                             </style>
                         </value>
                         <value id="escalated_tto">
-                            <enum_code>escalated_tto</enum_code>
+                            <code>escalated_tto</code>
                             <style>
                                 <main_color>#B83280</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -100,7 +100,7 @@
                             </style>
                         </value>
                         <value id="escalated_ttr">
-                            <enum_code>escalated_ttr</enum_code>
+                            <code>escalated_ttr</code>
                             <style>
                                 <main_color>#B83280</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -108,7 +108,7 @@
                             </style>
                         </value>
                         <value id="resolved">
-                            <enum_code>resolved</enum_code>
+                            <code>resolved</code>
                             <style>
                                 <main_color>#689F38</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -116,7 +116,7 @@
                             </style>
                         </value>
                         <value id="closed">
-                            <enum_code>closed</enum_code>
+                            <code>closed</code>
                             <style>
                                 <main_color>#E1E7EC</main_color>
                                 <complementary_color>#6E7A8A</complementary_color>
@@ -136,10 +136,10 @@
                 <field id="request_type" xsi:type="AttributeEnum">
                     <values>
                         <value id="incident">
-                            <enum_code>incident</enum_code>
+                            <code>incident</code>
                         </value>
                         <value id="service_request">
-                            <enum_code>service_request</enum_code>
+                            <code>service_request</code>
                         </value>
                     </values>
                     <sql>request_type</sql>
@@ -150,13 +150,13 @@
                 <field id="impact" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                     </values>
                     <sql>impact</sql>
@@ -167,7 +167,7 @@
                 <field id="priority" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                             <style>
                                 <main_color>#C53030</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -175,7 +175,7 @@
                             </style>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                             <style>
                                 <main_color>#C05621</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -183,7 +183,7 @@
                             </style>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                             <style>
                                 <main_color>#2B6BB0</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -191,7 +191,7 @@
                             </style>
                         </value>
                         <value id="4">
-                            <enum_code>4</enum_code>
+                            <code>4</code>
                             <style>
                                 <main_color>#6E7A8A</main_color>
                                 <complementary_color>#FFFFFF</complementary_color>
@@ -215,16 +215,16 @@
                 <field id="urgency" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                         <value id="4">
-                            <enum_code>4</enum_code>
+                            <code>4</code>
                         </value>
                     </values>
                     <sql>urgency</sql>
@@ -234,16 +234,16 @@
                 <field id="origin" xsi:type="AttributeEnum">
                     <values>
                         <value id="mail">
-                            <enum_code>mail</enum_code>
+                            <code>mail</code>
                         </value>
                         <value id="phone">
-                            <enum_code>phone</enum_code>
+                            <code>phone</code>
                         </value>
                         <value id="portal">
-                            <enum_code>portal</enum_code>
+                            <code>portal</code>
                         </value>
                         <value id="monitoring">
-                            <enum_code>monitoring</enum_code>
+                            <code>monitoring</code>
                         </value>
                     </values>
                     <sql>origin</sql>
@@ -307,10 +307,10 @@
                 <field id="escalation_flag" xsi:type="AttributeEnum">
                     <values>
                         <value id="yes">
-                            <enum_code>yes</enum_code>
+                            <code>yes</code>
                         </value>
                         <value id="no">
-                            <enum_code>no</enum_code>
+                            <code>no</code>
                         </value>
                     </values>
                     <sql>escalation_flag</sql>
@@ -447,25 +447,25 @@
                 <field id="resolution_code" xsi:type="AttributeEnum">
                     <values>
                         <value id="assistance">
-                            <enum_code>assistance</enum_code>
+                            <code>assistance</code>
                         </value>
                         <value id="other">
-                            <enum_code>other</enum_code>
+                            <code>other</code>
                         </value>
                         <value id="software patch">
-                            <enum_code>software patch</enum_code>
+                            <code>software patch</code>
                         </value>
                         <value id="training">
-                            <enum_code>training</enum_code>
+                            <code>training</code>
                         </value>
                         <value id="hardware repair">
-                            <enum_code>hardware repair</enum_code>
+                            <code>hardware repair</code>
                         </value>
                         <value id="system update">
-                            <enum_code>system update</enum_code>
+                            <code>system update</code>
                         </value>
                         <value id="bug fixed">
-                            <enum_code>bug fixed</enum_code>
+                            <code>bug fixed</code>
                         </value>
                     </values>
                     <sql>resolution_code</sql>
@@ -538,16 +538,16 @@
                 <field id="user_satisfaction" xsi:type="AttributeEnum">
                     <values>
                         <value id="1">
-                            <enum_code>1</enum_code>
+                            <code>1</code>
                         </value>
                         <value id="2">
-                            <enum_code>2</enum_code>
+                            <code>2</code>
                         </value>
                         <value id="3">
-                            <enum_code>3</enum_code>
+                            <code>3</code>
                         </value>
                         <value id="4">
-                            <enum_code>4</enum_code>
+                            <code>4</code>
                         </value>
                     </values>
                     <sql>user_satisfaction</sql>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
index 42789d20d..114656121 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -132,10 +132,10 @@
         <field id="cost_currency" xsi:type="AttributeEnum">
           <values>
             <value id="dollars">
-              <enum_code>dollars</enum_code>
+              <code>dollars</code>
             </value>
             <value id="euros">
-              <enum_code>euros</enum_code>
+              <code>euros</code>
             </value>
           </values>
           <sql>cost_currency</sql>
@@ -176,13 +176,13 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="production">
-              <enum_code>production</enum_code>
+              <code>production</code>
             </value>
             <value id="implementation">
-              <enum_code>implementation</enum_code>
+              <code>implementation</code>
             </value>
             <value id="obsolete">
-              <enum_code>obsolete</enum_code>
+              <code>obsolete</code>
             </value>
           </values>
           <sql>status</sql>
@@ -1075,13 +1075,13 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="production">
-              <enum_code>production</enum_code>
+              <code>production</code>
             </value>
             <value id="implementation">
-              <enum_code>implementation</enum_code>
+              <code>implementation</code>
             </value>
             <value id="obsolete">
-              <enum_code>obsolete</enum_code>
+              <code>obsolete</code>
             </value>
           </values>
           <sql>status</sql>
@@ -1418,10 +1418,10 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
             <value id="incident">
-              <enum_code>incident</enum_code>
+              <code>incident</code>
             </value>
             <value id="service_request">
-              <enum_code>service_request</enum_code>
+              <code>service_request</code>
             </value>
           </values>
           <sql>request_type</sql>
@@ -1432,13 +1432,13 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="production">
-              <enum_code>production</enum_code>
+              <code>production</code>
             </value>
             <value id="implementation">
-              <enum_code>implementation</enum_code>
+              <code>implementation</code>
             </value>
             <value id="obsolete">
-              <enum_code>obsolete</enum_code>
+              <code>obsolete</code>
             </value>
           </values>
           <sql>status</sql>
@@ -1700,16 +1700,16 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="priority" xsi:type="AttributeEnum">
           <values>
             <value id="1">
-              <enum_code>1</enum_code>
+              <code>1</code>
             </value>
             <value id="2">
-              <enum_code>2</enum_code>
+              <code>2</code>
             </value>
             <value id="3">
-              <enum_code>3</enum_code>
+              <code>3</code>
             </value>
             <value id="4">
-              <enum_code>4</enum_code>
+              <code>4</code>
             </value>
           </values>
           <sql>priority</sql>
@@ -1720,10 +1720,10 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
             <value id="service_request">
-              <enum_code>service_request</enum_code>
+              <code>service_request</code>
             </value>
             <value id="incident">
-              <enum_code>incident</enum_code>
+              <code>incident</code>
             </value>
           </values>
           <sql>request_type</sql>
@@ -1734,10 +1734,10 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="metric" xsi:type="AttributeEnum">
           <values>
             <value id="tto">
-              <enum_code>tto</enum_code>
+              <code>tto</code>
             </value>
             <value id="ttr">
-              <enum_code>ttr</enum_code>
+              <code>ttr</code>
             </value>
           </values>
           <sql>metric</sql>
@@ -1753,10 +1753,10 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="unit" xsi:type="AttributeEnum">
           <values>
             <value id="hours">
-              <enum_code>hours</enum_code>
+              <code>hours</code>
             </value>
             <value id="minutes">
-              <enum_code>minutes</enum_code>
+              <code>minutes</code>
             </value>
           </values>
           <sql>unit</sql>
diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
index ac03db44f..49ab42730 100755
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -132,10 +132,10 @@
 				<field id="cost_currency" xsi:type="AttributeEnum">
 					<values>
 						<value id="dollars">
-							<enum_code>dollars</enum_code>
+							<code>dollars</code>
 						</value>
 						<value id="euros">
-							<enum_code>euros</enum_code>
+							<code>euros</code>
 						</value>
 					</values>
 					<sql>cost_currency</sql>
@@ -176,13 +176,13 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="production">
-							<enum_code>production</enum_code>
+							<code>production</code>
 						</value>
 						<value id="implementation">
-							<enum_code>implementation</enum_code>
+							<code>implementation</code>
 						</value>
 						<value id="obsolete">
-							<enum_code>obsolete</enum_code>
+							<code>obsolete</code>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1047,13 +1047,13 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="production">
-							<enum_code>production</enum_code>
+							<code>production</code>
 						</value>
 						<value id="implementation">
-							<enum_code>implementation</enum_code>
+							<code>implementation</code>
 						</value>
 						<value id="obsolete">
-							<enum_code>obsolete</enum_code>
+							<code>obsolete</code>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1412,10 +1412,10 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="request_type" xsi:type="AttributeEnum">
 					<values>
 						<value id="incident">
-							<enum_code>incident</enum_code>
+							<code>incident</code>
 						</value>
 						<value id="service_request">
-							<enum_code>service_request</enum_code>
+							<code>service_request</code>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -1426,13 +1426,13 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="production">
-							<enum_code>production</enum_code>
+							<code>production</code>
 						</value>
 						<value id="implementation">
-							<enum_code>implementation</enum_code>
+							<code>implementation</code>
 						</value>
 						<value id="obsolete">
-							<enum_code>obsolete</enum_code>
+							<code>obsolete</code>
 						</value>
 					</values>
 					<sql>status</sql>
@@ -1694,16 +1694,16 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="priority" xsi:type="AttributeEnum">
 					<values>
 						<value id="1">
-							<enum_code>1</enum_code>
+							<code>1</code>
 						</value>
 						<value id="2">
-							<enum_code>2</enum_code>
+							<code>2</code>
 						</value>
 						<value id="3">
-							<enum_code>3</enum_code>
+							<code>3</code>
 						</value>
 						<value id="4">
-							<enum_code>4</enum_code>
+							<code>4</code>
 						</value>
 					</values>
 					<sql>priority</sql>
@@ -1714,10 +1714,10 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="request_type" xsi:type="AttributeEnum">
 					<values>
 						<value id="service_request">
-							<enum_code>service_request</enum_code>
+							<code>service_request</code>
 						</value>
 						<value id="incident">
-							<enum_code>incident</enum_code>
+							<code>incident</code>
 						</value>
 					</values>
 					<sql>request_type</sql>
@@ -1728,10 +1728,10 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="metric" xsi:type="AttributeEnum">
 					<values>
 						<value id="tto">
-							<enum_code>tto</enum_code>
+							<code>tto</code>
 						</value>
 						<value id="ttr">
-							<enum_code>ttr</enum_code>
+							<code>ttr</code>
 						</value>
 					</values>
 					<sql>metric</sql>
@@ -1747,10 +1747,10 @@ public function PrefillSearchForm(&$aContextParam)
 				<field id="unit" xsi:type="AttributeEnum">
 					<values>
 						<value id="hours">
-							<enum_code>hours</enum_code>
+							<code>hours</code>
 						</value>
 						<value id="minutes">
-							<enum_code>minutes</enum_code>
+							<code>minutes</code>
 						</value>
 					</values>
 					<sql>unit</sql>
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 66948ab8c..e915004d6 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -51,7 +51,7 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="active">
-              <enum_code>active</enum_code>
+              <code>active</code>
               <style>
                 <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -59,7 +59,7 @@
               </style>
             </value>
             <value id="inactive">
-              <enum_code>inactive</enum_code>
+              <code>inactive</code>
               <style>
                 <main_color>#E1E7EC</main_color>
                 <complementary_color>#6E7A8A</complementary_color>
@@ -228,7 +228,7 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="active">
-              <enum_code>active</enum_code>
+              <code>active</code>
               <style>
                 <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -236,7 +236,7 @@
               </style>
             </value>
             <value id="inactive">
-              <enum_code>inactive</enum_code>
+              <code>inactive</code>
               <style>
                 <main_color>#E1E7EC</main_color>
                 <complementary_color>#6E7A8A</complementary_color>
@@ -417,7 +417,7 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="active">
-              <enum_code>active</enum_code>
+              <code>active</code>
               <style>
                 <main_color>#689F38</main_color>
                 <complementary_color>#FFFFFF</complementary_color>
@@ -425,7 +425,7 @@
               </style>
             </value>
             <value id="inactive">
-              <enum_code>inactive</enum_code>
+              <code>inactive</code>
               <style>
                 <main_color>#E1E7EC</main_color>
                 <complementary_color>#6E7A8A</complementary_color>
@@ -461,10 +461,10 @@
         <field id="notify" xsi:type="AttributeEnum">
           <values>
             <value id="yes">
-              <enum_code>yes</enum_code>
+              <code>yes</code>
             </value>
             <value id="no">
-              <enum_code>no</enum_code>
+              <code>no</code>
             </value>
           </values>
           <sql>notify</sql>
@@ -1225,13 +1225,13 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="draft">
-              <enum_code>draft</enum_code>
+              <code>draft</code>
             </value>
             <value id="published">
-              <enum_code>published</enum_code>
+              <code>published</code>
             </value>
             <value id="obsolete">
-              <enum_code>obsolete</enum_code>
+              <code>obsolete</code>
             </value>
           </values>
           <sql>status</sql>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index c6ef3bd70..b48273bc6 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -54,10 +54,10 @@
 				<field id="operational_status" xsi:type="AttributeMetaEnum">
 					<values>
 						<value id="ongoing">
-							<enum_code>ongoing</enum_code>
+							<code>ongoing</code>
 						</value>
 						<value id="resolved">
-							<enum_code>resolved</enum_code>
+							<code>resolved</code>
 							<style>
 								<main_color>#689F38</main_color>
 								<complementary_color>#FFFFFF</complementary_color>
@@ -65,7 +65,7 @@
 							</style>
 						</value>
 						<value id="closed">
-							<enum_code>closed</enum_code>
+							<code>closed</code>
 							<style>
 								<main_color>#E1E7EC</main_color>
 								<complementary_color>#6E7A8A</complementary_color>
@@ -430,13 +430,13 @@
 				<field id="role_code" xsi:type="AttributeEnum">
 					<values>
 						<value id="manual">
-							<enum_code>manual</enum_code>
+							<code>manual</code>
 						</value>
 						<value id="computed">
-							<enum_code>computed</enum_code>
+							<code>computed</code>
 						</value>
 						<value id="do_not_notify">
-							<enum_code>do_not_notify</enum_code>
+							<code>do_not_notify</code>
 						</value>
 					</values>
 					<sql>impact_code</sql>
@@ -524,10 +524,10 @@
 				<field id="status" xsi:type="AttributeEnum">
 					<values>
 						<value id="open">
-							<enum_code>open</enum_code>
+							<code>open</code>
 						</value>
 						<value id="closed">
-							<enum_code>closed</enum_code>
+							<code>closed</code>
 						</value>
 					</values>
 					<sql>status</sql>
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index ca77f8230..e868c621b 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -35,16 +35,16 @@
         <field id="status" xsi:type="AttributeEnum">
           <values>
             <value id="production">
-              <enum_code>production</enum_code>
+              <code>production</code>
             </value>
             <value id="implementation">
-              <enum_code>implementation</enum_code>
+              <code>implementation</code>
             </value>
             <value id="stock">
-              <enum_code>stock</enum_code>
+              <code>stock</code>
             </value>
             <value id="obsolete">
-              <enum_code>obsolete</enum_code>
+              <code>obsolete</code>
             </value>
           </values>
           <sql>status</sql>
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 10ff2625d..32e9f8dea 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1355,7 +1355,7 @@ EOF
 					foreach($oValueNodes as $oValue)
 					{
 						// New in 3.0 the format of values changed
-						$sCode = $this->GetMandatoryPropString($oValue, 'enum_code', false);
+						$sCode = $this->GetMandatoryPropString($oValue, 'code', false);
 						$aValues[] = $sCode;
 						$oStyleNode = $oValue->GetOptionalElement('style');
 						if ($oStyleNode) {
@@ -1415,10 +1415,9 @@ CSS;
 					$oValueNodes = $oValues->getElementsByTagName('value');
 					$aValues = [];
 					$aStyledValues = [];
-					foreach($oValueNodes as $oValue)
-					{
+					foreach($oValueNodes as $oValue) {
 						// New in 3.0 the format of values changed
-						$sCode = $this->GetMandatoryPropString($oValue, 'enum_code', false);
+						$sCode = $this->GetMandatoryPropString($oValue, 'code', false);
 						$aValues[] = $sCode;
 						$oStyleNode = $oValue->GetOptionalElement('style');
 						if ($oStyleNode) {