diff --git a/__tryton__.py b/__tryton__.py
index b3711ddd0b..31a35205bf 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'depends': [
         'ir',
         'workflow',
-        'partner',
+        'relationship',
         'product',
         'company',
         'currency',
diff --git a/location.py b/location.py
index 2f66f71479..f7fadfded4 100644
--- a/location.py
+++ b/location.py
@@ -17,7 +17,7 @@ class Location(OSV):
     name = fields.Char("Name", size=None, required=True, states=STATES)
     code = fields.Char("Code", size=None, states=STATES, select=1)
     active = fields.Boolean('Active', select=1)
-    address = fields.Many2One("partner.address", "Address",
+    address = fields.Many2One("relationship.address", "Address",
             states=STATES_WH)
     type = fields.Selection([
         ('supplier', 'Supplier'),
@@ -114,19 +114,19 @@ class Location(OSV):
 Location()
 
 
-class Partner(OSV):
-    _name = 'partner.partner'
+class Party(OSV):
+    _name = 'relationship.party'
     supplier_location = fields.Property(type='many2one',
             relation='stock.location', string='Supplier Location',
             group_name='Stock Properties', view_load=True,
             domain=[('type', '=', 'supplier')],
             help='The default source location ' \
-                    'when receiving products from the partner.')
+                    'when receiving products from the party.')
     customer_location = fields.Property(type='many2one',
             relation='stock.location', string='Customer Location',
             group_name='Stock Properties', view_load=True,
             domain=[('type', '=', 'customer')],
             help='The default destination location ' \
-                    'when sending products to the partner.')
+                    'when sending products to the party.')
 
-Partner()
+Party()
diff --git a/location.xml b/location.xml
index f3d27afaa5..862485df1c 100644
--- a/location.xml
+++ b/location.xml
@@ -179,14 +179,14 @@
         <record model="ir.property" id="property_supplier_location">
             <field name="name">supplier_location</field>
             <field name="field"
-                   search="[('model.model', '=', 'partner.partner'),
+                   search="[('model.model', '=', 'relationship.party'),
                            ('name', '=', 'supplier_location')]"/>
             <field name="value" eval="'stock.location,' + str(ref('location_supplier'))"/>
         </record>
         <record model="ir.property" id="property_customer_location">
             <field name="name">customer_location</field>
             <field name="field"
-                   search="[('model.model', '=', 'partner.partner'),
+                   search="[('model.model', '=', 'relationship.party'),
                            ('name', '=', 'customer_location')]"/>
             <field name="value" eval="'stock.location,' + str(ref('location_customer'))"/>
         </record>
diff --git a/packing.py b/packing.py
index 8045f76348..3fa5cb4af9 100644
--- a/packing.py
+++ b/packing.py
@@ -19,13 +19,14 @@ class PackingIn(OSV):
 
     effective_date =fields.DateTime('Effective Date', readonly=True)
     planned_date = fields.DateTime('Planned Date', readonly=True)
