diff --git a/addons/product_expiry/models/product_product.py b/addons/product_expiry/models/product_product.py
index 3dfcb1a35bd..964fa7820ba 100644
--- a/addons/product_expiry/models/product_product.py
+++ b/addons/product_expiry/models/product_product.py
@@ -10,11 +10,16 @@ class ProductTemplate(models.Model):
     use_expiration_date = fields.Boolean(string='Expiration Date',
         help='When this box is ticked, you have the possibility to specify dates to manage'
         ' product expiration, on the product and on the corresponding lot/serial numbers')
-    expiration_time = fields.Integer(string='Product Life Time',
-        help='Number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number.')
-    use_time = fields.Integer(string='Product Use Time',
-        help='Number of days before the goods starts deteriorating, without being dangerous yet. It will be computed using the lot/serial number.')
-    removal_time = fields.Integer(string='Product Removal Time',
-        help='Number of days before the goods should be removed from the stock. It will be computed on the lot/serial number.')
-    alert_time = fields.Integer(string='Product Alert Time',
-        help='Number of days before an alert should be raised on the lot/serial number.')
+    expiration_time = fields.Integer(string='Expiration Time',
+        help='Number of days after the receipt of the products (from the vendor'
+        ' or in stock after production) after which the goods may become dangerous'
+        ' and must not be consumed. It will be computed on the lot/serial number.')
+    use_time = fields.Integer(string='Best Before Time',
+        help='Number of days before the Expiration Date after which the goods starts'
+        ' deteriorating, without being dangerous yet. It will be computed on the lot/serial number.')
+    removal_time = fields.Integer(string='Removal Time',
+        help='Number of days before the Expiration Date after which the goods'
+        ' should be removed from the stock. It will be computed on the lot/serial number.')
+    alert_time = fields.Integer(string='Alert Time',
+        help='Number of days before the Expiration Date after which an alert should be'
+        ' raised on the lot/serial number. It will be computed on the lot/serial number.')
diff --git a/addons/product_expiry/models/production_lot.py b/addons/product_expiry/models/production_lot.py
index 384207fb9c4..116f5237aee 100644
--- a/addons/product_expiry/models/production_lot.py
+++ b/addons/product_expiry/models/production_lot.py
@@ -9,7 +9,7 @@ class StockProductionLot(models.Model):
 
     use_expiration_date = fields.Boolean(
         string='Use Expiration Date', related='product_id.use_expiration_date')
-    expiration_date = fields.Datetime(string='End of Life Date',
+    expiration_date = fields.Datetime(string='Expiration Date',
         help='This is the date on which the goods with this Serial Number may become dangerous and must not be consumed.')
     use_date = fields.Datetime(string='Best before Date',
         help='This is the date on which the goods with this Serial Number start deteriorating, without being dangerous yet.')
diff --git a/addons/product_expiry/views/product_template_views.xml b/addons/product_expiry/views/product_template_views.xml
index ae1c0bcd653..c6af30107e6 100644
--- a/addons/product_expiry/views/product_template_views.xml
+++ b/addons/product_expiry/views/product_template_views.xml
@@ -11,16 +11,16 @@
                 <group name="group_lots_and_weight" position="after">
                     <group string="Dates" name="expiry_and_lots" groups="stock.group_production_lot"
                         attrs="{'invisible': ['|', ('tracking', '=','none'), ('use_expiration_date', '=', False)]}">
-                        <label for="use_time"/>
-                        <div>
-                            <field name="use_time" class="oe_inline"/>
-                            <span> days</span>
-                        </div>
                         <label for="expiration_time"/>
                         <div>
                             <field name="expiration_time" class="oe_inline"/>
                             <span> days</span>
                         </div>
+                        <label for="use_time"/>
+                        <div>
+                            <field name="use_time" class="oe_inline"/>
+                            <span> days</span>
+                        </div>
                         <label for="removal_time"/>
                         <div>
                             <field name="removal_time" class="oe_inline"/>
diff --git a/addons/product_expiry/views/production_lot_views.xml b/addons/product_expiry/views/production_lot_views.xml
index 9902df8ca3c..e1f56606c20 100644
--- a/addons/product_expiry/views/production_lot_views.xml
+++ b/addons/product_expiry/views/production_lot_views.xml
@@ -10,11 +10,11 @@
                 <field name="use_expiration_date" invisible="1"/>
                 <group>
                     <group>
-                        <field name="use_date" />
+                        <field name="expiration_date" />
                         <field name="removal_date" />
                     </group>
                     <group>
-                        <field name="expiration_date" />
+                        <field name="use_date" />
                         <field name="alert_date" />
                     </group>
                 </group>