diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index d0dbe248b59..07f3e65a836 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -267,7 +267,7 @@
 
         <record id="stock_warehouse_shop0" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Computech&quot;&quot;&quot;" name="name"/>
             <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"/>
@@ -275,7 +275,7 @@
         </record>
         <record id="stock_warehouse_shop1" model="stock.warehouse">
             <field name="lot_output_id" ref="stock.stock_location_output"/>
-            <field name="name">Shop 2</field>
+            <field name="name">Softsys</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 53189727f0e..70dc2592ace 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -79,8 +79,8 @@ Use-Case
 --------
 
 You can use the demo data as follow:
-  CPU1: Sell some CPU1 from Shop 1 and run the scheduler
-     - Warehouse: delivery order, Shop 1: reception
+  CPU1: Sell some CPU1 from Computech and run the scheduler
+     - Warehouse: delivery order, Computech: reception
   CPU3:
      - When receiving the product, it goes to Quality Control location then stored to shelf 2.
      - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 8aa5264200b..d35a14f1e4b 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">Shop 1</field>
+            <field name="name">Computech</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">Shop 2</field>
+            <field name="name">Softsys</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 3660e9c8ac6..c8c151cac77 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 Shop 2 and destination shop1.
+  I check the Outgoing Picking is created for source location Softsys and destination Computech.
 -
   !python {model: stock.picking }: |
     from tools.translate import _