diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php
index 59ad606ad..7663647d7 100644
--- a/dictionaries/dictionary.itop.ui.php
+++ b/dictionaries/dictionary.itop.ui.php
@@ -710,7 +710,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Schema:Links:n-n' => 'Classes linked to %1$s (n:n links):',
 	'UI:Schema:Links:All' => 'Graph of all related classes',
 	'UI:Schema:NoLifeCyle' => 'There is no life cycle defined for this class.',
-	'UI:Schema:LifeCycleTransitions' => 'Transitions',
+	'UI:Schema:LifeCycleTransitions' => 'States and Transitions',
 	'UI:Schema:LifeCyleAttributeOptions' => 'Attribute options',
 	'UI:Schema:LifeCycleHiddenAttribute' => 'Hidden',
 	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Read-only',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 76e761a9a..9288e1b24 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -601,7 +601,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Schema:Links:n-n' => 'Classes liées à %1$s (liens n:n) :',
 	'UI:Schema:Links:All' => 'Graphe de toutes les classes liées',
 	'UI:Schema:NoLifeCyle' => 'Aucun cycle de vie n\'est défini pour cette classe.',
-	'UI:Schema:LifeCycleTransitions' => 'Transitions',
+	'UI:Schema:LifeCycleTransitions' => 'Etats et Transitions',
 	'UI:Schema:LifeCyleAttributeOptions' => 'Options des attributs',
 	'UI:Schema:LifeCycleHiddenAttribute' => 'Caché',
 	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Lecture seule',
diff --git a/pages/schema.php b/pages/schema.php
index b2d460e5e..fa6621ac6 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2016 Combodo SARL
+// Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * Presentation of the data model
  *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -208,7 +208,8 @@ function DisplayLifecycle($oPage, $sClass)
 			foreach(MetaModel::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
 			{
 				$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
-				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $aTransitionDef['target_state']);
+				$sTargetState = $aTransitionDef['target_state'];
+				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $sTargetState);
 				if (count($aTransitionDef['actions']) > 0)
 				{
 					$aActionsDesc = array();
@@ -234,7 +235,7 @@ function DisplayLifecycle($oPage, $sClass)
 				{
 					$sActions = "";
 				}
-				$oPage->add("<li><span title=\"code: $sStimulusCode\" style=\"color:red;font-weight=bold;\">$sStimulusLabel</span> =&gt; $sTargetStateLabel $sActions</li>\n");
+				$oPage->add("<li><span title=\"code: $sStimulusCode\" style=\"color:red;font-weight=bold;\">$sStimulusLabel</span> <span style=\"color:grey;\">($sStimulusCode)</span> =&gt; $sTargetStateLabel <span style=\"color:grey;\">($sTargetState)</span> $sActions</li>\n");
 			}
 			$oPage->add("</ul>\n");
 		}