diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 1206cc3dedd..cb9d012386b 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -20,8 +20,8 @@
         <record id="uom_categ_length" model="product.uom.categ">
             <field name="name">Length / Distance</field>
         </record>
-        <record id="product_uom_categ_fluid" model="product.uom.categ">
-            <field name="name">Fluid</field>
+        <record id="product_uom_categ_vol" model="product.uom.categ">
+            <field name="name">Volume</field>
         </record>
 
         <!--
@@ -88,7 +88,7 @@
         </record>
         <record id="product_uom_litre" model="product.uom">
             <field name="name">Litre</field>
-            <field name="category_id" ref="product_uom_categ_fluid"/>
+            <field name="category_id" ref="product_uom_categ_vol"/>
             <field name="factor">1.0</field>
         </record>
 
diff --git a/addons/product_expiry/product_expiry_demo.xml b/addons/product_expiry/product_expiry_demo.xml
index be2971763b6..12d88ef6862 100644
--- a/addons/product_expiry/product_expiry_demo.xml
+++ b/addons/product_expiry/product_expiry_demo.xml
@@ -1,15 +1,6 @@
 <openerp>
     <data noupdate="1">
 
-    <record id="product_uom_categ_vol" model="product.uom.categ">
-        <field name="name">LTR</field>
-    </record>
-    <record id="product_uom_ltr" model="product.uom">
-        <field name="category_id" ref="product_uom_categ_vol"/>
-        <field name="name">LTR</field>
-        <field name="factor">1.0</field>
-    </record>
-    
         <record id="product_product_jambon" model="product.product">
             <field name="supply_method">buy</field>
             <field name="list_price">7.0</field>
@@ -106,7 +97,7 @@
             <field name="standard_price">6.0</field>
             <field name="uom_id" ref="product.product_uom_unit"/>
             <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="uos_id" ref="product_uom_ltr" />
+            <field name="uos_id" ref="product.product_uom_litre" />
             <field name="uos_coeff">0.5</field>
             <field name="name">Cow milk</field>
             <field name="life_time">30</field>