diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index 90100455fd..12510c0747 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -87,14 +87,14 @@
           <is_null_allowed>false</is_null_allowed>
           <display_style>list</display_style>
         </field>
-        <field id="emergency" xsi:type="AttributeEnum">
+        <field id="urgency" xsi:type="AttributeEnum">
           <values>
             <value>1</value>
             <value>2</value>
             <value>3</value>
             <value>4</value>
           </values>
-          <sql>emergency</sql>
+          <sql>urgency</sql>
           <default_value>1</default_value>
           <is_null_allowed>false</is_null_allowed>
           <display_style>list</display_style>
@@ -194,7 +194,7 @@
               <attribute id="impact">
                 <must_change/>
               </attribute>
-              <attribute id="emergency">
+              <attribute id="urgency">
                 <must_change/>
               </attribute>
               <attribute id="priority">
@@ -324,7 +324,7 @@
               <attribute id="impact">
                 <read_only/>
               </attribute>
-              <attribute id="emergency">
+              <attribute id="urgency">
                 <read_only/>
               </attribute>
               <attribute id="priority">
@@ -401,7 +401,7 @@
               <attribute id="impact">
                 <read_only/>
               </attribute>
-              <attribute id="emergency">
+              <attribute id="urgency">
                 <read_only/>
               </attribute>
               <attribute id="priority">
@@ -453,7 +453,7 @@
         }]]></code>
         </method>
         <method id="ComputePriority">
-          <comment>/** Compute the priority of the ticket based on its impact and emergency&#13;
+          <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
          * @return integer The priority of the ticket 1(high) .. 3(low)&#13;
          */</comment>
           <static>false</static>
@@ -461,7 +461,7 @@
           <type>LifecycleAction</type>
           <code><![CDATA[        public function ComputePriority()
         {
-                // priority[impact][emergency]
+                // priority[impact][urgency]
                 $aPriorities = array(
                         // single person
                         1 => array(
@@ -485,7 +485,7 @@
                                         4 => 4,
                         ),
                 );
-                $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('emergency')];
+                $iPriority = $aPriorities[(int)$this->Get('impact')][(int)$this->Get('urgency')];
                 return $iPriority;              
         }]]></code>
         </method>
@@ -588,7 +588,7 @@
                     <item id="impact">
                       <rank>10</rank>
                     </item>
-                    <item id="emergency">
+                    <item id="urgency">
                       <rank>20</rank>
                     </item>
                     <item id="description">
@@ -676,7 +676,7 @@
             <item id="impact">
               <rank>90</rank>
             </item>
-            <item id="emergency">
+            <item id="urgency">
               <rank>100</rank>
             </item>
             <item id="priority">
diff --git a/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
index 73a2531c3d..553025714e 100755
--- a/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
@@ -111,16 +111,16 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Problem/Attribute:impact/Value:2+' => '',
 	'Class:Problem/Attribute:impact/Value:3' => 'A person',
 	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:emergency' => 'Emergency',
-	'Class:Problem/Attribute:emergency+' => '',
-	'Class:Problem/Attribute:emergency/Value:1' => 'critical',
-	'Class:Problem/Attribute:emergency/Value:1+' => 'critical',
-	'Class:Problem/Attribute:emergency/Value:2' => 'high',
-	'Class:Problem/Attribute:emergency/Value:2+' => 'high',
-	'Class:Problem/Attribute:emergency/Value:3' => 'medium',
-	'Class:Problem/Attribute:emergency/Value:3+' => 'medium',
-	'Class:Problem/Attribute:emergency/Value:4' => 'low',
-	'Class:Problem/Attribute:emergency/Value:4+' => 'low',
+	'Class:Problem/Attribute:urgency' => 'Urgency',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'critical',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'critical',
+	'Class:Problem/Attribute:urgency/Value:2' => 'high',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'high',
+	'Class:Problem/Attribute:urgency/Value:3' => 'medium',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'medium',
+	'Class:Problem/Attribute:urgency/Value:4' => 'low',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'low',
 	'Class:Problem/Attribute:priority' => 'Priority',
 	'Class:Problem/Attribute:priority+' => '',
 	'Class:Problem/Attribute:priority/Value:1' => 'Critical',
diff --git a/datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php
index b220abd696..9c6d111100 100755
--- a/datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/fr.dict.itop-problem-mgmt.php
@@ -56,16 +56,16 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Problem/Attribute:impact/Value:2+' => '',
 	'Class:Problem/Attribute:impact/Value:3' => 'Une personne',
 	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:emergency' => 'Urgence',
-	'Class:Problem/Attribute:emergency+' => '',
-	'Class:Problem/Attribute:emergency/Value:1' => 'critique',
-	'Class:Problem/Attribute:emergency/Value:1+' => 'critique',
-	'Class:Problem/Attribute:emergency/Value:2' => 'haute',
-	'Class:Problem/Attribute:emergency/Value:2+' => 'haute',
-	'Class:Problem/Attribute:emergency/Value:3' => 'moyenne',
-	'Class:Problem/Attribute:emergency/Value:3+' => 'moyenne',
-	'Class:Problem/Attribute:emergency/Value:4' => 'basse',
-	'Class:Problem/Attribute:emergency/Value:4+' => 'basse',
+	'Class:Problem/Attribute:urgency' => 'Urgence',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'critique',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'critique',
+	'Class:Problem/Attribute:urgency/Value:2' => 'haute',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'haute',
+	'Class:Problem/Attribute:urgency/Value:3' => 'moyenne',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'moyenne',
+	'Class:Problem/Attribute:urgency/Value:4' => 'basse',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'basse',
 	'Class:Problem/Attribute:priority' => 'Priorité',
 	'Class:Problem/Attribute:priority+' => '',
 	'Class:Problem/Attribute:priority/Value:1' => 'critique',