diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cc7ab58eb85..fffd68fdeaf 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -560,7 +560,7 @@
             <field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                  <xpath expr="//group[@name='lot']" position="inside">
-                    <field name="track_production" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
+                    <field name="track_production" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
                 </xpath>
             </field>
         </record>
@@ -737,7 +737,7 @@
                                                    string="Split in Serial Numbers"
                                                    type="action" icon="gtk-justify-fill"
                                                    states="draft,waiting,confirmed,assigned" 
-                                                   groups="stock.group_production_lot"/>
+                                                   groups="stock.group_tracking_lot"/>
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="terp-gtk-jump-to-ltr" context="{'scrap': True}"
@@ -751,7 +751,7 @@
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
-                                           <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
+                                           <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>-->
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
                                        </tree>
@@ -779,7 +779,7 @@
                                             <field name="product_qty" readonly="1"/>
                                             <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
-                                            <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
+                                            <!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>-->
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.track_line)d"
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 2ee5d86f18d..338e9728f66 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -67,12 +67,9 @@ This installs the module product_expiry."""),
         'group_stock_packaging': fields.boolean("Allow to define several packaging methods on products",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_production_lot': fields.boolean("Track serial number on products",
-            implied_group='stock.group_production_lot',
-            help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
-        'group_stock_tracking_lot': fields.boolean("Track serial number on logistic units (pallets)",
+        'group_stock_tracking_lot': fields.boolean("Track serial number on products",
             implied_group='stock.group_tracking_lot',
-            help="""When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
+            help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
         'group_stock_tracking_owner': fields.boolean("Manage owner on stock", 
             implied_group='stock.group_tracking_owner', 
             help="""This way you can receive products attributed to a certain owner. """), 
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index fcff9e45221..f8d154e3dd9 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -26,18 +26,14 @@
                     <group>
                         <label for="id" string="Traceability"/>
                         <div>
-                            <div>
-                                <field name="group_stock_production_lot" class="oe_inline"/>
-                                <label for="group_stock_production_lot"/>
-                            </div>
-                            <div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
-                                <field name="module_product_expiry" class="oe_inline"/>
-                                <label for="module_product_expiry"/>
-                            </div>
                             <div>
                                 <field name="group_stock_tracking_lot" class="oe_inline"/>
                                 <label for="group_stock_tracking_lot"/>
                             </div>
+                            <div attrs="{'invisible': [('group_stock_tracking_lot','=',False)]}">
+                                <field name="module_product_expiry" class="oe_inline"/>
+                                <label for="module_product_expiry"/>
+                            </div>
                             <div>
                                 <field name="group_stock_tracking_owner" class="oe_inline"/>
                                 <label for="group_stock_tracking_owner"/>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 78d57242aec..343235e8265 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -19,13 +19,8 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_production_lot" model="res.groups">
-        <field name="name">Manage Serial Numbers</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_tracking_lot" model="res.groups">
-        <field name="name">Manage Logistic Serial Numbers</field>
+        <field name="name">Manage Serial Numbers</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 58f5205ab69..dbecbd8830d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -111,7 +111,7 @@
                         </group>
                         <group>
                             <field name="product_id" domain="[('type','=','product')]" attrs="{'invisible': [('filter', 'not in', ('product', 'product_owner'))]}"/>
-                            <field name="lot_id" attrs="{'invisible': [('filter', '!=', 'lot')]}" groups="stock.group_production_lot" />
+                            <field name="lot_id" attrs="{'invisible': [('filter', '!=', 'lot')]}" groups="stock.group_tracking_lot" />
                             <field name="partner_id" attrs="{'invisible': [('filter', 'not in', ('owner', 'product_owner'))]}" groups="stock.group_tracking_owner"/>
                             <field name="package_id" attrs="{'invisible': [('filter', '!=', 'pack')]}" groups="stock.group_tracking_lot"/>
                         </group>
@@ -124,7 +124,7 @@
                                     <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('type','=','product')]"/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>
                                     <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)"/>
-                                    <field name="prod_lot_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
+                                    <field name="prod_lot_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_tracking_lot"/>
                                     <field name="package_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" groups="stock.group_tracking_lot"/>
                                     <field name="partner_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,partner_id,prod_lot_id,package_id)" groups="stock.group_tracking_owner"/>
                                     <field name="th_qty" readonly="1"/>
@@ -271,7 +271,7 @@
             </field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form"
