diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index d1f8757a2d1..d9e4997f91b 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -15,7 +15,7 @@
       - account_id: a_sale
         price_unit: 30000.0
         name: Voucher Seagate
-    partner_id: base.res_partner_19
+    partner_id: base.res_partner_2
     date: !eval time.strftime("%Y-%m-%d")
     voucher_type: sale
 -
@@ -51,13 +51,13 @@
 #     import time
 #     vals = {}
 #     journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
-#     res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
+#     res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_2"), journal_id, 0.0, 1, ttype='receipt', date=False)
 #     vals = {
 #         'account_id': ref('account.cash'),
 #         'amount': 30000.0,
 #         'company_id': ref('base.main_company'),
 #         'journal_id': ref('account.bank_journal'),
-#         'partner_id': ref('base.res_partner_19'),
+#         'partner_id': ref('base.res_partner_2'),
 #         'date': time.strftime("%Y-%m-%d"),
 #         'voucher_type': 'receipt',
 #     }
diff --git a/addons/analytic/data/analytic_account_demo.xml b/addons/analytic/data/analytic_account_demo.xml
index 8af53d01d2f..678afaf0dc2 100644
--- a/addons/analytic/data/analytic_account_demo.xml
+++ b/addons/analytic/data/analytic_account_demo.xml
@@ -85,14 +85,14 @@
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_19"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
-            <field name="partner_id" ref="base.res_partner_19"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
         </record>
         <record id="analytic_millennium_industries" model="account.analytic.account">
             <field name="name">Millennium Industries</field>
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 94c5da2a416..de6e802684f 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -81,7 +81,7 @@
         </record>
         
         <record id="crm_claim_7" model="crm.claim">
-            <field name="partner_id" ref="base.res_partner_19"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
             <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Documents unclear&quot;" name="name"/>
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
index d2c7864dbd6..2a4ae71d1bd 100644
--- a/addons/crm_partner_assign/res_partner_demo.xml
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -84,7 +84,7 @@
         <record model="res.partner" id="base.res_partner_3">
             <field name="assigned_partner_id" eval="ref('base.res_partner_3')"/>
         </record>
-        <record model="res.partner" id="base.res_partner_19">
+        <record model="res.partner" id="base.res_partner_2">
             <field name="assigned_partner_id" eval="ref('base.res_partner_22')"/>
         </record>
         <record model="res.partner" id="base.res_partner_4">
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index e3bd689fd7b..f69032eb90f 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -60,7 +60,7 @@
         <record id="base.res_partner_18" model="res.partner">
             <field name="notify_email">none</field>
         </record>
-        <record id="base.res_partner_19" model="res.partner">
+        <record id="base.res_partner_2" model="res.partner">
             <field name="notify_email">none</field>
         </record>
         <record id="base.res_partner_20" model="res.partner">
diff --git a/addons/membership/membership_demo.yml b/addons/membership/membership_demo.yml
index 0ff20f25425..dd27919c430 100644
--- a/addons/membership/membership_demo.yml
+++ b/addons/membership/membership_demo.yml
@@ -11,7 +11,7 @@
 
     if self.pool.get('account.invoice')._default_currency(cr, uid):
         import time
-        invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_4"),ref("base.res_partner_24"),ref("base.res_partner_19"),ref("base.res_partner_12"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_1"),ref("base.res_partner_1"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00})
+        invoice_ids = self.create_membership_invoice(cr, uid, [ref("base.res_partner_1"),ref("base.res_partner_4"),ref("base.res_partner_24"),ref("base.res_partner_2"),ref("base.res_partner_12"),ref("base.res_partner_3"),ref("base.res_partner_21"),ref("base.res_partner_1"),ref("base.res_partner_1"),ref("base.res_partner_10")], product_id=ref("membership_1"), datas={"amount":80.00})
         invoice_pool = self.pool.get('account.invoice')
         invoice_pool.signal_workflow(cr, uid, invoice_ids, 'invoice_open')
 
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index a83457322ee..b8665d59147 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -20,7 +20,7 @@
         <record id='base.res_partner_1' model='res.partner'> <field name='barcode'>0421600000007</field> </record>
         <record id='base.res_partner_12' model='res.partner'> <field name='barcode'>0421700000006</field> </record>
         <record id='base.res_partner_18' model='res.partner'> <field name='barcode'>0421800000005</field> </record>
