diff --git a/partner_firstname/README.rst b/partner_firstname/README.rst
index 224535347..339c07d95 100644
--- a/partner_firstname/README.rst
+++ b/partner_firstname/README.rst
@@ -47,7 +47,7 @@ supply the *last name* and *first name* (just once per contact).
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/134/8.0
+   :target: https://runbot.odoo-community.org/runbot/134/9.0
 
 For further information, please visit:
 
@@ -68,8 +68,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues
 <https://github.com/OCA/partner-contact/issues>`_. In case of trouble, please
 check there if your issue has already been reported. If you spotted it first,
-help us smashing it by providing a detailed and welcomed feedback `here
-<https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_firstname%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+help us smashing it by providing a detailed and welcomed feedback.
 
 Credits
 =======
@@ -93,6 +92,7 @@ Contributors
 * Ronald Portier <ronald@therp.nl>
 * Sylvain Van Hoof
 * Pedro Baeza <pedro.baeza@serviciosbaeza.com>
+* Dave Lasley <dave@laslabs.com>
 
 Translations
 ------------
diff --git a/partner_firstname/__openerp__.py b/partner_firstname/__openerp__.py
index 199a109c4..fa4b3baf0 100644
--- a/partner_firstname/__openerp__.py
+++ b/partner_firstname/__openerp__.py
@@ -10,6 +10,7 @@
     'version': '9.0.2.0.0',
     'author': "Camptocamp, "
               "Grupo ESOC Ingeniería de Servicios, "
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
     'license': "AGPL-3",
     'maintainer': 'Camptocamp, Acsone',
diff --git a/partner_firstname/models/exceptions.py b/partner_firstname/exceptions.py
similarity index 100%
rename from partner_firstname/models/exceptions.py
rename to partner_firstname/exceptions.py
diff --git a/partner_firstname/models/__init__.py b/partner_firstname/models/__init__.py
index aa04cb891..05e809bb7 100644
--- a/partner_firstname/models/__init__.py
+++ b/partner_firstname/models/__init__.py
@@ -4,3 +4,4 @@
 
 from . import base_config_settings
 from . import res_partner
+from . import res_users
diff --git a/partner_firstname/models/base_config_settings.py b/partner_firstname/models/base_config_settings.py
index e79b9d5dd..2a226496a 100644
--- a/partner_firstname/models/base_config_settings.py
+++ b/partner_firstname/models/base_config_settings.py
@@ -36,10 +36,14 @@ class BaseConfigSettings(models.TransientModel):
         }
 
     @api.multi
+    @api.depends('partner_names_order')
     def _compute_names_order_changed(self):
         current = self.env['ir.config_parameter'].get_param(
             'partner_names_order', self._partner_names_order_default())
-        return self.partner_names_order != current
+        for record in self:
+            record.partner_names_order_changed = bool(
+                record.partner_names_order != current
+            )
 
     @api.onchange('partner_names_order')
     def _onchange_partner_names_order(self):
diff --git a/partner_firstname/models/res_user.py b/partner_firstname/models/res_users.py
similarity index 100%
rename from partner_firstname/models/res_user.py
rename to partner_firstname/models/res_users.py
diff --git a/partner_firstname/tests/base.py b/partner_firstname/tests/base.py
index d1befbd87..15a2c795d 100644
--- a/partner_firstname/tests/base.py
+++ b/partner_firstname/tests/base.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from openerp.tests.common import TransactionCase
-from ..models import exceptions as ex
+from .. import exceptions as ex
 
 
 class MailInstalled():
diff --git a/partner_firstname/tests/test_empty.py b/partner_firstname/tests/test_empty.py
index b4b51d497..4728ca20c 100644
--- a/partner_firstname/tests/test_empty.py
+++ b/partner_firstname/tests/test_empty.py
@@ -8,7 +8,7 @@ To have more accurate results, remove the ``mail`` module before testing.
 """
 from openerp.tests.common import TransactionCase
 from .base import MailInstalled
-from ..models import exceptions as ex
+from .. import exceptions as ex
 
 
 class CompanyCase(TransactionCase):
diff --git a/partner_firstname/views/base_config_view.xml b/partner_firstname/views/base_config_view.xml
index f78b0a10f..424b5d28f 100644
--- a/partner_firstname/views/base_config_view.xml
+++ b/partner_firstname/views/base_config_view.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- © 2015 Antiun Ingenieria S.L. - Antonio Espinosa
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
-<openerp>
-<data>
+<odoo>
 
 <record id="view_general_configuration" model="ir.ui.view">
     <field name="name">Add partner_names_order config parameter</field>
     <field name="model">base.config.settings</field>
     <field name="inherit_id" ref="base_setup.view_general_configuration"/>
     <field name="arch" type="xml">
-        <xpath expr="//label[@string='Email']/.." position='after'>
+        <xpath expr="//label[@name='email_label']/.." position='after'>
             <group>
                 <label for="partner_names_order" />
                 <div>
@@ -18,7 +17,7 @@
                         <field name="partner_names_order_changed" invisible="1"/>
                         <button name="action_recalculate_partners_name"
                                 string="Recalculate names"
-                                icon="gtk-execute"
+                                icon="fa-play"
                                 type="object"
                                 help="Recalculate names for all partners. This process could take so much time if there are more than 10,000 active partners"
                                 attrs="{'invisible': [('partner_names_order_changed', '=', True)]}"/>
@@ -29,6 +28,4 @@
     </field>
 </record>
 
-
-</data>
-</openerp>
+</odoo>
diff --git a/partner_firstname/views/res_partner.xml b/partner_firstname/views/res_partner.xml
index 7f39c52af..ef2aba990 100644
--- a/partner_firstname/views/res_partner.xml
+++ b/partner_firstname/views/res_partner.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <record id="view_partner_simple_form_firstname" model="ir.ui.view">
     <field name="name">Add firstname and lastname</field>
@@ -88,5 +87,4 @@
   </field>
 </record>
 
-</data>
-</openerp>
+</odoo>
diff --git a/partner_firstname/views/res_user.xml b/partner_firstname/views/res_user.xml
index 269ec3620..c0ad141cb 100644
--- a/partner_firstname/views/res_user.xml
+++ b/partner_firstname/views/res_user.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 <record id="view_users_form" model="ir.ui.view">
     <field name="name">Add firstname and surnames</field>
@@ -25,5 +24,4 @@
   </field>
 </record>
 
-</data>
-</openerp>
+</odoo>