diff --git a/datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml b/datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml
index aa973167cb..b7610ae549 100644
--- a/datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml
+++ b/datamodels/2.x/itop-config-mgmt/data/data.sample.servers.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-  <Server alias="Server" id="1">
+  <Server alias="Server" id="2">
     <name>Server1</name>
     <description></description>
     <org_id>2</org_id>
@@ -26,7 +26,7 @@
     <cpu></cpu>
     <ram></ram>
   </Server>
-  <Server alias="Server" id="2">
+  <Server alias="Server" id="3">
     <name>Server2</name>
     <description></description>
     <org_id>2</org_id>
@@ -52,7 +52,7 @@
     <cpu></cpu>
     <ram></ram>
   </Server>
-  <Server alias="Server" id="3">
+  <Server alias="Server" id="4">
     <name>Server3</name>
     <description></description>
     <org_id>2</org_id>
@@ -78,7 +78,7 @@
     <cpu></cpu>
     <ram></ram>
   </Server>
-  <Server alias="Server" id="4">
+  <Server alias="Server" id="15">
     <name>Server4</name>
     <description></description>
     <org_id>2</org_id>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/data/data.sample.errortofunctionalci.xml b/datamodels/2.x/itop-knownerror-mgmt/data/data.sample.errortofunctionalci.xml
index 4b30fffa00..a0ba068aaf 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/data/data.sample.errortofunctionalci.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/data/data.sample.errortofunctionalci.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
 <lnkErrorToFunctionalCI alias="lnkErrorToFunctionalCI" id="4">
-<functionalci_id><![CDATA[SELECT FunctionalCI WHERE id='1']]></functionalci_id>
+<functionalci_id><![CDATA[SELECT FunctionalCI WHERE name='Server1']]></functionalci_id>
 <error_id>2</error_id>
 </lnkErrorToFunctionalCI>
 <lnkErrorToFunctionalCI alias="lnkErrorToFunctionalCI" id="1">
-<functionalci_id><![CDATA[SELECT FunctionalCI WHERE id='2']]></functionalci_id>
+<functionalci_id><![CDATA[SELECT FunctionalCI WHERE name='Server2']]></functionalci_id>
 <error_id>2</error_id>
 </lnkErrorToFunctionalCI>
 <lnkErrorToFunctionalCI alias="lnkErrorToFunctionalCI" id="2">
-<functionalci_id><![CDATA[SELECT FunctionalCI WHERE id='3']]></functionalci_id>
+<functionalci_id><![CDATA[SELECT FunctionalCI WHERE name='Server3']]></functionalci_id>
 <error_id>2</error_id>
 </lnkErrorToFunctionalCI>
 <lnkErrorToFunctionalCI alias="lnkErrorToFunctionalCI" id="3">
-<functionalci_id><![CDATA[SELECT FunctionalCI WHERE id='4']]></functionalci_id>
+<functionalci_id><![CDATA[SELECT FunctionalCI WHERE name='Server4']]></functionalci_id>
 <error_id>2</error_id>
 </lnkErrorToFunctionalCI>
 </Set>