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 4427a4b3b6..b96ff68a0e 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
@@ -14,8 +14,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="ticket_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="functionalci_name"/>
+            <attribute id="ticket_ref"/>
           </attributes>
         </naming>
         <style>
@@ -23,10 +23,21 @@
         </style>
         <reconciliation>
           <attributes>
-            <attribute id="ticket_id"/>
             <attribute id="functionalci_id"/>
+            <attribute id="ticket_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="functionalci_id"/>
+              <attribute id="ticket_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="ticket_id" xsi:type="AttributeExternalKey">
@@ -80,10 +91,10 @@
       <presentation>
         <details>
           <items>
-            <item id="ticket_id">
+            <item id="functionalci_id">
               <rank>10</rank>
             </item>
-            <item id="functionalci_id">
+            <item id="ticket_id">
               <rank>20</rank>
             </item>
             <item id="impact_code">
@@ -131,8 +142,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="providercontract_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="functionalci_name"/>
+            <attribute id="providercontract_name"/>
           </attributes>
         </naming>
         <style>
@@ -144,6 +155,17 @@
             <attribute id="functionalci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="functionalci_id"/>
+              <attribute id="providercontract_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="providercontract_id" xsi:type="AttributeExternalKey">
@@ -171,10 +193,10 @@
       <presentation>
         <details>
           <items>
-            <item id="providercontract_id">
+            <item id="functionalci_id">
               <rank>10</rank>
             </item>
-            <item id="functionalci_id">
+            <item id="providercontract_id">
               <rank>20</rank>
             </item>
           </items>
@@ -213,8 +235,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="functionalci_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -222,10 +244,21 @@
         </style>
         <reconciliation>
           <attributes>
-            <attribute id="service_id"/>
             <attribute id="functionalci_id"/>
+            <attribute id="service_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="functionalci_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -253,10 +286,10 @@
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="functionalci_id">
               <rank>10</rank>
             </item>
-            <item id="functionalci_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
index c68cb4d016..174c9d79d1 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
@@ -36,6 +36,7 @@
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
 	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
@@ -61,6 +62,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
@@ -78,6 +80,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
 	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
index bf697baa49..822598b0c0 100644
--- a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
@@ -13,7 +13,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="volume_id"/>
+            <attribute id="virtualdevice_name"/>
+            <attribute id="volume_name"/>
           </attributes>
         </naming>
         <style>
@@ -23,6 +24,17 @@
           <attributes>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="volume_id"/>
+              <attribute id="virtualdevice_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="volume_id" xsi:type="AttributeExternalKey">
@@ -55,10 +67,10 @@
       <presentation>
         <details>
           <items>
-            <item id="volume_id">
+            <item id="virtualdevice_id">
               <rank>10</rank>
             </item>
-            <item id="virtualdevice_id">
+            <item id="volume_id">
               <rank>20</rank>
             </item>
             <item id="size_used">
@@ -78,10 +90,10 @@
         </search>
         <list>
           <items>
-            <item id="volume_id">
+            <item id="virtualdevice_id">
               <rank>10</rank>
             </item>
-            <item id="virtualdevice_id">
+            <item id="volume_id">
               <rank>20</rank>
             </item>
             <item id="size_used">
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 4ebefad364..7b0c47349c 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
@@ -3922,8 +3922,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="licence_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="licence_name"/>
           </attributes>
         </naming>
         <style>
@@ -3935,6 +3935,17 @@
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="licence_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="licence_id" xsi:type="AttributeExternalKey">
@@ -3962,10 +3973,10 @@
       <presentation>
         <details>
           <items>
-            <item id="licence_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="licence_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4487,8 +4498,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="functionalci_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="functionalci_name"/>
           </attributes>
         </naming>
         <style>
@@ -4500,6 +4511,17 @@
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="functionalci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="functionalci_id" xsi:type="AttributeExternalKey">
@@ -4527,10 +4549,10 @@
       <presentation>
         <details>
           <items>
-            <item id="functionalci_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="functionalci_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4547,10 +4569,10 @@
         </search>
         <list>
           <items>
-            <item id="functionalci_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="functionalci_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4569,8 +4591,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="patch_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="patch_name"/>
           </attributes>
         </naming>
         <style>
@@ -4582,6 +4604,17 @@
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="patch_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="patch_id" xsi:type="AttributeExternalKey">
@@ -4609,10 +4642,10 @@
       <presentation>
         <details>
           <items>
-            <item id="patch_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="patch_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4651,8 +4684,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="softwarepatch_id"/>
-            <attribute id="softwareinstance_id"/>
+            <attribute id="softwareinstance_name"/>
+            <attribute id="softwarepatch_name"/>
           </attributes>
         </naming>
         <style>
