diff --git a/addons/stock/data/stock_data.xml b/addons/stock/data/stock_data.xml
index e46088b3585..b300515a0a6 100644
--- a/addons/stock/data/stock_data.xml
+++ b/addons/stock/data/stock_data.xml
@@ -86,13 +86,13 @@
         <!--
     Resource: stock.warehouse
     -->
-        
 
         <record id="warehouse0" model="stock.warehouse">
             <field name="partner_id" ref="base.main_partner"/>
+            <field name="name">San Francisco</field>
             <field name="code">WH</field>
         </record>
- 
+
         <record id="sequence_mrp_op" model="ir.sequence">
             <field name="name">Stock orderpoint</field>
             <field name="code">stock.orderpoint</field>
diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml
index 755f67be949..c799cd1f429 100644
--- a/addons/stock/data/stock_demo.xml
+++ b/addons/stock/data/stock_demo.xml
@@ -185,11 +185,20 @@
             <field name="name">My Company (San Francisco)</field>
         </record>
 
+        <!-- Rename auto-created Chicago Warehouse -->
+        <function model="stock.warehouse" name="write">
+            <value model="stock.warehouse" search="[('company_id', '=', obj().env.ref('stock.res_company_1').id)]"/>
+            <value eval="{
+                'name': 'Chicago 1',
+                'code': 'CHIC1',
+            }"/>
+        </function>
+
         <record id="stock_warehouse_shop0" model="stock.warehouse">
-            <field name="name">Chicago Warehouse</field>
+            <field name="name">Chicago 2</field>
             <field name="partner_id" ref="res_partner_address_41"/>
             <field name="company_id" ref="res_company_1"/>
-            <field name="code">Chic</field>
+            <field name="code">CHIC2</field>
         </record>
 
         <record id="product.consu_delivery_03" model="product.product">
diff --git a/addons/stock/models/res_company.py b/addons/stock/models/res_company.py
index cc66f077b05..2e7c5bd474c 100644
--- a/addons/stock/models/res_company.py
+++ b/addons/stock/models/res_company.py
@@ -180,5 +180,10 @@ class Company(models.Model):
         company.sudo()._create_per_company_sequences()
         company.sudo()._create_per_company_picking_types()
         company.sudo()._create_per_company_rules()
-        self.env['stock.warehouse'].sudo().create({'name': company.name, 'code': company.name[:5], 'company_id': company.id, 'partner_id': company.partner_id.id})
+        self.env['stock.warehouse'].sudo().create({
+            'name': company.name,
+            'code': self.env.context.get('default_code') or company.name[:5],
+            'company_id': company.id,
+            'partner_id': company.partner_id.id
+        })
         return company