diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index f8e9e3674..0547b19ae 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -52,9 +52,9 @@ abstract class Action extends cmdbAbstractObject
 			"category"                   => "grant_by_profile,core/cmdb",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "name",
-			"complementary_name_attcode" => array('finalclass', 'description'),
+			"complementary_name_attcode" => ['finalclass', 'description'],
 			"state_attcode"              => "status",
-			"reconc_keys"                => array('name'),
+			"reconc_keys"                => ['name'],
 			"db_table"                   => "priv_action",
 			"db_key_field"               => "id",
 			"db_finalclass_field"        => "realclass",
@@ -287,8 +287,9 @@ abstract class ActionNotification extends Action
 			"category"            => "grant_by_profile,core/cmdb",
 			"key_type"            => "autoincrement",
 			"name_attcode"        => "name",
+			"complementary_name_attcode" => ['finalclass', 'description'],
 			"state_attcode"       => "",
-			"reconc_keys"         => array('name'),
+			"reconc_keys"         => ['name'],
 			"db_table"            => "priv_action_notification",
 			"db_key_field"        => "id",
 			"db_finalclass_field" => "",
diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml
index b10ab9198..03905baa1 100644
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -108,6 +108,10 @@
           <attributes>
             <attribute id="name"/>
           </attributes>
+          <complementary_attributes>
+            <attribute id="finalclass"/>
+            <attribute id="description"/>
+          </complementary_attributes>
         </naming>
         <style>
           <icon>../../images/icons/icons8-notification.svg</icon>
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index ba760e9df..c2adb43bc 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -36,9 +36,9 @@ abstract class Trigger extends cmdbAbstractObject
 			"category"                   => "grant_by_profile,core/cmdb",
 			"key_type"                   => "autoincrement",
 			"name_attcode"               => "description",
-			"complementary_name_attcode" => array('finalclass', 'complement'),
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode"              => "",
-			"reconc_keys"                => array('description'),
+			"reconc_keys"                => ['description'],
 			"db_table"                   => "priv_trigger",
 			"db_key_field"               => "id",
 			"db_finalclass_field"        => "realclass",
@@ -173,8 +173,9 @@ abstract class TriggerOnObject extends Trigger
 			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobject",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -375,8 +376,9 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onportalupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -407,8 +409,9 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstatechange",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -441,8 +444,9 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateenter",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -474,8 +478,9 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onstateleave",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -507,8 +512,9 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjcreate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -540,8 +546,9 @@ class TriggerOnObjectDelete extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjdelete",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -574,8 +581,9 @@ class TriggerOnObjectUpdate extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -669,8 +677,9 @@ class TriggerOnObjectMention extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onobjmention",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -749,8 +758,9 @@ class TriggerOnAttributeBlobDownload extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onattblobdownload",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -827,8 +837,9 @@ class TriggerOnThresholdReached extends TriggerOnObject
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_threshold",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
diff --git a/datamodels/2.x/itop-attachments/main.itop-attachments.php b/datamodels/2.x/itop-attachments/main.itop-attachments.php
index 5d50785f2..9f7eb3ee5 100644
--- a/datamodels/2.x/itop-attachments/main.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/main.itop-attachments.php
@@ -771,8 +771,9 @@ class TriggerOnAttachmentDownload extends TriggerOnAttributeBlobDownload
 			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
+			"complementary_name_attcode" => ['finalclass', 'complement'],
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => ['description'],
 			"db_table" => "priv_trigger_onattdownload",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",