-            parent="menu_traceability" groups="stock.group_production_lot"
+            parent="menu_traceability" groups="stock.group_tracking_lot"
             sequence="1"/>
 
         #
@@ -799,7 +799,7 @@
                                 <tree editable="top">   
                                     <field name="product_id" on_change='product_id_change(product_id, product_uom_id, product_qty, context)'/>
                                     <field name="product_uom_id" groups="product.group_uom" on_change='on_change_tests(product_id, product_uom_id, product_qty, context)'/>
-                                    <field name="lot_id" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
+                                    <field name="lot_id" domain="[('product_id','=?', product_id)]" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>
                                     <field name="package_id" groups="stock.group_tracking_lot"/>
                                     <field name="owner_id" groups="stock.group_tracking_owner"/>
                                     <field name="product_qty" attrs="{'required': [('product_id', '!=', False)]}" on_change='on_change_tests(product_id, product_uom_id, product_qty, context)'/>
@@ -1742,7 +1742,7 @@
                     <field name="product_id"/>
                     <field name="location_id"/>
                     <field name="package_id" groups="stock.group_tracking_lot"/>
-                    <field name="lot_id" groups="stock.group_production_lot"/>
+                    <field name="lot_id" groups="stock.group_tracking_lot"/>
                     <field name="owner_id" groups="stock.group_tracking_owner"/>
                     <group expand='0' string='Filters'>
                         <filter name='internal_loc' string="Internal Locations" domain="[('location_id.usage','=', 'internal')]"/>
@@ -1750,7 +1750,7 @@
                     <group expand='0' string='Group by...'>
                        <filter name="productgroup" string='Product' context="{'group_by' : 'product_id'}"/>
                        <filter string='Owner' context="{'group_by' : 'owner_id'}" groups="stock.group_tracking_owner"/>
-                       <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_production_lot"/>
+                       <filter string='Lot' context="{'group_by' : 'lot_id'}" groups="stock.group_tracking_lot"/>
                        <filter name="locationgroup" string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>
                        <filter string='Packaging' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'package_id'}" groups="stock.group_tracking_lot"/>
                        <filter string='Packaging Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'packaging_type_id'}" groups="stock.group_tracking_lot"/>
@@ -1779,7 +1779,7 @@
                     </div>
                     <field name="product_id"/>
                     <field name="qty"/>
-                    <field name="lot_id" groups="stock.group_production_lot"/>
+                    <field name="lot_id" groups="stock.group_tracking_lot"/>
                     <field name="package_id" groups="stock.group_tracking_lot"/>
                     <field name="location_id"/>
                     <field name="in_date"/>
@@ -1801,7 +1801,7 @@
                     <field name="qty"/>
                     <field name="location_id"/>
                     <field name="owner_id" groups="stock.group_tracking_owner"/>
-                    <field name="lot_id" groups="stock.group_production_lot"/>
+                    <field name="lot_id" groups="stock.group_tracking_lot"/>
                     <field name="package_id" groups="stock.group_tracking_lot"/>
                     <field name="packaging_type_id" invisible="1"/>
                     <field name="in_date"/>
@@ -1943,7 +1943,7 @@
                         <field name="outgoing_qty" class="oe_inline"/>
                         <field name="virtual_available" class="oe_inline"/>
                     </group>
-                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_tracking_lot" string="Lots">
                         <field name="track_all" groups="stock.group_tracking_lot"/>
                         <field name="track_incoming" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
                         <field name="track_outgoing" groups="stock.group_tracking_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index fe441ae4221..9eeb56821fd 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -15,7 +15,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_production_lot"/>
+                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_tracking_lot"/>
                         <field name="location_id" groups="stock.group_locations"/>
                     </group>
                     <footer>
@@ -49,7 +49,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_production_lot"/>
+                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_tracking_lot"/>
                         <field name="location_id" string="Scrap Location" widget="selection"
                             domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index d6af408ae6a..49b0c9a0e5c 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -16,7 +16,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
-                    <field name="lot_id" groups="stock.group_production_lot"/>
+                    <field name="lot_id" groups="stock.group_tracking_lot"/>
                     <field name="quantity" />
                 </tree>
             </field>
@@ -29,7 +29,7 @@
                 <form string="Return Picking Memory" version="7.0">
                     <group col="4">
                         <field name="product_id" />
-                        <field name="lot_id" groups="stock.group_production_lot"/>
+                        <field name="lot_id" groups="stock.group_tracking_lot"/>
                         <field name="quantity" />
                     </group>
                  </form>