diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index f3c305fb789..1243331272f 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1002,7 +1002,7 @@
         </record>
 
         <record id="main_partner" model="res.partner">
-            <field name="name">OpenERP S.A.</field>
+            <field name="name">Company Name</field>
             <!-- Address and Company ID will be set later -->
             <field name="address" eval="[]"/>
             <field name="company_id" eval="None"/>
@@ -1010,13 +1010,13 @@
         </record>
         <record id="main_address" model="res.partner.address">
             <field name="partner_id" ref="main_partner"/>
-            <field name="name">Fabien Pinckaers</field>
-            <field name="street">Chaussee de Namur 40</field>
-            <field name="zip">1367</field>
-            <field name="city">Gerompont</field>
-            <field name="phone">(+32).81.81.37.00</field>
+            <field name="name">Company contact name</field>
+            <field name="street">Company street, number</field>
+            <field name="zip">Company zip</field>
+            <field name="city">Company city</field>
+            <field name="phone">+1-212-555-12345</field>
             <field name="type">default</field>
-            <field model="res.country" name="country_id" ref="be"/>
+            <field model="res.country" name="country_id" ref="us"/>
             <!-- Company ID will be set later -->
             <field name="company_id" eval="None"/>
         </record>
@@ -1038,19 +1038,14 @@
 
         <!-- Basic Company  -->
         <record id="main_company" model="res.company">
-            <field name="name">OpenERP S.A.</field>
+            <field name="name">Company Name</field>
             <field name="partner_id" ref="main_partner"/>
-            <field name="rml_header1">Free Business Solutions</field>
-            <field name="rml_footer1">Web: http://www.openerp.com - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
-            <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
+            <field name="rml_header1">Company business slogan</field>
+            <field name="rml_footer1">Web: www.companyname.com - Tel: +1-212-555-12345</field>
+            <field name="rml_footer2">IBAN: XX12 3456 7890 1234 5678 - SWIFT: SWIFTCODE - VAT: Company vat number</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 
-        <assert id="main_company" model="res.company">
-            <test expr="currency_id.name == 'eur'.upper()"/>
-            <test expr="name">OpenERP S.A.</test>
-        </assert>
-
         <record model="res.users" id="base.user_root">
             <field name="signature">Administrator</field>
             <field name="company_id" ref="main_company"/>