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 0932a1568..55268e086 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
@@ -1089,7 +1089,7 @@
             <item id="col:col1">
               <rank>10</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:baseinfo">
+                <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
                   <items>
                     <item id="name">
@@ -1152,7 +1152,7 @@
             <item id="col:col2">
               <rank>20</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:dates">
+                <item id="fieldset:Server:Date">
                   <rank>10</rank>
                   <items>
                     <item id="move2production">
@@ -1186,7 +1186,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:ConfigMgmt:otherinfo">
+                <item id="fieldset:Server:otherinfo">
                   <rank>30</rank>
                   <items>
                     <item id="description">
@@ -1485,7 +1485,7 @@
             <item id="col:col1">
               <rank>120</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:baseinfo">
+                <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
                   <items>
                     <item id="name">
@@ -1554,7 +1554,7 @@
             <item id="col:col2">
               <rank>130</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:dates">
+                <item id="fieldset:Server:Date">
                   <rank>10</rank>
                   <items>
                     <item id="move2production">
@@ -1588,7 +1588,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:ConfigMgmt:otherinfo">
+                <item id="fieldset:Server:otherinfo">
                   <rank>30</rank>
                   <items>
                     <item id="description">
diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
index 8fb0c36ae..c4b8eb899 100644
--- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
+++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
@@ -865,7 +865,7 @@
             <item id="col:col1">
               <rank>100</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:baseinfo">
+                <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
                   <items>
                     <item id="name">
@@ -891,7 +891,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Storage:moreinfo">
+                <item id="fieldset:Server:moreinfo">
                   <rank>20</rank>
                   <items>
                     <item id="brand_id">
@@ -919,7 +919,7 @@
             <item id="col:col2">
               <rank>110</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:dates">
+                <item id="fieldset:Server:Date">
                   <rank>10</rank>
                   <items>
                     <item id="move2production">
@@ -950,7 +950,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:ConfigMgmt:otherinfo">
+                <item id="fieldset:Server:otherinfo">
                   <rank>30</rank>
                   <items>
                     <item id="description">
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 f2f152455..92fddae5d 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
@@ -812,7 +812,7 @@
             <item id="col:col1">
               <rank>90</rank>
               <items>
-                <item id="fieldset:ConfigMgmt:baseinfo">
+                <item id="fieldset:Server:baseinfo">
                   <rank>10</rank>
                   <items>
                     <item id="name">
@@ -871,7 +871,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:ConfigMgmt:otherinfo">
+                <item id="fieldset:Server:otherinfo">
                   <rank>20</rank>
                   <items>
                     <item id="description">