diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 65e6cdf598e..87f29cc6124 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2392,6 +2392,9 @@ class stock_picking_type(osv.osv):
         else:
             return {'value': result}
 
+    def _get_name(self, cr, uid, ids, field_names, arg, context=None):
+        return dict(self.name_get(cr, uid, ids, context=context))
+
     def name_get(self, cr, uid, ids, context=None):
         """Overides orm name_get method to display 'Warehouse_name: PickingType_name' """
         if not isinstance(ids, list):
@@ -2413,6 +2416,7 @@ class stock_picking_type(osv.osv):
 
     _columns = {
         'name': fields.char('name', translate=True, required=True),
+        'complete_name': fields.function(_get_name, type='char', string='Name'),
         'pack': fields.boolean('Prefill Pack Operations', help='This picking type needs packing interface'),
         'auto_force_assign': fields.boolean('Automatic Availability', help='This picking type does\'t need to check for the availability in source location.'),
         'color': fields.integer('Color Index'),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3e7154edfdf..f5f7f6532fb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1192,7 +1192,7 @@
             <field name="model">stock.picking.type</field>
             <field name="arch" type="xml">
                 <tree string="Picking Types">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="sequence_id"/>
                     <field name="pack"/>
                 </tree>
@@ -1234,7 +1234,7 @@
             <field name="model">stock.picking.type</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_background_grey">
-                    <field name="name"/>
+                    <field name="complete_name"/>
                     <field name="color"/>
                     <field name="count_picking"/>
                     <field name="count_picking_waiting"/>
@@ -1255,7 +1255,7 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h4 class="oe_center"><field name="name"/></h4>
+                                    <h4 class="oe_center"><field name="complete_name"/></h4>
                                     <div class="oe_right">
                                         <a name="%(action_stock_stock_ui)d" type="action">
                                             <img src="/stock/static/src/img/scan.png" 
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.yml b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
index 78bd8ad519e..94f192bbbd6 100644
--- a/addons/stock_multi_warehouse/stock_multi_warehouse.yml
+++ b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
@@ -75,7 +75,7 @@
   Create picking type internal for this warehouse
 - 
   !record {model: stock.picking.type, id: picking_type_santiago_internal}:
-    name: Deliveries
+    name: Internal
     code_id: internal
     sequence_id: stock.seq_picking_type_internal
     warehouse_id: wh_panama_santiago
@@ -138,7 +138,7 @@
   Create picking type internal for warehouse panama main
 - 
   !record {model: stock.picking.type, id: picking_type_main_internal}:
-    name: Deliveries
+    name: Internal
     code_id: internal
     sequence_id: stock.seq_picking_type_internal
     warehouse_id: wh_panama_main
@@ -225,7 +225,7 @@
 -
   !record {model: product.product, id: product_A}:
     name: Product A
-    type: consu
+    type: product
     categ_id: product.product_category_1
     list_price: 100.0
     standard_price: 70.0
@@ -235,7 +235,7 @@
 -
   !record {model: product.product, id: product_B}:
     name: Product B
-    type: consu
+    type: product
     categ_id: product.product_category_1
     list_price: 150.0
     standard_price: 150.0
@@ -245,7 +245,7 @@
 -
   !record {model: product.product, id: product_C}:
     name: Product C
-    type: consu
+    type: product
     categ_id: product.product_category_1
     list_price: 200.0
     standard_price: 150.0
@@ -255,7 +255,7 @@
 -
   !record {model: product.product, id: product_D}:
     name: Product D
-    type: consu
+    type: product
     categ_id: product.product_category_1
     list_price: 300.0
     standard_price: 280.0