diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 5b312294c0e..f5f537e160f 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -116,8 +116,8 @@
         </record>
 
         <record id="product_product_3" model="product.product">
-            <field name="name">PC Assemble + 512MB RAM</field>
-            <field name="default_code">PC512</field>
+            <field name="name">PC Assemble SC234</field>
+            <field name="default_code">PCSC234</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
@@ -130,12 +130,12 @@
             <field name="description_sale">17" LCD Monitor
 Processor AMD 8-Core
 512MB RAM
-HDD 320GB</field>
+HDD SH-1</field>
         </record>
 
         <record id="product_product_4" model="product.product">
-            <field name="name">PC Assemble + 2GB RAM</field>
-            <field name="default_code">PC200</field>
+            <field name="name">PC Assemble SC349</field>
+            <field name="default_code">PCSC349</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
@@ -148,11 +148,11 @@ HDD 320GB</field>
             <field name="description_sale">19" LCD Monitor
 Processor Core i5 2.70 Ghz
 2GB RAM
-HDD 320GB</field>
+HDD SH-1</field>
         </record>
 
         <record id="product_product_5" model="product.product">
-            <field name="name">PC Assemble + Custom RAM (PC on Demand)</field>
+            <field name="name">PC Assemble + Custom (PC on Demand)</field>
             <field name="default_code">PC-DEM</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">600.0</field>
@@ -239,8 +239,8 @@ HDD 320GB</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
         <record id="product_product_13" model="product.product">
-            <field name="name">RAM DDR 512MB</field>
-            <field name="default_code">RAM512</field>
+            <field name="name">RAM SR5</field>
+            <field name="default_code">RAM-SR5</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
@@ -249,8 +249,8 @@ HDD 320GB</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
         <record id="product_product_14" model="product.product">
-            <field name="name">RAM DDR 2GB</field>
-            <field name="default_code">RAM2</field>
+            <field name="name">RAM SR2</field>
+            <field name="default_code">RAM-SR2</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">87.0</field>
             <field name="list_price">95.0</field>
@@ -259,8 +259,8 @@ HDD 320GB</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
         <record id="product_product_15" model="product.product">
-            <field name="name">RAM DDR2 1GB</field>
-            <field name="default_code">RAM21</field>
+            <field name="name">RAM SR3</field>
+            <field name="default_code">RAM-SR3</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">80.0</field>
             <field name="list_price">85.0</field>
@@ -281,8 +281,8 @@ HDD 320GB</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
         <record id="product_product_17" model="product.product">
-            <field name="name">HDD 320GB</field>
-            <field name="default_code">HDD320</field>
+            <field name="name">HDD SH-1</field>
+            <field name="default_code">HDD-SH1</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">860.0</field>
             <field name="list_price">975.0</field>
@@ -291,8 +291,8 @@ HDD 320GB</field>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
         <record id="product_product_18" model="product.product">
-            <field name="name">HDD 500GB</field>
-            <field name="default_code">HDD500</field>
+            <field name="name">HDD SH-2</field>
+            <field name="default_code">HDD-SH2</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
@@ -418,8 +418,8 @@ QWERTY keyboard</field>
         </record>
 
         <record id="product_product_29" model="product.product">
-            <field name="name">Pen drive, 8GB</field>
-            <field name="default_code">PD8</field>
+            <field name="name">Pen drive, SP-2</field>
+            <field name="default_code">PD-SP2</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">90.0</field>
             <field name="list_price">100.0</field>
@@ -429,8 +429,8 @@ QWERTY keyboard</field>
         </record>
 
         <record id="product_product_30" model="product.product">
-            <field name="name">Pen drive, 16GB</field>
-            <field name="default_code">PD16</field>
+            <field name="name">Pen drive, SP-4</field>
+            <field name="default_code">PD-SP4</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">126.0</field>
             <field name="list_price">145.0</field>