diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 2f88d23f9c5..fa54dc0096f 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -562,8 +562,8 @@
     <record id="mrp_bom_assemblysection0" model="mrp.bom">
         <field name="name">Assembly Section</field>
             <field name="sequence">123</field>
-        <field name="product_id" ref="product_product_assemblysection0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_assemblysection0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">4.0</field>
         <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
     </record>
@@ -571,8 +571,8 @@
     <record id="mrp_bom_sidepanel0" model="mrp.bom">
         <field name="name">Side Panel</field>
             <field name="sequence">125</field>
-        <field name="product_id" ref="product_product_sidepanel0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_sidepanel0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">2.0</field>
         <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
     </record>
@@ -580,8 +580,8 @@
     <record id="mrp_bom_metalcleats0" model="mrp.bom">
         <field name="name">Metal Cleats</field>
             <field name="sequence">127</field>
-        <field name="product_id" ref="product_product_metalcleats0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_metalcleats0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">12.0</field>
         <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Default BOM for Shelf of 100cm')]"/>
     </record>
@@ -590,15 +590,15 @@
         <field name="name">Default BOM for Shelf of 100cm</field>
         <field name="code">SHE100</field>
             <field name="sequence">129</field>
-        <field name="product_id" ref="product_product_shelfofcm0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_shelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
     </record>
 
     <record id="mrp_bom_rearpanelarm0" model="mrp.bom">
            <field name="sequence">131</field>
-       <field name="product_id" ref="product_product_rearpanelarm0"/>
-       <field name="product_uom" ref="product_uom_unit"/>
+       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
            <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE100</field>
@@ -606,8 +606,8 @@
 
     <record id="mrp_bom_shelf0" model="mrp.bom">
            <field name="sequence">133</field>
-       <field name="product_id" ref="product_product_shelf0"/>
-       <field name="product_uom" ref="product_uom_unit"/>
+       <field name="product_id" ref="product.product_product_shelf0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
            <field name="product_qty">3.0</field>
        <field name="name">Shelf 100</field>
@@ -615,8 +615,8 @@
 
     <record id="mrp_bom_woodlintelm0" model="mrp.bom">
            <field name="sequence">135</field>
-       <field name="product_id" ref="product_product_woodlintelm0"/>
-       <field name="product_uom" ref="product_uom_meter"/>
+       <field name="product_id" ref="product.product_product_woodlintelm0"/>
+       <field name="product_uom" ref="product.product_uom_meter"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
            <field name="product_qty">1.0</field>
        <field model="mrp.bom" name="bom_id" search="[('name', '=', u'Assembly Section')]"/>
@@ -627,8 +627,8 @@
         <field name="name">Default BOM for Shelf of 200cm</field>
         <field name="code">SHE200</field>
             <field name="sequence">137</field>
-        <field name="product_id" ref="product_product_shelfofcm0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_shelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
     </record>
 
@@ -636,16 +636,16 @@
         <field name="name">Default BOM for KIT Shelf of 100cm</field>
         <field name="code">SHE100KIT</field>
             <field name="sequence">139</field>
-        <field name="product_id" ref="product_product_kitshelfofcm0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_kitshelfofcm0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
         <field name="type">phantom</field>
     </record>
 
     <record id="mrp_bom_rearpanelarm1" model="mrp.bom">
            <field name="sequence">141</field>
-       <field name="product_id" ref="product_product_rearpanelarm0"/>
-       <field name="product_uom" ref="product_uom_unit"/>
+       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm0"/>
            <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE100</field>
@@ -654,8 +654,8 @@
     <record id="mrp_bom_assemblysection2" model="mrp.bom">
         <field name="name">Assembly Section</field>
             <field name="sequence">143</field>
-        <field name="product_id" ref="product_product_assemblysection0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_assemblysection0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">4.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
     </record>
@@ -663,16 +663,16 @@
     <record id="mrp_bom_sidepanel2" model="mrp.bom">
         <field name="name">Side Panel</field>
             <field name="sequence">145</field>
-        <field name="product_id" ref="product_product_sidepanel0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_sidepanel0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">2.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforkitshelfofcm0"/>
     </record>
 
     <record id="mrp_bom_rearpanelarm2" model="mrp.bom">
            <field name="sequence">147</field>
-       <field name="product_id" ref="product_product_rearpanelarm0"/>
-       <field name="product_uom" ref="product_uom_unit"/>
+       <field name="product_id" ref="product.product_product_rearpanelarm0"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
            <field name="product_qty">1.0</field>
        <field name="name">Rear panel SHE200</field>
@@ -681,8 +681,8 @@
     <record id="mrp_bom_assemblysection3" model="mrp.bom">
         <field name="name">Assembly Section</field>
             <field name="sequence">149</field>
-        <field name="product_id" ref="product_product_assemblysection0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_assemblysection0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">4.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
@@ -690,16 +690,16 @@
     <record id="mrp_bom_sidepanel3" model="mrp.bom">
         <field name="name">Side Panel</field>
             <field name="sequence">151</field>
-        <field name="product_id" ref="product_product_sidepanel0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_sidepanel0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">2.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>
 
     <record id="mrp_bom_shelf2" model="mrp.bom">
            <field name="sequence">153</field>
-       <field name="product_id" ref="product_product_shelf1"/>
-       <field name="product_uom" ref="product_uom_unit"/>
+       <field name="product_id" ref="product.product_product_shelf1"/>
+       <field name="product_uom" ref="product.product_uom_unit"/>
        <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
            <field name="product_qty">3.0</field>
        <field name="name">Shelf 200</field>
@@ -708,8 +708,8 @@
     <record id="mrp_bom_metalcleats3" model="mrp.bom">
         <field name="name">Metal Cleats</field>
             <field name="sequence">155</field>
-        <field name="product_id" ref="product_product_metalcleats0"/>
-        <field name="product_uom" ref="product_uom_unit"/>
+        <field name="product_id" ref="product.product_product_metalcleats0"/>
+        <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">12.0</field>
         <field name="bom_id" ref="mrp_bom_defaultbomforshelfofcm1"/>
     </record>