diff --git a/product_harmonized_system/demo/product_demo.xml b/product_harmonized_system/demo/product_demo.xml
index 1713f74..dbc475f 100644
--- a/product_harmonized_system/demo/product_demo.xml
+++ b/product_harmonized_system/demo/product_demo.xml
@@ -26,64 +26,55 @@
 <record id="product.product_product_3" model="product.product">
     <field name="hs_code_id" ref="84715000" />
     <field name="origin_country_id" ref="base.tw" />
-    <field name="weight_net">8</field>
     <field name="weight">8.7</field>
 </record>
 
 <record id="product.product_product_4" model="product.product">
     <field name="hs_code_id" ref="84715000" />
     <field name="origin_country_id" ref="base.cn" />
-    <field name="weight_net">0.5</field>
     <field name="weight">1.1</field>
 </record>
 
 <record id="product.product_product_5" model="product.product">
     <field name="hs_code_id" ref="84715000" />
     <field name="origin_country_id" ref="base.cn" />
-    <field name="weight_net">7.5</field>
     <field name="weight">8.2</field>
 </record>
 
+<record id="product.product_product_13" model="product.product">
+    <field name="hs_code_id" ref="84717050" />
+    <field name="origin_country_id" ref="base.sg" />
+    <field name="weight">0.01</field>
+</record>
+
+<record id="product.product_product_16" model="product.product">
+    <field name="hs_code_id" ref="84717050" />
+    <field name="origin_country_id" ref="base.sg" />
+    <field name="weight">0.67</field>
+</record>
+
 <record id="product.product_product_17" model="product.product">
     <field name="hs_code_id" ref="84717050" />
     <field name="origin_country_id" ref="base.sg" />
-    <field name="weight_net">0.45</field>
-    <field name="weight">0.7</field>
-</record>
-
-<record id="product.product_product_18" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight_net">0.42</field>
-    <field name="weight">0.67</field>
-</record>
-
-<record id="product.product_product_19" model="product.product">
-    <field name="hs_code_id" ref="84717050" />
-    <field name="origin_country_id" ref="base.sg" />
-    <field name="weight_net">0.52</field>
     <field name="weight">0.75</field>
 </record>
 
 <record id="product.product_product_20" model="product.product">
     <field name="hs_code_id" ref="85340090" />
     <field name="origin_country_id" ref="base.tw" />
-    <field name="weight_net">0.6</field>
     <field name="weight">1.05</field>
 </record>
 
-<record id="product.product_product_21" model="product.product">
+<record id="product.product_product_22" model="product.product">
     <field name="hs_code_id" ref="85340090" />
     <field name="origin_country_id" ref="base.tw" />
-    <field name="weight_net">0.65</field>
-    <field name="weight">1.1</field>
+    <field name="weight">0.3</field>
 </record>
 
 <record id="product.product_product_25" model="product.product">
     <field name="hs_code_id" ref="84715000" />
     <field name="origin_country_id" ref="base.be" />
-    <field name="weight_net">3.3</field>
-    <field name="weight">4.6</field>
+    <field name="weight">3.3</field>
 </record>
 
 
diff --git a/product_harmonized_system/models/hs_code.py b/product_harmonized_system/models/hs_code.py
index d6bac05..580c957 100644
--- a/product_harmonized_system/models/hs_code.py
+++ b/product_harmonized_system/models/hs_code.py
@@ -23,7 +23,7 @@ class HSCode(models.Model):
         'Description', translate=True,
         help="Short text description of the H.S. category")
     display_name = fields.Char(
-        compute='_compute_display_name', string="Display Name",
+        compute='_compute_display_name_field', string="Display Name",
         store=True, readonly=True)
     local_code = fields.Char(
         string='Local Code', required=True,
@@ -48,7 +48,7 @@ class HSCode(models.Model):
 
     @api.multi
     @api.depends('local_code', 'description')
-    def _compute_display_name(self):
+    def _compute_display_name_field(self):
         for this in self:
             display_name = this.local_code
             if this.description: