diff --git a/base_title_on_partner/__openerp__.py b/base_title_on_partner/__openerp__.py
index c8bc7a6..fa53a07 100644
--- a/base_title_on_partner/__openerp__.py
+++ b/base_title_on_partner/__openerp__.py
@@ -31,12 +31,12 @@
 Title on Partner
 ================
 
-By default, OpenERP doesn't display the title field on all the partner form views. This module fixes it.
+THIS MODULE HAS BEEN REPLACED BY THE MODULE base_usability.
+
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'depends': ['base'],
     'data': ['partner_view.xml'],
     'installable': True,
-    'active': False,
 }
diff --git a/base_usability/__init__.py b/base_usability/__init__.py
new file mode 100644
index 0000000..1a4d311
--- /dev/null
+++ b/base_usability/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Base Usability module for Odoo
+#    Copyright (C) 2014-2015 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
diff --git a/base_usability/__openerp__.py b/base_usability/__openerp__.py
new file mode 100644
index 0000000..18ba0b2
--- /dev/null
+++ b/base_usability/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Base Usability module for Odoo
+#    Copyright (C) 2014-2015 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Base Usability',
+    'version': '0.1',
+    'category': 'Partner',
+    'license': 'AGPL-3',
+    'summary': 'Better usability in base module',
+    'description': """
+Base Usability
+==============
+
+By default, OpenERP doesn't display the title field on all the partner form views. This module fixes it.
+
+By default, users in the Partner Contact group also have create/write access on Countries and States. This module removes that: only the users in the *Administration > Configuration* group have create/write/delete access on those objects.
+
+This module replaces the module base_title_on_partner.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['base'],
+    'data': [
+        'partner_view.xml',
+        'security/ir.model.access.csv',
+        ],
+    'installable': True,
+}
diff --git a/base_usability/partner_view.xml b/base_usability/partner_view.xml
new file mode 100644
index 0000000..d5417d6
--- /dev/null
+++ b/base_usability/partner_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (C) 2014-2015 Akretion (http://www.akretion.com/)
+   @author: Alexis de Lattre <alexis.delattre@akretion.com>
+   The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="view_partner_form" model="ir.ui.view">
+    <field name="name">base_usability.title.on.partner.form</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//field[@name='child_ids']/form//field[@name='function']" position="before">
+            <field name="title"/>
+        </xpath>
+    </field>
+</record>
+
+<record id="view_partner_simple_form" model="ir.ui.view">
+    <field name="name">base_usability.title.on.partner.simplified.form</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="base.view_partner_simple_form"/>
+    <field name="arch" type="xml">
+        <field name="function" position="before">
+            <field name="title"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>
diff --git a/base_usability/security/ir.model.access.csv b/base_usability/security/ir.model.access.csv
new file mode 100644
index 0000000..48ea11a
--- /dev/null
+++ b/base_usability/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+base.access_res_country_group_user,Full access on res.country to Settings group,base.model_res_country,base.group_system,1,1,1,1
+base.access_res_country_state_group_user,Full access on res.country.state to Settings group,base.model_res_country_state,base.group_system,1,1,1,1
+base.access_res_country_group_group_user,Full access on res.country.group to Settings group,base.model_res_country_group,base.group_system,1,1,1,1