-        <record id='base.res_partner_19' model='res.partner'> <field name='barcode'>0421900000004</field> </record>
+        <record id='base.res_partner_2' model='res.partner'> <field name='barcode'>0421900000004</field> </record>
         <record id='base.res_partner_20' model='res.partner'> <field name='barcode'>0422000000000</field> </record>
         <record id='base.res_partner_21' model='res.partner'> <field name='barcode'>0422100000009</field> </record>
 
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index f916ea529c8..2e05b3a6c9e 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -958,7 +958,7 @@ QWERTY keyboard</field>
 
         <record id="product_supplierinfo_14" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_17_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
@@ -993,21 +993,21 @@ QWERTY keyboard</field>
 
         <record id="product_supplierinfo_19" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_22_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_20" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_23_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
 
         <record id="product_supplierinfo_21" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_24_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">3</field>
             <field name="min_qty">1</field>
         </record>
@@ -1028,7 +1028,7 @@ QWERTY keyboard</field>
 
         <record id="product_supplierinfo_24" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_28_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
@@ -1126,7 +1126,7 @@ QWERTY keyboard</field>
 
         <record id="product_supplierinfo_39" model="product.supplierinfo">
             <field name="product_tmpl_id" ref="product_product_18_product_template"/>
-            <field name="name" ref="base.res_partner_19"/>
+            <field name="name" ref="base.res_partner_2"/>
             <field name="delay">4</field>
             <field name="min_qty">1</field>
         </record>
diff --git a/addons/purchase/purchase_order_demo.yml b/addons/purchase/purchase_order_demo.yml
index a254241213a..f20cc0b113d 100644
--- a/addons/purchase/purchase_order_demo.yml
+++ b/addons/purchase/purchase_order_demo.yml
@@ -51,7 +51,7 @@
 
 -
   !record {model: purchase.order, id: purchase_order_5}:
-    partner_id: base.res_partner_19
+    partner_id: base.res_partner_2
     order_line:
       - product_id: product.product_product_22
         product_qty: 3
diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml
index 161b45c7e2a..5199fc6165d 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -301,7 +301,7 @@
         <field name="event_id" ref="event.event_0"/>
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 5:30:00')"></field>
         <field name="duration" eval="0.25"/>
-        <field eval="[(4, ref('base.res_partner_19'))]" name="speaker_ids"/>
+        <field eval="[(4, ref('base.res_partner_2'))]" name="speaker_ids"/>
         <field name="state">published</field>
         <field name="color">6</field>
     </record>
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index 850533d5189..50b1bc4fe11 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -170,22 +170,6 @@
             <field name="image" type="base64" file="base/static/img/res_partner_18-image.png"/>
         </record>
 
-        <record id="res_partner_19" model="res.partner">
-            <field name="name">Seagate</field>
-            <field eval="[(6, 0, [ref('res_partner_category_14'), ref('res_partner_category_15')])]" name="category_id"/>
-            <field eval="0" name="customer"/>
-            <field eval="1" name="supplier"/>
-            <field name="is_company">1</field>
-            <field name="city">Cupertino</field>
-            <field name="zip">95014</field>
-            <field name="country_id" ref="base.us"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
-            <field name="street">10200 S. De Anza Blvd</field>
-            <field name="email">seagate@yourcompany.example.com</field>
-            <field name="phone">+1 800 732 4283</field>
-            <field name="image" type="base64" file="base/static/img/res_partner_19-image.jpg"/>
-        </record>
-
 <!--        To be removed as its acquired by Seagate-->
         <record id="res_partner_20" model="res.partner">
             <field name="name">Maxtor</field>
@@ -193,7 +177,7 @@
             <field eval="0" name="customer"/>
             <field eval="1" name="supplier"/>
             <field eval="0" name="active"/>
-            <field name="parent_id" ref="res_partner_19"/>
+            <field name="parent_id" ref="res_partner_2"/>
             <field name="is_company">1</field>
         </record>
 
@@ -330,7 +314,7 @@
         </record>
         <record id="res_partner_address_31" model="res.partner">
             <field name="name">Edward Foster</field>
-            <field name="parent_id" eval="ref('res_partner_19')"/>
+            <field name="parent_id" eval="ref('res_partner_2')"/>
             <field name="function">Sales Representative</field>
             <field name="email">efoster@seagate.com</field>
             <field name="supplier">1</field>