@@ -4664,6 +4697,17 @@
             <attribute id="softwareinstance_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="softwareinstance_id"/>
+              <attribute id="softwarepatch_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="softwarepatch_id" xsi:type="AttributeExternalKey">
@@ -4691,10 +4735,10 @@
       <presentation>
         <details>
           <items>
-            <item id="softwarepatch_id">
+            <item id="softwareinstance_id">
               <rank>10</rank>
             </item>
-            <item id="softwareinstance_id">
+            <item id="softwarepatch_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4733,8 +4777,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="ospatch_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="functionalci_name"/>
+            <attribute id="ospatch_name"/>
           </attributes>
         </naming>
         <style>
@@ -4746,6 +4790,17 @@
             <attribute id="functionalci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="functionalci_id"/>
+              <attribute id="ospatch_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="ospatch_id" xsi:type="AttributeExternalKey">
@@ -4773,10 +4828,10 @@
       <presentation>
         <details>
           <items>
-            <item id="ospatch_id">
+            <item id="functionalci_id">
               <rank>10</rank>
             </item>
-            <item id="functionalci_id">
+            <item id="ospatch_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4815,8 +4870,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="software_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="software_name"/>
           </attributes>
         </naming>
         <style>
@@ -4828,6 +4883,17 @@
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="software_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="software_id" xsi:type="AttributeExternalKey">
@@ -4855,10 +4921,10 @@
       <presentation>
         <details>
           <items>
-            <item id="software_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="software_id">
               <rank>20</rank>
             </item>
           </items>
@@ -4897,8 +4963,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="functionalci_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="functionalci_name"/>
           </attributes>
         </naming>
         <style>
@@ -4910,6 +4976,17 @@
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="functionalci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="functionalci_id" xsi:type="AttributeExternalKey">
@@ -4937,10 +5014,10 @@
       <presentation>
         <details>
           <items>
-            <item id="functionalci_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="functionalci_id">
               <rank>20</rank>
             </item>
           </items>
@@ -5296,8 +5373,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="subnet_id"/>
-            <attribute id="vlan_id"/>
+            <attribute id="subnet_name"/>
+            <attribute id="vlan_tag"/>
           </attributes>
         </naming>
         <style>
@@ -5309,6 +5386,17 @@
             <attribute id="vlan_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="subnet_id"/>
+              <attribute id="vlan_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="subnet_id" xsi:type="AttributeExternalKey">
@@ -5715,8 +5803,9 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="physicalinterface_id"/>
-            <attribute id="vlan_id"/>
+            <attribute id="physicalinterface_device_name"/>
+            <attribute id="physicalinterface_name"/>
+            <attribute id="vlan_tag"/>
           </attributes>
         </naming>
         <style>
@@ -5728,6 +5817,17 @@
             <attribute id="vlan_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="physicalinterface_id"/>
+              <attribute id="vlan_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="physicalinterface_id" xsi:type="AttributeExternalKey">
@@ -5805,8 +5905,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="networkdevice_id"/>
-            <attribute id="connectableci_id"/>
+            <attribute id="connectableci_name"/>
+            <attribute id="networkdevice_name"/>
           </attributes>
         </naming>
         <style>
@@ -5818,6 +5918,17 @@
             <attribute id="connectableci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="networkdevice_id"/>
+              <attribute id="connectableci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="networkdevice_id" xsi:type="AttributeExternalKey">
@@ -6037,16 +6148,16 @@
       <presentation>
         <details>
           <items>
-            <item id="networkdevice_id">
+            <item id="connectableci_id">
               <rank>10</rank>
             </item>
-            <item id="connectableci_id">
+            <item id="device_port">
               <rank>20</rank>
             </item>
-            <item id="network_port">
+            <item id="networkdevice_id">
               <rank>30</rank>
             </item>
-            <item id="device_port">
+            <item id="network_port">
               <rank>40</rank>
             </item>
             <item id="connection_type">
@@ -6075,16 +6186,16 @@
         </search>
         <list>
           <items>
-            <item id="networkdevice_id">
+            <item id="connectableci_id">
               <rank>10</rank>
             </item>
-            <item id="connectableci_id">
+            <item id="networkdevice_id">
               <rank>20</rank>
             </item>
-            <item id="network_port">
+            <item id="device_port">
               <rank>30</rank>
             </item>
-            <item id="device_port">
+            <item id="network_port">
               <rank>40</rank>
             </item>
             <item id="connection_type">
@@ -6106,8 +6217,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="applicationsolution_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="applicationsolution_name"/>
+            <attribute id="functionalci_name"/>
           </attributes>
         </naming>
         <style>
