diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 787f8bc9491..6b869904d39 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -182,7 +182,7 @@
 
         <!--        Child Company 1-->
         <record id="res_partner_company_1" model="res.partner">
-            <field name="name">Computech Systems</field>
+            <field name="name">Your company, Chicago shop</field>
             <field eval="1" name="customer"/>
             <field eval="1" name="supplier"/>
             <field name="is_company">1</field>
@@ -192,9 +192,9 @@
             <field model="res.country.state" name="state_id" search="[('code','ilike','il')]"/>
             <field name="zip">60610</field>
             <field name="city">Chicago</field>
-            <field name="email">info@computech.com</field>
+            <field name="email">chicago@yourcompany.com</field>
             <field name="phone">+1 312 349 3030</field>
-            <field name="website">www.computech.com</field>
+            <field name="website">www.yourcompany.com</field>
         </record>
 
         <record id="res_partner_address_41" model="res.partner">
@@ -204,15 +204,15 @@
         </record>
 
         <record id="res_company_1" model="res.company">
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.USD"/>
             <field name="partner_id" ref="res_partner_company_1"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field name="name">Computech Systems</field>
+            <field name="name">Your company, Chicago shop</field>
         </record>
 
         <!--        Child Company 2-->
         <record id="res_partner_company_2" model="res.partner">
-            <field name="name">SoftSys Technologies</field>
+            <field name="name">Your company, Birmingham shop</field>
             <field eval="1" name="customer"/>
             <field eval="1" name="supplier"/>
             <field eval="1" name="active"/>
@@ -222,8 +222,8 @@
             <field name="zip">B46 3AG</field>
             <field model="res.country" name="country_id" search="[('code','ilike','gb')]"/>
             <field name="phone">+44 121 690 4596</field>
-            <field name="email">info@softsys.com</field>
-            <field name="website">www.softsys.com</field>
+            <field name="email">birmingham@yourcompany.com</field>
+            <field name="website">www.yourcompany.com</field>
         </record>
 
         <record id="res_partner_address_40" model="res.partner">
@@ -233,10 +233,10 @@
         </record>
 
         <record id="res_company_2" model="res.company">
-            <field name="currency_id" ref="base.EUR"/>
+            <field name="currency_id" ref="base.BBP"/>
             <field name="partner_id" ref="res_partner_company_2"/>
             <field name="parent_id" ref="base.main_company"/>
-            <field name="name">SoftSys Technologies</field>
+            <field name="name">Your company, Birmingham shop</field>
         </record>
 
         <record id="stock_location_shop0" model="stock.location">
@@ -246,7 +246,7 @@
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="&quot;&quot;&quot;none&quot;&quot;&quot;" name="chained_location_type"/>
             <field eval="1" name="active"/>
-            <field name="name">Computech Systems</field>
+            <field name="name">Your company, Chicago shop</field>
             <field eval="&quot;&quot;&quot;manual&quot;&quot;&quot;" name="chained_auto_packing"/>
         </record>
         <record id="stock_location_shop1" model="stock.location">
@@ -255,7 +255,7 @@
             <field name="location_id" ref="stock.stock_location_locations"/>
             <field eval="&quot;&quot;&quot;internal&quot;&quot;&quot;" name="usage"/>
             <field eval="1" name="active"/>
-            <field name="name">SoftSys Technologies</field>
+            <field name="name">Your company, Birmingham shop</field>
         </record>
         <record id="stock_location_intermediatelocation0" model="stock.location">
             <field name="partner_id" ref="base.main_partner"/>
@@ -266,7 +266,7 @@
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field eval="&quot;&quot;&quot;Computech&quot;&quot;&quot;" name="name"/>
+            <field name="name">Chicago Warehouse</field>
             <field name="lot_stock_id" ref="stock_location_shop0"/>
             <field name="partner_id" ref="res_partner_address_41"/>
             <field name="company_id" ref="res_company_1"/>
@@ -274,7 +274,7 @@
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field name="name">Softsys</field>
+            <field name="name">Birmingham Warehouse</field>
             <field name="lot_stock_id" ref="stock_location_shop1"/>
             <field name="partner_id" ref="res_partner_address_40"/>
             <field name="company_id" ref="res_company_1"/>
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index b9d6286b4c3..db2858bb44a 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -84,8 +84,8 @@ Use-Case:
 ---------
 
 You can use the demo data as follow:
-  CPU1: Sell some CPU1 from Computech and run the scheduler
-     - Warehouse: delivery order, Computech: reception
+  CPU1: Sell some CPU1 from Chicago Shop and run the scheduler
+     - Warehouse: delivery order, Chicago Shop: reception
   CPU3:
      - When receiving the product, it goes to Quality Control location then
        stored to shelf 2.
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index d35a14f1e4b..6578a961ff3 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -77,13 +77,13 @@
         </record>
 
         <record id="sale_shop2" model="sale.shop">
-            <field name="name">Computech</field>
+            <field name="name">Chicago Shop</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="company_id" ref="stock.res_company_1"/>
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
         <record id="sale_shop3" model="sale.shop">
-            <field name="name">Softsys</field>
+            <field name="name">Birmingham shop</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
             <field name="company_id" ref="stock.res_company_2"/>
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index c8c151cac77..a7dd7d82607 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -198,7 +198,7 @@
    procurement_ids=self.search(cr, uid, [('name','=','E001')])
    assert len(procurement_ids), "Procurement order hasn't Created."
 -
-  I check the Outgoing Picking is created for source location Softsys and destination Computech.
+  I check the Outgoing Picking is created for source location Birmingham Shop and destination Chicago shop.
 -
   !python {model: stock.picking }: |
     from tools.translate import _