diff --git a/addons/portal/data/portal_demo.xml b/addons/portal/data/portal_demo.xml
index f70cc62b698..2e069dfe883 100644
--- a/addons/portal/data/portal_demo.xml
+++ b/addons/portal/data/portal_demo.xml
@@ -12,8 +12,8 @@
             <field name="city">Vivegnis</field>
             <field name="zip">4683</field>
             <field name="country_id" ref="base.be"/>
-            <field name="street">YourCompany</field>
-            <field name="street2">Rue Cesar de Paepe, 43</field>
+            <field name="company_name">YourCompany</field>
+            <field name="street">Rue Cesar de Paepe, 43</field>
         </record>
         <record id="demo_user0" model="res.users" context="{'no_reset_password': True}">
             <field name="partner_id" ref="partner_demo_portal"/>
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 9fccc5898de..c60c0ac1b9a 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -7,8 +7,8 @@
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
             <field name="email">demo@yourcompany.example.com</field>
-            <field name="street">YourCompany</field>
-            <field name="street2">Avenue des Dessus-de-Lives, 2</field>
+            <field name="company_name">YourCompany</field>
+            <field name="street">Avenue des Dessus-de-Lives, 2</field>
             <field name="city">Namur (Loyers)</field>
             <field name="zip">5101</field>
             <field name="country_id" ref="be"/>
@@ -22,8 +22,8 @@
 
         <record id="main_partner" model="res.partner">
             <field name="name">YourCompany</field>
-            <field name="street">YourCompany</field>
-            <field name="street2">1725 Slough Ave.</field>
+            <field name="company_name">YourCompany</field>
+            <field name="street">1725 Slough Ave.</field>
             <field name="city">Scranton</field>
             <field name="zip">18540</field>
             <field name='country_id' ref='base.us'/>
@@ -48,8 +48,8 @@
         </record>
 
         <record model="res.partner" id="base.partner_root">
-            <field name="street">YourCompany</field>
-            <field name="street2">215 Vine St</field>
+            <field name="company_name">YourCompany</field>
+            <field name="street">215 Vine St</field>
             <field name="city">Scranton</field>
             <field name="zip">18503</field>
             <field name='country_id' ref='base.us'/>