@@ -6119,6 +6230,17 @@
             <attribute id="functionalci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="applicationsolution_id"/>
+              <attribute id="functionalci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="applicationsolution_id" xsi:type="AttributeExternalKey">
@@ -6188,8 +6310,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="businessprocess_id"/>
-            <attribute id="applicationsolution_id"/>
+            <attribute id="applicationsolution_name"/>
+            <attribute id="businessprocess_name"/>
           </attributes>
         </naming>
         <style>
@@ -6201,6 +6323,17 @@
             <attribute id="applicationsolution_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="applicationsolution_id"/>
+              <attribute id="businessprocess_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="businessprocess_id" xsi:type="AttributeExternalKey">
@@ -6228,10 +6361,10 @@
       <presentation>
         <details>
           <items>
-            <item id="businessprocess_id">
+            <item id="applicationsolution_id">
               <rank>10</rank>
             </item>
-            <item id="applicationsolution_id">
+            <item id="businessprocess_id">
               <rank>20</rank>
             </item>
           </items>
@@ -6440,7 +6573,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="group_id"/>
+            <attribute id="group_name"/>
+            <attribute id="ci_name"/>
           </attributes>
         </naming>
         <style>
@@ -6452,6 +6586,17 @@
             <attribute id="ci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="group_id"/>
+              <attribute id="ci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="group_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
index 0b2b01691d..2289bac874 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -85,6 +85,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
 	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
@@ -773,6 +774,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkServerToVolume' => 'Link Server / Volume',
 	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name',
@@ -792,6 +794,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name',
@@ -811,6 +814,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
 	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name',
@@ -1021,6 +1025,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToLicence' => 'Link Document / License',
 	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'License',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
 	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'License name',
@@ -1152,6 +1157,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
 	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
 	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name',
@@ -1169,6 +1175,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name',
@@ -1186,6 +1193,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name',
@@ -1203,6 +1211,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
 	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
 	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name',
@@ -1264,6 +1273,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
@@ -1319,6 +1329,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:PhysicalInterface' => 'Physical Interface',
 	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name',
@@ -1334,6 +1345,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name',
@@ -1388,6 +1400,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name',
@@ -1415,6 +1428,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name',
@@ -1432,6 +1446,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name',
@@ -1485,6 +1500,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkGroupToCI' => 'Link Group / CI',
 	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Group',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
 	'Class:lnkGroupToCI/Attribute:group_name' => 'Name',
@@ -1521,6 +1537,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
 	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
index bfd75af9f0..80b0b82582 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -248,7 +248,8 @@
         <db_key_field>link_id</db_key_field>
         <db_final_class_field/>
         <naming>
-          <attributes/>
+          <attributes id="error_name"/>
+          <attributes id="functionalci_name"/>
         </naming>
         <style>
           <icon/>
@@ -259,6 +260,17 @@
             <attribute id="error_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="error_id"/>
+              <attribute id="functionalci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="functionalci_id" xsi:type="AttributeExternalKey">
@@ -291,10 +303,10 @@
       <presentation>
         <details>
           <items>
-            <item id="functionalci_id">
+            <item id="error_id">
               <rank>10</rank>
             </item>
-            <item id="error_id">
+            <item id="functionalci_id">
               <rank>20</rank>
             </item>
             <item id="reason">
@@ -342,7 +354,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="link_type"/>
+            <attribute id="document_name"/>
+            <attribute id="error_name"/>
           </attributes>
         </naming>
         <style>
@@ -354,6 +367,17 @@
             <attribute id="error_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="error_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="document_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
index 7f44bdd457..d514df1a08 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
@@ -102,6 +102,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error',
+	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name',
@@ -121,6 +122,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToError' => 'Link Documents / Errors',
 	'Class:lnkDocumentToError+' => 'A link between a document and a known error',
+	'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
 	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name',
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 38b808a500..bb25e15068 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
@@ -767,8 +767,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="contract_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="contract_name"/>
           </attributes>
         </naming>
         <style>
@@ -780,6 +780,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="contract_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="contract_id" xsi:type="AttributeExternalKey">
@@ -807,10 +818,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="contract_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="contract_id">
               <rank>20</rank>
             </item>
           </items>
@@ -849,8 +860,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="contract_id"/>
-            <attribute id="document_id"/>
+            <attribute id="contract_name"/>
+            <attribute id="document_name"/>
           </attributes>
         </naming>
         <style>
@@ -862,6 +873,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contract_id"/>
+              <attribute id="document_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="contract_id" xsi:type="AttributeExternalKey">
@@ -1226,8 +1248,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -1239,6 +1261,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -1266,10 +1299,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
@@ -1308,8 +1341,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -1321,6 +1354,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -1348,10 +1392,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
@@ -1867,8 +1911,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="sla_id"/>
-            <attribute id="slt_id"/>
+            <attribute id="sla_name"/>
+            <attribute id="slt_name"/>
           </attributes>
         </naming>
         <style>
@@ -1880,6 +1924,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="slt_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="sla_id"/>
+              <attribute id="slt_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="sla_id" xsi:type="AttributeExternalKey">
@@ -1989,8 +2044,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="customercontract_id"/>
-            <attribute id="service_id"/>
+            <attribute id="customercontract_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -2002,6 +2057,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="service_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="customercontract_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="customercontract_id" xsi:type="AttributeExternalKey">
@@ -2087,8 +2153,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="customercontract_id"/>
-            <attribute id="providercontract_id"/>
+            <attribute id="customercontract_name"/>
+            <attribute id="providercontract_name"/>
           </attributes>
         </naming>
         <style>
@@ -2100,6 +2166,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="providercontract_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="customercontract_id"/>
+              <attribute id="providercontract_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="customercontract_id" xsi:type="AttributeExternalKey">
@@ -2169,8 +2246,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="customercontract_id"/>
-            <attribute id="functionalci_id"/>
+            <attribute id="customercontract_name"/>
+            <attribute id="functionalci_name"/>
           </attributes>
         </naming>
         <style>
@@ -2182,6 +2259,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="functionalci_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="customercontract_id"/>
+              <attribute id="functionalci_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="customercontract_id" xsi:type="AttributeExternalKey">
@@ -2360,8 +2448,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="deliverymodel_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="deliverymodel_name"/>
+            <attribute id="contact_name"/>
           </attributes>
         </naming>
         <style>
@@ -2373,6 +2461,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="deliverymodel_id"/>
+              <attribute id="contact_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="deliverymodel_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
index 1f8f5ac9a8..dcde518565 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
@@ -186,6 +186,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
@@ -203,6 +204,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
@@ -220,6 +222,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
@@ -291,6 +294,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
@@ -308,6 +312,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToService' => 'Link Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
@@ -421,6 +426,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
@@ -448,6 +454,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
@@ -469,6 +476,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract',
 	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name',
@@ -486,6 +494,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name',
@@ -524,6 +533,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
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 fd0fb54b88..9f19d2f6d2 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
@@ -737,8 +737,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="contract_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="contract_name"/>
           </attributes>
         </naming>
         <style>
@@ -750,6 +750,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="contract_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="contract_id" xsi:type="AttributeExternalKey">
@@ -777,10 +788,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="contract_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="contract_id">
               <rank>20</rank>
             </item>
           </items>
@@ -819,8 +830,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="contract_id"/>
-            <attribute id="document_id"/>
+            <attribute id="contract_name"/>
+            <attribute id="document_name"/>
           </attributes>
         </naming>
         <style>
@@ -832,6 +843,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contract_id"/>
+              <attribute id="document_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="contract_id" xsi:type="AttributeExternalKey">
@@ -1220,8 +1242,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="document_id"/>
+            <attribute id="document_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -1233,6 +1255,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="document_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -1260,10 +1293,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="document_id">
               <rank>10</rank>
             </item>
-            <item id="document_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
@@ -1302,8 +1335,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -1315,6 +1348,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -1342,10 +1386,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="contact_id">
               <rank>10</rank>
             </item>
-            <item id="contact_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
@@ -1870,8 +1914,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="sla_id"/>
-            <attribute id="slt_id"/>
+            <attribute id="sla_name"/>
+            <attribute id="slt_name"/>
           </attributes>
         </naming>
         <style>
@@ -1883,6 +1927,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="slt_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="sla_id"/>
+              <attribute id="slt_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="sla_id" xsi:type="AttributeExternalKey">
@@ -1992,8 +2047,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="customercontract_id"/>
-            <attribute id="service_id"/>
+            <attribute id="customercontract_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -2005,6 +2060,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="service_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="customercontract_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="customercontract_id" xsi:type="AttributeExternalKey">
@@ -2090,8 +2156,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="service_id"/>
-            <attribute id="providercontract_id"/>
+            <attribute id="providercontract_name"/>
+            <attribute id="service_name"/>
           </attributes>
         </naming>
         <style>
@@ -2103,6 +2169,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="providercontract_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="providercontract_id"/>
+              <attribute id="service_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="service_id" xsi:type="AttributeExternalKey">
@@ -2130,10 +2207,10 @@ public function PrefillSearchForm(&$aContextParam)
       <presentation>
         <details>
           <items>
