diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php
index 838dbe8b8..67c50d1cb 100644
--- a/dictionaries/dictionary.itop.core.php
+++ b/dictionaries/dictionary.itop.core.php
@@ -35,8 +35,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
 	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
 	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'Class',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Real (final) object class',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'finalclass',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
 ));
 
 //
@@ -116,8 +116,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
 	'Class:Event/Attribute:userinfo' => 'user info',
 	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
-	'Class:Event/Attribute:finalclass' => 'Class',
-	'Class:Event/Attribute:finalclass+' => 'Real (final) object class',
+	'Class:Event/Attribute:finalclass' => 'finalclass',
+	'Class:Event/Attribute:finalclass+' => '',
 ));
 
 //
@@ -221,8 +221,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
 	'Class:Action/Attribute:related_triggers' => 'Related Triggers',
 	'Class:Action/Attribute:related_triggers+' => 'Triggers linked to this action',
-	'Class:Action/Attribute:finalclass' => 'Class',
-	'Class:Action/Attribute:finalclass+' => 'Real (final) object class',
+	'Class:Action/Attribute:finalclass' => 'finalclass',
+	'Class:Action/Attribute:finalclass+' => '',
 ));
 
 //
@@ -278,8 +278,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Trigger/Attribute:description+' => 'one line description',
 	'Class:Trigger/Attribute:linked_actions' => 'Triggered actions',
 	'Class:Trigger/Attribute:linked_actions+' => 'Actions performed when the trigger is activated',
-	'Class:Trigger/Attribute:finalclass' => 'Class',
-	'Class:Trigger/Attribute:finalclass+' => 'Real (final) object class',
+	'Class:Trigger/Attribute:finalclass' => 'finalclass',
+	'Class:Trigger/Attribute:finalclass+' => '',
 ));
 
 //
diff --git a/dictionaries/dictionary.itop.model.php b/dictionaries/dictionary.itop.model.php
index a98604f38..8c6a8be32 100644
--- a/dictionaries/dictionary.itop.model.php
+++ b/dictionaries/dictionary.itop.model.php
@@ -10,9 +10,6 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
 
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel, core/cmdb, gui, application, addon/userrights
-//////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
@@ -70,8 +67,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:logRealObject/Attribute:org_id+' => 'ID of the object owner organization',
 	'Class:logRealObject/Attribute:org_name' => 'Organization',
 	'Class:logRealObject/Attribute:org_name+' => 'Company / Department owning this object',
-	'Class:logRealObject/Attribute:finalclass' => 'Class',
-	'Class:logRealObject/Attribute:finalclass+' => 'Real (final) object class',
+	'Class:logRealObject/Attribute:finalclass' => 'finalclass',
+	'Class:logRealObject/Attribute:finalclass+' => '',
 ));
 
 //
@@ -657,12 +654,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:bizIncidentTicket/Attribute:customer_name+' => 'Name of the customer impacted by this ticket',
 	'Class:bizIncidentTicket/Attribute:ticket_status' => 'Status',
 	'Class:bizIncidentTicket/Attribute:ticket_status+' => 'Status of the ticket',
-	'Class:bizIncidentTicket/Attribute:ticket_status/Value:New' => 'New',
-	'Class:bizIncidentTicket/Attribute:ticket_status/Value:New+' => 'New',
+	'Class:bizIncidentTicket/Attribute:ticket_status/Value:New' => 'New (Unassigned)',
+	'Class:bizIncidentTicket/Attribute:ticket_status/Value:New+' => 'New (Unassigned)',
 	'Class:bizIncidentTicket/Attribute:ticket_status/Value:Assigned' => 'Assigned',
 	'Class:bizIncidentTicket/Attribute:ticket_status/Value:Assigned+' => 'Assigned',
