diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 7037341ff36..cc0bae721e8 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -187,7 +187,7 @@
         </record>
         <record id="product_product_10" model="product.product">
             <field name="name">Mouse, Optical</field>
-            <field name="default_code">MOpt</field>
+            <field name="default_code">M-Opt</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
@@ -197,7 +197,7 @@
         </record>
         <record id="product_product_11" model="product.product">
             <field name="name">Mouse, Laser</field>
-            <field name="default_code">MLas</field>
+            <field name="default_code">M-Las</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
@@ -207,7 +207,7 @@
         </record>
         <record id="product_product_12" model="product.product">
             <field name="name">Mouse, Wireless</field>
-            <field name="default_code">MWir</field>
+            <field name="default_code">M-Wir</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
@@ -247,7 +247,7 @@
         </record>
         <record id="product_product_16" model="product.product">
             <field name="name">Computer Case</field>
-            <field name="default_code">CCase</field>
+            <field name="default_code">C-Case</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
@@ -277,7 +277,7 @@
         </record>
         <record id="product_product_19" model="product.product">
             <field name="name">HDD on Demand</field>
-            <field name="default_code">HDD_DEM</field>
+            <field name="default_code">HDD-DEM</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
@@ -288,7 +288,7 @@
         </record>
         <record id="product_product_20" model="product.product">
             <field name="name">Motherboard I9P57</field>
-            <field name="default_code">MBI9</field>
+            <field name="default_code">MBi9</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
@@ -298,7 +298,7 @@
         </record>
         <record id="product_product_21" model="product.product">
             <field name="name">Motherboard A20Z7</field>
-            <field name="default_code">MBA20</field>
+            <field name="default_code">MBa20</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">1790.0</field>
             <field name="list_price">2000.0</field>
@@ -318,7 +318,7 @@
         </record>
         <record id="product_product_23" model="product.product">
             <field name="name">Processesor AMD 8-Core</field>
-            <field name="default_code">CPU_A8</field>
+            <field name="default_code">CPUa8</field>
             <field name="categ_id" ref="product_category_10"/>
             <field name="standard_price">1910.0</field>
             <field name="list_price">1980.0</field>
@@ -338,7 +338,7 @@
         </record>
         <record id="product_product_25" model="product.product">
             <field name="name">Laptop E5023</field>
-            <field name="default_code">LAP_E5</field>
+            <field name="default_code">LAP-E5</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
@@ -348,7 +348,7 @@
         </record>
         <record id="product_product_26" model="product.product">
             <field name="name">Laptop S3450</field>
-            <field name="default_code">LAP_S3</field>
+            <field name="default_code">LAP-S3</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">3000.0</field>
             <field name="list_price">3245.0</field>
@@ -358,7 +358,7 @@
         </record>
         <record id="product_product_27" model="product.product">
             <field name="name">Laptop Customized</field>
-            <field name="default_code">LAP_CUS</field>
+            <field name="default_code">LAP-CUS</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
@@ -368,7 +368,7 @@
         </record>
         <record id="product_product_28" model="product.product">
             <field name="name">External Hard disk</field>
-            <field name="default_code">EXT_HDD</field>
+            <field name="default_code">EXT-HDD</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">390.0</field>
             <field name="list_price">405.0</field>
@@ -400,7 +400,7 @@
         </record>
         <record id="product_product_31" model="product.product">
             <field name="name">Multimedia Speakers</field>
-            <field name="default_code">MM_SPK</field>
+            <field name="default_code">MM-SPK</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">134.0</field>
             <field name="list_price">150.0</field>
@@ -420,7 +420,7 @@
         </record>
         <record id="product_product_33" model="product.product">
             <field name="name">Headset USB</field>
-            <field name="default_code">HEAD_USB</field>
+            <field name="default_code">HEAD-USB</field>
             <field name="categ_id" ref="product_category_9"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
@@ -585,7 +585,7 @@
 
         <record id="product_product_48" model="product.product">
             <field name="name">USB Adapter</field>
-            <field name="default_code">ADpt</field>
+            <field name="default_code">ADPT</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">13.0</field>
             <field name="list_price">18.0</field>