-    supplier = fields.Many2One(
-        'partner.partner', 'Supplier',
-        states={'readonly': "state != 'draft'",}, on_change=['supplier',])
-    contact_address = fields.Many2One(
-        'partner.address', 'Contact Address',
-        states={'readonly': "state != 'draft'",},
-        domain="[('partner', '=', supplier)]")
+    supplier = fields.Many2One('relationship.party', 'Supplier',
+            states={
+                'readonly': "state != 'draft'",
+            }, on_change=['supplier'])
+    contact_address = fields.Many2One('relationship.address', 'Contact Address',
+            states={
+                'readonly': "state != 'draft'",
+            }, domain="[('party', '=', supplier)]")
     warehouse = fields.Many2One('stock.location', "Warehouse",
             required=True, states=STATES, domain="[('type', '=', 'warehouse')]")
     incoming_moves = fields.Function('get_incoming_moves', type='one2many',
@@ -65,8 +66,8 @@ class PackingIn(OSV):
     def on_change_supplier(self, cursor, user, ids, values, context=None):
         if not values.get('supplier'):
             return {}
-        partner_obj = self.pool.get("partner.partner")
-        address_id = partner_obj.address_get(cursor, user, values['supplier'],
+        party_obj = self.pool.get("relationship.party")
+        address_id = party_obj.address_get(cursor, user, values['supplier'],
                                           context=context)
         return {'contact_address': address_id}
 
@@ -242,22 +243,27 @@ class PackingOut(OSV):
     _description = __doc__
     _rec_name = 'code'
 
-    effective_date =fields.DateTime(
-        'Effective Date', readonly=True,
-        states={'readonly': "state != 'draft'",},)
-    planned_date = fields.DateTime(
-        'Planned Date', readonly=True,
-        states={'readonly': "state != 'draft'",},)
-    customer = fields.Many2One(
-        'partner.partner', 'Customer', required=True,
-        states={'readonly': "state != 'draft'",}, on_change=['customer',])
-    delivery_address = fields.Many2One(
-        'partner.address', 'Delivery Address', required=True,
-        states={'readonly': "state != 'draft'",},
-        domain="[('partner', '=', customer)]")
-    reference = fields.Char(
-        "Reference", size=None, select=1,
-        states={'readonly': "state != 'draft'",},)
+    effective_date =fields.DateTime('Effective Date', readonly=True,
+            states={
+                'readonly': "state != 'draft'",
+            })
+    planned_date = fields.DateTime('Planned Date', readonly=True,
+            states={
+                'readonly': "state != 'draft'",
+            })
+    customer = fields.Many2One('relationship.party', 'Customer', required=True,
+            states={
+                'readonly': "state != 'draft'",
+            }, on_change=['customer'])
+    delivery_address = fields.Many2One('relationship.address',
+            'Delivery Address', required=True,
+            states={
+                'readonly': "state != 'draft'",
+            }, domain="[('party', '=', customer)]")
+    reference = fields.Char("Reference", size=None, select=1,
+            states={
+                'readonly': "state != 'draft'",
+            })
     warehouse = fields.Many2One('stock.location', "Warehouse", required=True,
             states={
                 'readonly': "state != 'draft'",
@@ -305,12 +311,14 @@ class PackingOut(OSV):
     def on_change_customer(self, cursor, user, ids, values, context=None):
         if not values.get('customer'):
             return {}
-        partner_obj = self.pool.get("partner.partner")
-        address_id = partner_obj.address_get(cursor, user, values['customer'],
-                                          type='delivery', context=context)
-        partner = partner_obj.browse(cursor, user, values['customer'], context=context)
-        return  {'delivery_address': address_id,
-                 'customer_location': partner.customer_location.id}
+        party_obj = self.pool.get("relationship.party")
+        address_id = party_obj.address_get(cursor, user, values['customer'],
+                type='delivery', context=context)
+        party = party_obj.browse(cursor, user, values['customer'], context=context)
+        return {
+                'delivery_address': address_id,
+                'customer_location': party.customer_location.id,
+            }
 
     def get_outgoing_moves(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -615,7 +623,7 @@ PackingOut()
 
 
 class Address(OSV):
-    _name = 'partner.address'
+    _name = 'relationship.address'
     delivery = fields.Boolean('Delivery')
 
 Address()
diff --git a/packing.xml b/packing.xml
index 767642143c..4f1235094f 100644
--- a/packing.xml
+++ b/packing.xml
@@ -532,8 +532,8 @@
 
 
         <record model="ir.ui.view" id="address_view_tree">
-            <field name="model">partner.address</field>
-            <field name="inherit" ref="partner.address_view_tree"/>
+            <field name="model">relationship.address</field>
+            <field name="inherit" ref="relationship.address_view_tree"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <data>
@@ -546,8 +546,8 @@
             </field>
         </record>
         <record model="ir.ui.view" id="address_view_form">
-            <field name="model">partner.address</field>
-            <field name="inherit" ref="partner.address_view_form"/>
+            <field name="model">relationship.address</field>
+            <field name="inherit" ref="relationship.address_view_form"/>
             <field name="arch" type="xml">
                 <![CDATA[
                 <data>