diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index fea4a3286f9..ffc1570b67f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1918,7 +1918,7 @@ class stock_warehouse(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'partner_id': fields.many2one('res.partner', 'Owner Address'),
+        'partner_id': fields.many2one('res.partner', 'Address'),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage', '=', 'internal')]),
     }
 
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 78e9ea694cc..4b3d32d9fcc 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -42,7 +42,7 @@ class stock_location_route(osv.osv):
 class stock_warehouse(osv.osv):
     _inherit = 'stock.warehouse'
     _columns = {
-        'route_id': fields.many2one('stock.location.route', 'Default Logistic Route', help='Default route through the warehouse', required=True), 
+        'route_id': fields.many2one('stock.location.route', 'Default Routes', help='Default route through the warehouse', required=True), 
     }
 
 
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index f74b2d9321b..ce8b4c67cd7 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -154,7 +154,7 @@
             <field name="inherit_id" ref="stock.view_warehouse"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='partner_id']" position="after">
-                    <field name="route_id"/>
+                    <field name="route_id" widget="many2many_tags"/>
                 </xpath>
             </field>
         </record>
@@ -189,7 +189,7 @@
 		</record>
 
 		<record id="action_routes_form" model="ir.actions.act_window">
-			<field name="name">Logistic Routes</field>
+			<field name="name">Routes</field>
 			<field name="res_model">stock.location.route</field>
 			<field name="type">ir.actions.act_window</field>
 			<field name="view_type">form</field>
@@ -197,9 +197,9 @@
 			<field name="view_id" ref="stock_location_route_tree" />
 			<field name="help" type="html">
 				<p class="oe_view_nocontent_create">
-					Click to add a logistic route.
+					Click to add a route.
               </p>
-				<p>You can define here the main logistic routes that run through
+				<p>You can define here the main routes that run through
 					your warehouses and that define the flows of your products. These
 					routes can be assigned to a product, a product category or be fixed
 					on procurement or sales order. </p>