-	'Class:bizIncidentTicket/Attribute:ticket_status/Value:WorkInProgress' => 'WorkInProgress',
-	'Class:bizIncidentTicket/Attribute:ticket_status/Value:WorkInProgress+' => 'WorkInProgress',
+	'Class:bizIncidentTicket/Attribute:ticket_status/Value:WorkInProgress' => 'Work In Progress',
+	'Class:bizIncidentTicket/Attribute:ticket_status/Value:WorkInProgress+' => 'Work In Progress',
 	'Class:bizIncidentTicket/Attribute:ticket_status/Value:Resolved' => 'Resolved',
 	'Class:bizIncidentTicket/Attribute:ticket_status/Value:Resolved+' => 'Resolved',
 	'Class:bizIncidentTicket/Attribute:ticket_status/Value:Closed' => 'Closed',
@@ -1031,22 +1028,22 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:bizChangeTicket/Attribute:customer_name+' => 'Name of the customer impacted by this ticket',
 	'Class:bizChangeTicket/Attribute:ticket_status' => 'Status',
 	'Class:bizChangeTicket/Attribute:ticket_status+' => 'Status of the ticket',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:New' => 'New',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:New+' => 'New',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:New' => 'New (Unassigned)',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:New+' => 'New (Unassigned)',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Validated' => 'Validated',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Validated+' => 'Validated',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Rejected' => 'Rejected',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Rejected+' => 'Rejected',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Assigned' => 'Assigned',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Assigned+' => 'Assigned',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:PlannedScheduled' => 'PlannedScheduled',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:PlannedScheduled+' => 'PlannedScheduled',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:PlannedScheduled' => 'Planned&Scheduled',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:PlannedScheduled+' => 'Planned&Scheduled',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Approved' => 'Approved',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Approved+' => 'Approved',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:NotApproved' => 'NotApproved',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:NotApproved+' => 'NotApproved',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:Implemented' => 'Implemented',
-	'Class:bizChangeTicket/Attribute:ticket_status/Value:Implemented+' => 'Implemented',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:NotApproved' => 'Not Approved',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:NotApproved+' => 'Not Approved',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:Implemented' => 'Implementation',
+	'Class:bizChangeTicket/Attribute:ticket_status/Value:Implemented+' => 'Implementation',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Monitored' => 'Monitored',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Monitored+' => 'Monitored',
 	'Class:bizChangeTicket/Attribute:ticket_status/Value:Closed' => 'Closed',
@@ -1271,12 +1268,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:bizServiceCall/Attribute:customer_name+' => 'Name of the customer raising this service call',
 	'Class:bizServiceCall/Attribute:call_status' => 'Status',
 	'Class:bizServiceCall/Attribute:call_status+' => 'Status of the ticket',
-	'Class:bizServiceCall/Attribute:call_status/Value:New' => 'New',
-	'Class:bizServiceCall/Attribute:call_status/Value:New+' => 'New',
+	'Class:bizServiceCall/Attribute:call_status/Value:New' => 'New (Unassigned)',
+	'Class:bizServiceCall/Attribute:call_status/Value:New+' => 'New (Unassigned)',
 	'Class:bizServiceCall/Attribute:call_status/Value:Assigned' => 'Assigned',
 	'Class:bizServiceCall/Attribute:call_status/Value:Assigned+' => 'Assigned',
-	'Class:bizServiceCall/Attribute:call_status/Value:WorkInProgress' => 'WorkInProgress',
-	'Class:bizServiceCall/Attribute:call_status/Value:WorkInProgress+' => 'WorkInProgress',
+	'Class:bizServiceCall/Attribute:call_status/Value:WorkInProgress' => 'Work In Progress',
+	'Class:bizServiceCall/Attribute:call_status/Value:WorkInProgress+' => 'Work In Progress',
 	'Class:bizServiceCall/Attribute:call_status/Value:Resolved' => 'Resolved',
 	'Class:bizServiceCall/Attribute:call_status/Value:Resolved+' => 'Resolved',
 	'Class:bizServiceCall/Attribute:call_status/Value:Closed' => 'Closed',
diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php
index ac02ed209..881d553de 100644
--- a/dictionaries/dictionary.itop.ui.php
+++ b/dictionaries/dictionary.itop.ui.php
@@ -5,7 +5,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-
 //
 // Class: menuNode
 //