-            <item id="service_id">
+            <item id="providercontract_id">
               <rank>10</rank>
             </item>
-            <item id="providercontract_id">
+            <item id="service_id">
               <rank>20</rank>
             </item>
           </items>
@@ -2280,8 +2357,8 @@ public function PrefillSearchForm(&$aContextParam)
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="deliverymodel_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="deliverymodel_name"/>
+            <attribute id="contact_name"/>
           </attributes>
         </naming>
         <style>
@@ -2293,6 +2370,17 @@ public function PrefillSearchForm(&$aContextParam)
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="deliverymodel_id"/>
+              <attribute id="contact_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="deliverymodel_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
index d205276c3d..7ac38799ab 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
@@ -173,6 +173,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
 	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
 	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
@@ -190,6 +191,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
 	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
 	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
@@ -265,6 +267,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToService' => 'Link Document / Service',
 	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
@@ -282,6 +285,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToService' => 'Link Contact / Service',
 	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
 	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
@@ -395,6 +399,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
 	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
@@ -422,6 +427,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
 	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
@@ -443,6 +449,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service',
 	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name',
@@ -481,6 +488,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
 	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
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 3f52bad9c2..f2b46cbb8e 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
@@ -1485,7 +1485,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="volume_id"/>
+            <attribute id="server_name"/>
+            <attribute id="volume_name"/>
           </attributes>
         </naming>
         <style>
@@ -1497,6 +1498,17 @@
             <attribute id="server_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="server_id"/>
+              <attribute id="volume_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="volume_id" xsi:type="AttributeExternalKey">
@@ -1529,10 +1541,10 @@
       <presentation>
         <details>
           <items>
-            <item id="volume_id">
+            <item id="server_id">
               <rank>10</rank>
             </item>
-            <item id="server_id">
+            <item id="volume_id">
               <rank>20</rank>
             </item>
             <item id="size_used">
@@ -1552,10 +1564,10 @@
         </search>
         <list>
           <items>
-            <item id="volume_id">
+            <item id="server_id">
               <rank>10</rank>
             </item>
-            <item id="server_id">
+            <item id="volume_id">
               <rank>20</rank>
             </item>
             <item id="size_used">
@@ -1577,7 +1589,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="san_id"/>
+            <attribute id="san_name"/>
+            <attribute id="datacenterdevice_name"/>
           </attributes>
         </naming>
         <style>
@@ -1589,6 +1602,17 @@
             <attribute id="datacenterdevice_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="san_id"/>
+              <attribute id="datacenterdevice_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="san_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 4e5ae9f94a..1225e69e26 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -1013,7 +1013,7 @@
         <naming>
           <attributes>
             <attribute id="person_id_friendlyname"/>
-            <attribute id="team_id_friendlyname"/>
+            <attribute id="team_name"/>
           </attributes>
         </naming>
         <style>
@@ -1025,6 +1025,17 @@
             <attribute id="person_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="team_id"/>
+              <attribute id="person_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="team_id" xsi:type="AttributeExternalKey">
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index ef66ee5c73..a7e7c56f55 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -395,8 +395,8 @@
         <db_final_class_field/>
         <naming>
           <attributes>
-            <attribute id="ticket_id"/>
-            <attribute id="contact_id"/>
+            <attribute id="contact_name"/>
+            <attribute id="ticket_ref"/>
           </attributes>
         </naming>
         <style>
@@ -408,6 +408,17 @@
             <attribute id="contact_id"/>
           </attributes>
         </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="contact_id"/>
+              <attribute id="ticket_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
       </properties>
       <fields>
         <field id="ticket_id" xsi:type="AttributeExternalKey">
@@ -430,6 +441,10 @@
           <extkey_attcode>contact_id</extkey_attcode>
           <target_attcode>email</target_attcode>
         </field>
+        <field id="contact_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
         <field id="role" xsi:type="AttributeString">
           <sql>role</sql>
           <default_value/>
diff --git a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
index 8519d7ffb4..3a9284d83c 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
@@ -98,12 +98,15 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
 	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
 	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Contact name',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Role (text)',
diff --git a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
index d97c5fdc8c..14aee0da9f 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
@@ -90,7 +90,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
 	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email Contact',
+	'Class:lnkContactToTicket/Attribute:contact_name' => 'Nom du contact',
+	'Class:lnkContactToTicket/Attribute:contact_name+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email du contact',
 	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
 	'Class:lnkContactToTicket/Attribute:role' => 'Rôle (texte)',
 	'Class:lnkContactToTicket/Attribute:role+' => '',