diff --git a/partner_firstname/views/base_config_view.xml b/partner_firstname/views/base_config_view.xml
index 488328e37..1507c8cdb 100644
--- a/partner_firstname/views/base_config_view.xml
+++ b/partner_firstname/views/base_config_view.xml
@@ -1,34 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
-
-     <record id="res_config_settings_view_form" model="ir.ui.view">
+    <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="name">Add partner_names_order config parameter</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id"
-               ref="base_setup.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='companies']" position='after'>
                 <h2>Partner Names Order</h2>
-                <div class="row mt16 o_settings_container"
-                     name="partner_names_order">
+                <div class="row mt16 o_settings_container" name="partner_names_order">
                     <div class="col-xs-12 col-md-6 o_setting_box">
                         <div class="o_setting_right_pane">
-                            <field name="partner_names_order"/>
-                            <field name="partner_names_order_changed"
-                                   invisible="1"/>
-                            <button name="action_recalculate_partners_name"
-                                    string="Recalculate names"
-                                    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', '=', False)]}"/>
+                            <field name="partner_names_order" />
+                            <field name="partner_names_order_changed" invisible="1" />
+                            <button
+                                name="action_recalculate_partners_name"
+                                string="Recalculate names"
+                                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', '=', False)]}"
+                            />
                         </div>
                     </div>
                 </div>
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/partner_firstname/views/res_partner.xml b/partner_firstname/views/res_partner.xml
index 3b9e6b243..f49b3302a 100644
--- a/partner_firstname/views/res_partner.xml
+++ b/partner_firstname/views/res_partner.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_partner_simple_form_firstname" model="ir.ui.view">
         <field name="name">Add firstname and lastname</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_simple_form"/>
+        <field name="inherit_id" ref="base.view_partner_simple_form" />
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='name']" position="attributes">
@@ -12,27 +12,29 @@
                         'required': [('is_company', '=', True)]
                         }</attribute>
                 </xpath>
-
                 <xpath expr="//h1//field[@name='name']/.." position="before">
                     <group attrs="{'invisible': [('is_company', '=', True)]}">
-                        <field name="lastname" attrs=
-                            "{'required': [('firstname', '=', False),
+                        <field
+                            name="lastname"
+                            attrs="{'required': [('firstname', '=', False),
                             ('is_company', '=', False),
-                            ('type', '=', 'contact')]}"/>
-                        <field name="firstname" attrs=
-                            "{'required': [('lastname', '=', False),
+                            ('type', '=', 'contact')]}"
+                        />
+                        <field
+                            name="firstname"
+                            attrs="{'required': [('lastname', '=', False),
                             ('is_company', '=', False),
-                            ('type', '=', 'contact')]}"/>
+                            ('type', '=', 'contact')]}"
+                        />
                     </group>
                 </xpath>
             </data>
         </field>
     </record>
-
     <record id="view_partner_form_firstname" model="ir.ui.view">
         <field name="name">Add firstname and surnames</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='name']" position="attributes">
@@ -41,44 +43,53 @@
                         'required': [('is_company', '=', True)]
                         }</attribute>
                 </xpath>
-
                 <xpath expr="//h1//field[@name='name']/.." position="after">
                     <div class="oe_edit_only">
                         <group attrs="{'invisible': [('is_company', '=', True)]}">
-                            <field name="lastname" attrs=
-                                "{'required': [('firstname', '=', False),
+                            <field
+                                name="lastname"
+                                attrs="{'required': [('firstname', '=', False),
                                 ('is_company', '=', False),
-                                ('type', '=', 'contact')]}"/>
-                            <field name="firstname" attrs=
-                                "{'required': [('lastname', '=', False),
+                                ('type', '=', 'contact')]}"
+                            />
+                            <field
+                                name="firstname"
+                                attrs="{'required': [('lastname', '=', False),
                                 ('is_company', '=', False),
-                                ('type', '=', 'contact')]}"/>
+                                ('type', '=', 'contact')]}"
+                            />
                         </group>
                     </div>
                 </xpath>
-
                 <!-- Modify inner contact form of child_ids -->
-                <xpath expr="//field[@name='child_ids']/form//field[@name='name']"
-                    position="attributes">
+                <xpath
+                    expr="//field[@name='child_ids']/form//field[@name='name']"
+                    position="attributes"
+                >
                     <attribute name="attrs">{
                         'readonly': [('is_company', '=', False)],
                         'required': [('is_company', '=', True)]
                         }</attribute>
                 </xpath>
-
-                <xpath expr="//field[@name='child_ids']/form//field[@name='name']"
-                    position="after">
+                <xpath
+                    expr="//field[@name='child_ids']/form//field[@name='name']"
+                    position="after"
+                >
                     <div class="oe_edit_only" colspan="2">
-                        <field name="is_company" invisible="True"/>
+                        <field name="is_company" invisible="True" />
                         <group attrs="{'invisible': [('is_company', '=', True)]}">
-                            <field name="lastname" attrs=
-                                "{'required': [('firstname', '=', False),
+                            <field
+                                name="lastname"
+                                attrs="{'required': [('firstname', '=', False),
                                 ('is_company', '=', False),
-                                ('type', '=', 'contact')]}"/>
-                            <field name="firstname" attrs=
-                                "{'required': [('lastname', '=', False),
+                                ('type', '=', 'contact')]}"
+                            />
+                            <field
+                                name="firstname"
+                                attrs="{'required': [('lastname', '=', False),
                                 ('is_company', '=', False),
-                                ('type', '=', 'contact')]}"/>
+                                ('type', '=', 'contact')]}"
+                            />
                         </group>
                     </div>
                 </xpath>
diff --git a/partner_firstname/views/res_user.xml b/partner_firstname/views/res_user.xml
index 190f26224..3b692c5be 100644
--- a/partner_firstname/views/res_user.xml
+++ b/partner_firstname/views/res_user.xml
@@ -1,22 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_users_form" model="ir.ui.view">
         <field name="name">Add firstname and surnames</field>
         <field name="model">res.users</field>
-        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='name']" position="attributes">
                     <attribute name="readonly">True</attribute>
                     <attribute name="required">False</attribute>
                 </xpath>
-
                 <xpath expr="//field[@name='email']" position="after">
                     <group>
-                        <field name="lastname"
-                            attrs="{'required': [('firstname', '=', False)]}"/>
-                        <field name="firstname"
-                            attrs="{'required': [('lastname', '=', False)]}"/>
+                        <field
+                            name="lastname"
+                            attrs="{'required': [('firstname', '=', False)]}"
+                        />
+                        <field
+                            name="firstname"
+                            attrs="{'required': [('lastname', '=', False)]}"
+                        />
                     </group>
                 </xpath>
             </data>