211 files changed, 711 insertions, 737 deletions

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 5fdefa8ad1a..3d2228d3605 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -56,7 +56,7 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
         'views/report_agedpartnerbalance.xml',
         'views/tax_adjustments.xml',
         'wizard/wizard_tax_adjustments_view.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/web_planner_data.xml',
         'views/account_journal_dashboard_view.xml',
         'views/account_portal_templates.xml',
diff --git a/addons/account/models/__init__.py b/addons/account/models/__init__.py
index 440f89134bf..2e9cc211e15 100644
--- a/addons/account/models/__init__.py
+++ b/addons/account/models/__init__.py
@@ -11,5 +11,5 @@ from . import account_analytic_line
 from . import account_journal_dashboard
 from . import product
 from . import company
-from . import account_config_settings
+from . import res_config_settings
 from . import web_planner
diff --git a/addons/account/models/account_config_settings.py b/addons/account/models/res_config_settings.py
index a46c34bc079..b0b11f47d34 100644
--- a/addons/account/models/account_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models, _
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -65,7 +65,7 @@ class AccountConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(AccountConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         res.update(
             default_purchase_tax_id=int(params.get_param('account.default_purchase_tax_id', default=False)) or False,
@@ -75,7 +75,7 @@ class AccountConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(AccountConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param("account.default_purchase_tax_id", self.default_purchase_tax_id.id)
         self.env['ir.config_parameter'].sudo().set_param("account.default_sale_tax_id", self.default_sale_tax_id.id)
         if self.group_multi_currency:
@@ -152,4 +152,4 @@ class AccountConfigSettings(models.TransientModel):
                 values.pop('currency_id')
             if company.accounts_code_digits == values.get('code_digits'):
                 values.pop('code_digits')
-        return super(AccountConfigSettings, self).create(values)
+        return super(ResConfigSettings, self).create(values)
diff --git a/addons/account/views/account_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 7711246620a..e3cff4bf7d5 100644
--- a/addons/account/views/account_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -9,11 +9,11 @@
             <field name="search_view_id" ref="base.view_module_filter"/>
         </record>
 
-        <record id="account_config_settings_view_form" model="ir.ui.view">
-            <field name="name">account.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.account</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="8"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Accounting" data-key="account_invoicing" groups="account.group_account_manager">
diff --git a/addons/account_analytic_default/__manifest__.py b/addons/account_analytic_default/__manifest__.py
index e41e554f1ea..283e004fd20 100644
--- a/addons/account_analytic_default/__manifest__.py
+++ b/addons/account_analytic_default/__manifest__.py
@@ -24,7 +24,7 @@ Allows to automatically select analytic accounts based on criterions:
         'security/account_analytic_default_security.xml',
         'views/account_analytic_default_view.xml',
         'views/product_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'installable': True,
 }
diff --git a/addons/account_analytic_default/views/account_config_settings_views.xml b/addons/account_analytic_default/views/res_config_settings_views.xml
index 04bcfc42c17..9e204e69686 100644
--- a/addons/account_analytic_default/views/account_config_settings_views.xml
+++ b/addons/account_analytic_default/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_analytic_default" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.analytic.default</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.analytic.default</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='analytic_account_link']" position="after">
                 <div>
diff --git a/addons/account_asset/__manifest__.py b/addons/account_asset/__manifest__.py
index c2c1fcb8934..6f60136fb16 100644
--- a/addons/account_asset/__manifest__.py
+++ b/addons/account_asset/__manifest__.py
@@ -26,7 +26,7 @@ Keeps track of depreciations, and creates corresponding journal entries.
         'views/account_invoice_views.xml',
         'views/account_asset_templates.xml',
         'views/product_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'report/account_asset_report_views.xml',
         'data/account_asset_data.xml',
     ],
diff --git a/addons/account_asset/views/account_config_settings_views.xml b/addons/account_asset/views/res_config_settings_views.xml
index 7d40c4b8666..3b197660be3 100644
--- a/addons/account_asset/views/account_config_settings_views.xml
+++ b/addons/account_asset/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_account_asset" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.asset</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.asset</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_account_asset" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_account_asset', '=', False)]}">
diff --git a/addons/account_budget/__manifest__.py b/addons/account_budget/__manifest__.py
index fd839a6dfd9..b9b7766c65a 100644
--- a/addons/account_budget/__manifest__.py
+++ b/addons/account_budget/__manifest__.py
@@ -34,7 +34,7 @@ Three reports are available:
         'security/account_budget_security.xml',
         'views/account_analytic_account_views.xml',
         'views/account_budget_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': ['data/account_budget_demo.xml'],
 }
diff --git a/addons/account_budget/views/account_config_settings_views.xml b/addons/account_budget/views/res_config_settings_views.xml
index 4bf3eecf837..154fb8de5d0 100644
--- a/addons/account_budget/views/account_config_settings_views.xml
+++ b/addons/account_budget/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_account_budget" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.budget</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.budget</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_account_budget" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_account_budget', '=', False)]}">
diff --git a/addons/auth_ldap/__manifest__.py b/addons/auth_ldap/__manifest__.py
index 39f37e79573..62fa393e24d 100644
--- a/addons/auth_ldap/__manifest__.py
+++ b/addons/auth_ldap/__manifest__.py
@@ -8,7 +8,7 @@
     'data' : [
         'views/ldap_installer_views.xml',
         'security/ir.model.access.csv',
-        'views/auth_ldap_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'external_dependencies' : {
         'python' : ['ldap'],
diff --git a/addons/auth_ldap/models/__init__.py b/addons/auth_ldap/models/__init__.py
index a6e08014aca..9e041b4c84f 100644
--- a/addons/auth_ldap/models/__init__.py
+++ b/addons/auth_ldap/models/__init__.py
@@ -3,4 +3,4 @@
 from . import res_company
 from . import res_company_ldap
 from . import res_users
-from . import auth_ldap_config_settings
\ No newline at end of file
+from . import res_config_settings
\ No newline at end of file
diff --git a/addons/auth_ldap/models/auth_ldap_config_settings.py b/addons/auth_ldap/models/res_config_settings.py
index 6c117f0a9ff..92158e3fa3b 100644
--- a/addons/auth_ldap/models/auth_ldap_config_settings.py
+++ b/addons/auth_ldap/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     ldaps = fields.One2many(related='company_id.ldaps', string="LDAP Parameters")
diff --git a/addons/auth_ldap/views/auth_ldap_config_settings_views.xml b/addons/auth_ldap/views/res_config_settings_views.xml
index 5e41c16e589..a426a755699 100644
--- a/addons/auth_ldap/views/auth_ldap_config_settings_views.xml
+++ b/addons/auth_ldap/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="base_config_settings_view_form_inherit_auth_ldap" model="ir.ui.view">
-        <field name="name">base.config.settings.form.inherit.auth.ldap</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.auth.ldap</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name='auth_ldap_right_pane' position="inside">
                 <div attrs="{'invisible': [('module_auth_ldap','=',False)]}">
diff --git a/addons/auth_oauth/__manifest__.py b/addons/auth_oauth/__manifest__.py
index d6ab043d07e..c78134cb078 100644
--- a/addons/auth_oauth/__manifest__.py
+++ b/addons/auth_oauth/__manifest__.py
@@ -15,7 +15,7 @@ Allow users to login through OAuth2 Provider.
         'data/auth_oauth_data.yml',
         'views/auth_oauth_views.xml',
         'views/res_users_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/auth_oauth_templates.xml',
         'security/ir.model.access.csv',
     ],
diff --git a/addons/auth_oauth/models/__init__.py b/addons/auth_oauth/models/__init__.py
index 9b02f6dc910..381d9c868b6 100644
--- a/addons/auth_oauth/models/__init__.py
+++ b/addons/auth_oauth/models/__init__.py
@@ -2,6 +2,6 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import auth_oauth
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_config_parameter
 from . import res_users
diff --git a/addons/auth_oauth/models/base_config_settings.py b/addons/auth_oauth/models/res_config_settings.py
index a7fe6a1b8ec..43de10ebbd6 100644
--- a/addons/auth_oauth/models/base_config_settings.py
+++ b/addons/auth_oauth/models/res_config_settings.py
@@ -8,7 +8,7 @@ from odoo import api, fields, models
 _logger = logging.getLogger(__name__)
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     @api.model
@@ -21,7 +21,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         google_provider = self.env.ref('auth_oauth.provider_google', False)
         res.update(
             auth_oauth_google_enabled=google_provider.enabled,
@@ -31,7 +31,7 @@ class BaseConfigSettings(models.TransientModel):
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         google_provider = self.env.ref('auth_oauth.provider_google', False)
         google_provider.write({
             'enabled': self.auth_oauth_google_enabled,
diff --git a/addons/auth_oauth/views/base_config_settings_views.xml b/addons/auth_oauth/views/res_config_settings_views.xml
index 3403904e95c..4a86ff110a5 100644
--- a/addons/auth_oauth/views/base_config_settings_views.xml
+++ b/addons/auth_oauth/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form_inherit_auth_oauth" model="ir.ui.view">
-            <field name="name">base.config.settings.form.inherit.oauth</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.auth.oauth</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_auth_oauth" position="replace">
                     <div class="content-group" attrs="{'invisible': [('module_auth_oauth','=',False)]}">
diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index d2cd094be1a..4aa4ef77662 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/addons/auth_signup/__manifest__.py
@@ -17,7 +17,7 @@ Allow users to sign up and reset their password
     ],
     'data': [
         'data/auth_signup_data.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/auth_signup_login_templates.xml',
     ],
diff --git a/addons/auth_signup/models/__init__.py b/addons/auth_signup/models/__init__.py
index adabfd68fb3..44dc1ee6b11 100644
--- a/addons/auth_signup/models/__init__.py
+++ b/addons/auth_signup/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_http
 from . import res_partner
 from . import res_users
diff --git a/addons/auth_signup/models/base_config_settings.py b/addons/auth_signup/models/res_config_settings.py
index 024afd09c48..d4c31ffe124 100644
--- a/addons/auth_signup/models/base_config_settings.py
+++ b/addons/auth_signup/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     auth_signup_reset_password = fields.Boolean(string='Enable password reset from Login page')
@@ -16,7 +16,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         get_param = self.env['ir.config_parameter'].sudo().get_param
         # the value of the parameter is a nonempty string
         res.update(
@@ -28,7 +28,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].sudo().set_param
         # we store the repr of the values, since the value of the parameter is a required string
         set_param('auth_signup.reset_password', repr(self.auth_signup_reset_password))
diff --git a/addons/auth_signup/views/base_config_settings_views.xml b/addons/auth_signup/views/res_config_settings_views.xml
index 0aa5451f005..bcabc3665ee 100644
--- a/addons/auth_signup/views/base_config_settings_views.xml
+++ b/addons/auth_signup/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-        <record id="base_config_settings_view_form_inherit_auth_signup" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.auth.signup</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.auth.signup</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_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='access_rights']" position="after">
                     <div class="col-xs-12 col-md-6 o_setting_box" title="If unchecked, only invited users may sign up.">
diff --git a/addons/base_gengo/__manifest__.py b/addons/base_gengo/__manifest__.py
index 688be3ecaff..55e2355511f 100644
--- a/addons/base_gengo/__manifest__.py
+++ b/addons/base_gengo/__manifest__.py
@@ -18,7 +18,7 @@ This wizard will activate the CRON job and the Scheduler and will start the auto
     'data': [
         'data/ir_cron_data.xml',
         'views/ir_translation_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'wizard/base_gengo_translations_view.xml',
     ],
     'demo': ['data/res_company_demo.xml'],
diff --git a/addons/base_gengo/models/__init__.py b/addons/base_gengo/models/__init__.py
index a3afdeaac10..e769b80327c 100644
--- a/addons/base_gengo/models/__init__.py
+++ b/addons/base_gengo/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import ir_translation
 from . import res_company
diff --git a/addons/base_gengo/models/base_config_settings.py b/addons/base_gengo/models/res_config_settings.py
index 73349a79889..e7e258275ab 100644
--- a/addons/base_gengo/models/base_config_settings.py
+++ b/addons/base_gengo/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, models, fields
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     gengo_private_key = fields.Text(string="Gengo Private Key", related="company_id.gengo_private_key")
diff --git a/addons/base_gengo/views/base_config_settings_views.xml b/addons/base_gengo/views/res_config_settings_views.xml
index 5ae9a1816e2..5db3fb33dc7 100644
--- a/addons/base_gengo/views/base_config_settings_views.xml
+++ b/addons/base_gengo/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="view_general_configuration_form_inherit_base_gengo" model="ir.ui.view">
-        <field name="name">base.config.settings.form.inherit.base.gengo</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.base.gengo</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='base_gengo_right_pane']" position="inside">
                 <div name="base_gengo_right_pane" position="replace">
diff --git a/addons/base_setup/__manifest__.py b/addons/base_setup/__manifest__.py
index b6b900ad03a..cbd4a0d5323 100644
--- a/addons/base_setup/__manifest__.py
+++ b/addons/base_setup/__manifest__.py
@@ -13,7 +13,7 @@ Shows you a list of applications features to install from.
     """,
     'depends': ['base', 'web'],
     'data': [
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
     ],
     'demo': [],
diff --git a/addons/base_setup/models/__init__.py b/addons/base_setup/models/__init__.py
index d43ed2fd84b..9fdfb603d9f 100644
--- a/addons/base_setup/models/__init__.py
+++ b/addons/base_setup/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 
diff --git a/addons/base_setup/models/base_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 4fd0ecaac09..0d7fad47d5d 100644
--- a/addons/base_setup/models/base_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models, _
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
 
     _inherit = 'res.config.settings'
 
@@ -37,7 +37,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         default_external_email_server = params.get_param('base_setup.default_external_email_server', default=False)
         default_user_rights = params.get_param('base_setup.default_user_rights', default=False)
@@ -52,7 +52,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_external_email_server", self.default_external_email_server)
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_user_rights", self.default_user_rights)
         self.env['ir.config_parameter'].sudo().set_param("base_setup.default_custom_report_footer", self.default_custom_report_footer)
diff --git a/addons/base_setup/views/base_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 0248fbd4db8..964bcda75cf 100644
--- a/addons/base_setup/views/base_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form" model="ir.ui.view">
-            <field name="name">base.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.base.setup</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="25"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="General Settings" data-key="general_settings">
diff --git a/addons/base_vat/__manifest__.py b/addons/base_vat/__manifest__.py
index 858ebecac2b..dbf8220c320 100644
--- a/addons/base_vat/__manifest__.py
+++ b/addons/base_vat/__manifest__.py
@@ -39,6 +39,6 @@ only the country code will be validated.
     'data': [
         'views/res_partner_views.xml',
         'views/res_company_views.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
 }
diff --git a/addons/base_vat/models/__init__.py b/addons/base_vat/models/__init__.py
index ec161810deb..d245a5606ad 100644
--- a/addons/base_vat/models/__init__.py
+++ b/addons/base_vat/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import account_config_settings
+from . import res_config_settings
 from . import res_company
 from . import res_partner
diff --git a/addons/base_vat/models/account_config_settings.py b/addons/base_vat/models/res_config_settings.py
index 8d71d0b6cb5..0bcb8445cee 100644
--- a/addons/base_vat/models/account_config_settings.py
+++ b/addons/base_vat/models/res_config_settings.py
@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     vat_check_vies = fields.Boolean(related='company_id.vat_check_vies',
diff --git a/addons/base_vat/views/account_config_settings_views.xml b/addons/base_vat/views/res_config_settings_views.xml
index 891b589658c..e82be83c5a4 100644
--- a/addons/base_vat/views/account_config_settings_views.xml
+++ b/addons/base_vat/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form_inherit_base_vat" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.base.vat</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.base.vat</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="eu_service" position="after">
                 <div class="col-xs-12 col-md-6 o_setting_box" title="If this checkbox is ticked, you will not be able to save a contact if its VAT number cannot be verified by the European VIES service.">
diff --git a/addons/crm/__manifest__.py b/addons/crm/__manifest__.py
index f220b47217f..a2e8745475a 100644
--- a/addons/crm/__manifest__.py
+++ b/addons/crm/__manifest__.py
@@ -37,7 +37,7 @@
         'wizard/base_partner_merge_views.xml',
 
         'views/crm_templates.xml',
-        'views/crm_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/crm_views.xml',
         'views/crm_stage_views.xml',
         'views/crm_lead_views.xml',
diff --git a/addons/crm/models/__init__.py b/addons/crm/models/__init__.py
index 2bb745b5bee..e2de5c4c715 100644
--- a/addons/crm/models/__init__.py
+++ b/addons/crm/models/__init__.py
@@ -6,6 +6,6 @@ from . import calendar
 from . import crm_lead
 from . import crm_stage
 from . import crm_team
-from . import crm_config_settings
+from . import res_config_settings
 from . import res_partner
 from . import web_planner
diff --git a/addons/crm/models/crm_config_settings.py b/addons/crm/models/res_config_settings.py
index 7125a580d76..77fb103328c 100644
--- a/addons/crm/models/crm_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class CrmConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -41,7 +41,7 @@ class CrmConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(CrmConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         alias = self._find_default_lead_alias_id()
         res.update(
             alias_prefix=alias.alias_name if alias else False,
@@ -51,7 +51,7 @@ class CrmConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(CrmConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('crm.generate_lead_from_alias', self.generate_lead_from_alias)
         alias = self._find_default_lead_alias_id()
         if alias:
diff --git a/addons/crm/views/crm_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index b43d00e6984..deecc9df2e6 100644
--- a/addons/crm/views/crm_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="crm_config_settings_view_form" model="ir.ui.view">
-        <field name="name">crm.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.crm</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="2"/>
-        <field name="inherit_id" ref="base.res_config_setting_form" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="CRM" data-key="crm" groups="sales_team.group_sale_manager">
@@ -101,7 +101,7 @@
         <field name="name">Configure CRM</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.config.settings</field>
-        <field name="view_id" ref="crm_config_settings_view_form"/>
+        <field name="view_id" ref="res_config_settings_view_form"/>
         <field name="view_mode">form</field>
         <field name="target">inline</field>
         <field name="context">{'module' : 'crm'}</field>
diff --git a/addons/crm_phone_validation/__manifest__.py b/addons/crm_phone_validation/__manifest__.py
index 1498d1d2f05..7c729bfae3e 100644
--- a/addons/crm_phone_validation/__manifest__.py
+++ b/addons/crm_phone_validation/__manifest__.py
@@ -12,7 +12,7 @@ CRM Phone Numbers Validation
 
 This module allows for validate and format phone numbers for leads and contacts.""",
     'data': [
-        'views/crm_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'depends': [
         'phone_validation',
diff --git a/addons/crm_phone_validation/models/__init__.py b/addons/crm_phone_validation/models/__init__.py
index 07108e91a8c..01986291dfc 100644
--- a/addons/crm_phone_validation/models/__init__.py
+++ b/addons/crm_phone_validation/models/__init__.py
@@ -3,4 +3,4 @@
 
 from . import res_partner
 from . import crm_lead
-from . import crm_config_settings
+from . import res_config_settings
diff --git a/addons/crm_phone_validation/models/crm_config_settings.py b/addons/crm_phone_validation/models/res_config_settings.py
index 6adcdf4ee55..1ec56636935 100644
--- a/addons/crm_phone_validation/models/crm_config_settings.py
+++ b/addons/crm_phone_validation/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class CrmConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     crm_phone_valid_method = fields.Selection(related="company_id.phone_international_format", required=True)
diff --git a/addons/crm_phone_validation/views/crm_config_settings_views.xml b/addons/crm_phone_validation/views/res_config_settings_views.xml
index aaac9059a32..e871abc1dd6 100644
--- a/addons/crm_phone_validation/views/crm_config_settings_views.xml
+++ b/addons/crm_phone_validation/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="crm_config_settings_view_form_inherit_phone_validatation" model="ir.ui.view">
-        <field name="name">crm.config.settings.view.form.inherit.phone.validatation</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.crm.phone.validation</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="crm.crm_config_settings_view_form" />
+        <field name="inherit_id" ref="crm.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='module_crm_phone_validation']" position="after">
                 <div class="content-group">
diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py
index cb276e1c246..eea24fbd297 100644
--- a/addons/delivery/__manifest__.py
+++ b/addons/delivery/__manifest__.py
@@ -25,7 +25,7 @@ invoices from picking, the system is able to add and compute the shipping line.
         'data/mail_template_data.xml',
         'views/report_shipping.xml',
         'views/report_deliveryslip.xml',
-        'views/sale_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'wizard/choose_delivery_package_views.xml',
     ],
     'demo': ['data/delivery_demo.xml'],
diff --git a/addons/delivery/views/sale_config_settings_views.xml b/addons/delivery/views/res_config_settings_views.xml
index c274c8ddf2c..fa951a8e976 100644
--- a/addons/delivery/views/sale_config_settings_views.xml
+++ b/addons/delivery/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="sale_config_settings_view_form_inherit_delivery" model="ir.ui.view">
-        <field name="name">sale.config.settings.inherit.delivery</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.delivery</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="sale.sale_config_settings_view_form"/>
+        <field name="inherit_id" ref="sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='delivery_carrier']" position="after">
                 <div class="content-group">
diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index 651f1a88430..e9f22c0f53d 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -27,7 +27,7 @@ Key Features
         'report/event_event_reports.xml',
         'data/email_template_data.xml',
         'data/event_data.xml',
-        'views/event_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/event_templates.xml',
         'views/res_partner_views.xml',
     ],
diff --git a/addons/event/models/event_config_settings.py b/addons/event/models/event_config_settings.py
index e0211684736..69201cdbd2d 100644
--- a/addons/event/models/event_config_settings.py
+++ b/addons/event/models/event_config_settings.py
@@ -2,7 +2,7 @@
 
 from odoo import fields, models
 
-class event_config_settings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_event_sale = fields.Boolean("Tickets")
diff --git a/addons/event/views/event_config_settings_views.xml b/addons/event/views/res_config_settings_views.xml
index 87cdd1d5d08..011139bf616 100644
--- a/addons/event/views/event_config_settings_views.xml
+++ b/addons/event/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="event_config_settings_view_form" model="ir.ui.view">
-            <field name="name">event.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.event</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="13"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Events" data-key="event" groups="event.group_event_manager">
diff --git a/addons/fetchmail/__manifest__.py b/addons/fetchmail/__manifest__.py
index f6ba5b0dda2..0c473e49768 100644
--- a/addons/fetchmail/__manifest__.py
+++ b/addons/fetchmail/__manifest__.py
@@ -40,6 +40,7 @@ For more specific needs, you may also assign custom-defined actions
         'security/ir.model.access.csv',
         'views/fetchmail_views.xml',
         'views/mail_mail_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/fetchmail/views/fetchmail_views.xml b/addons/fetchmail/views/fetchmail_views.xml
index e644f1248fd..3b86f86808f 100644
--- a/addons/fetchmail/views/fetchmail_views.xml
+++ b/addons/fetchmail/views/fetchmail_views.xml
@@ -93,27 +93,6 @@
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <record id="base_config_settings_view_form_inherit_fetchmail" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.fetchmail</field>
-            <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="mail.base_config_settings_view_form_inherit_mail"/>
-            <field name="arch" type="xml">
-                <div id="mail_alias_domain" position="after">
-                    <div>
-                        <button type="action"
-                        name="%(action_email_server_tree)d"
-                        string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
-                    </div>
-                    <div>
-                        <button type="action"
-                        name="%(base.action_ir_mail_server_list)d"
-                        string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
-                    </div>
-                </div>
-            </field>
-        </record>
-
-
         <menuitem
             parent="base.menu_email"
             id="menu_action_fetchmail_server_tree"
diff --git a/addons/fetchmail/views/res_config_settings_views.xml b/addons/fetchmail/views/res_config_settings_views.xml
new file mode 100644
index 00000000000..f8a9c19acdf
--- /dev/null
+++ b/addons/fetchmail/views/res_config_settings_views.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.fetchmail</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="mail.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="mail_alias_domain" position="after">
+                <div>
+                    <button type="action"
+                    name="%(action_email_server_tree)d"
+                    string="Incoming Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                </div>
+                <div>
+                    <button type="action"
+                    name="%(base.action_ir_mail_server_list)d"
+                    string="Outgoing Email Servers" icon="fa-arrow-right" class="btn-link"/>
+                </div>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/google_calendar/__manifest__.py b/addons/google_calendar/__manifest__.py
index 7a15b686cba..18381495eb4 100644
--- a/addons/google_calendar/__manifest__.py
+++ b/addons/google_calendar/__manifest__.py
@@ -13,7 +13,7 @@
         'data/google_calendar_data.xml',
         'data/google_calendar_data.xml',
         'security/ir.model.access.csv',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_users_views.xml',
         'views/google_calendar_templates.xml',
     ],
diff --git a/addons/google_calendar/models/__init__.py b/addons/google_calendar/models/__init__.py
index 28d5732446b..ad0d5c09861 100644
--- a/addons/google_calendar/models/__init__.py
+++ b/addons/google_calendar/models/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import calendar
 from . import google_calendar
 from . import res_users
diff --git a/addons/google_calendar/models/base_config_settings.py b/addons/google_calendar/models/res_config_settings.py
index 7386e92afd7..1ac55dbc58d 100644
--- a/addons/google_calendar/models/base_config_settings.py
+++ b/addons/google_calendar/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     cal_client_id = fields.Char("Client_id")
@@ -12,14 +12,14 @@ class BaseConfigSettings(models.TransientModel):
     server_uri = fields.Char('URI for tuto')
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].set_param
         set_param('google_calendar_client_id', (self.cal_client_id or '').strip())
         set_param('google_calendar_client_secret', (self.cal_client_secret or '').strip())
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         get_param = self.env['ir.config_parameter'].sudo().get_param
         res.update(
             cal_client_id=get_param('google_calendar_client_id', default=''),
diff --git a/addons/google_calendar/views/base_config_settings_views.xml b/addons/google_calendar/views/res_config_settings_views.xml
index 314b9cb490e..200f1490ebb 100644
--- a/addons/google_calendar/views/base_config_settings_views.xml
+++ b/addons/google_calendar/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form_inherit_google_calendar" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.google.calendar</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.google.calendar</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_google_calendar" position="replace">
                     <div class="content-group" attrs="{'invisible': [('module_google_calendar','=',False)]}">
diff --git a/addons/google_drive/__manifest__.py b/addons/google_drive/__manifest__.py
index 296b46c317c..090dff99f73 100644
--- a/addons/google_drive/__manifest__.py
+++ b/addons/google_drive/__manifest__.py
@@ -12,7 +12,7 @@
         'data/google_drive_data.xml',
         'views/google_drive_views.xml',
         'views/google_drive_templates.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/google_drive_demo.xml'
diff --git a/addons/google_drive/models/__init__.py b/addons/google_drive/models/__init__.py
index 288b7b7fbac..c8728366f74 100644
--- a/addons/google_drive/models/__init__.py
+++ b/addons/google_drive/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import google_drive
diff --git a/addons/google_drive/models/base_config_settings.py b/addons/google_drive/models/res_config_settings.py
index 7637024e569..0358f615832 100644
--- a/addons/google_drive/models/base_config_settings.py
+++ b/addons/google_drive/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     google_drive_authorization_code = fields.Char(string='Authorization Code')
@@ -18,14 +18,14 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             google_drive_authorization_code=self.env['ir.config_parameter'].sudo().get_param('google_drive_authorization_code'),
         )
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         params = self.env['ir.config_parameter'].sudo()
         authorization_code = self.google_drive_authorization_code
         refresh_token = False
diff --git a/addons/google_drive/views/base_config_settings_views.xml b/addons/google_drive/views/res_config_settings_views.xml
index e1a6e01e9aa..5af9c443596 100644
--- a/addons/google_drive/views/base_config_settings_views.xml
+++ b/addons/google_drive/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="base_config_settings_view_form_inherit_google_drive" model="ir.ui.view">
-        <field name="name">base.config.settings.inherit.google.drive</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.google.drive</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_module_google_drive" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_google_drive','=',False)]}">
diff --git a/addons/google_spreadsheet/__manifest__.py b/addons/google_spreadsheet/__manifest__.py
index 20bbc85882b..26c2e3660ce 100644
--- a/addons/google_spreadsheet/__manifest__.py
+++ b/addons/google_spreadsheet/__manifest__.py
@@ -14,7 +14,7 @@ The module adds the possibility to display data from Odoo in Google Spreadsheets
         'data/google_spreadsheet_data.xml',
         'views/google_spreadsheet_views.xml',
         'views/google_spreadsheet_templates.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [],
diff --git a/addons/google_spreadsheet/models/__init__.py b/addons/google_spreadsheet/models/__init__.py
index 288b7b7fbac..c8728366f74 100644
--- a/addons/google_spreadsheet/models/__init__.py
+++ b/addons/google_spreadsheet/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import google_drive
diff --git a/addons/google_spreadsheet/models/base_config_settings.py b/addons/google_spreadsheet/models/res_config_settings.py
index 8e0d1894303..86649bae17d 100644
--- a/addons/google_spreadsheet/models/base_config_settings.py
+++ b/addons/google_spreadsheet/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     google_drive_uri_copy = fields.Char(related='google_drive_uri', string='URI', help="The URL to generate the authorization code from Google")
diff --git a/addons/google_spreadsheet/views/base_config_settings_views.xml b/addons/google_spreadsheet/views/res_config_settings_views.xml
index a7874d561d2..7eb53e0e5f8 100644
--- a/addons/google_spreadsheet/views/base_config_settings_views.xml
+++ b/addons/google_spreadsheet/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="base_config_settings_view_form_inherit_spreadsheet" model="ir.ui.view">
-        <field name="name">base.config.settings.inherit.spreadsheet</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.google.spreadsheet</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="base_setup.base_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='msg_module_google_spreadsheet']" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_google_spreadsheet','=',False)]}">
diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py
index 9e62c5d932c..fd9e76106fb 100644
--- a/addons/hr/__manifest__.py
+++ b/addons/hr/__manifest__.py
@@ -26,7 +26,7 @@
         'security/ir.model.access.csv',
         'views/hr_views.xml',
         'views/hr_templates.xml',
-        'views/hr_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/hr_data.xml',
     ],
     'demo': [
diff --git a/addons/hr/models/__init__.py b/addons/hr/models/__init__.py
index 5640a49fa92..5d9895c99d2 100644
--- a/addons/hr/models/__init__.py
+++ b/addons/hr/models/__init__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import hr
-from . import hr_config_settings
+from . import res_config_settings
 from . import mail_alias
 from . import res_partner
 from . import res_users
diff --git a/addons/hr/models/hr_config_settings.py b/addons/hr/models/res_config_settings.py
index 7682163b64a..b916ea2355d 100644
--- a/addons/hr/models/hr_config_settings.py
+++ b/addons/hr/models/res_config_settings.py
@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class HrConfigurator(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one(
diff --git a/addons/hr/views/hr_config_settings_views.xml b/addons/hr/views/res_config_settings_views.xml
index b12e9436e3a..3a68ae18f8a 100644
--- a/addons/hr/views/hr_config_settings_views.xml
+++ b/addons/hr/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.config.settings.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="14"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Employee" data-key="hr" groups="hr.group_hr_manager">
diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py
index bc36a7d4f5d..4637cc7bb61 100644
--- a/addons/hr_attendance/__manifest__.py
+++ b/addons/hr_attendance/__manifest__.py
@@ -25,7 +25,7 @@ actions(Check in/Check out) performed by them.
         'report/hr_employee_badge.xml',
         'views/hr_department_view.xml',
         'views/hr_employee_view.xml',
-        'views/attendance_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/hr_attendance_demo.xml'
diff --git a/addons/hr_attendance/models/__init__.py b/addons/hr_attendance/models/__init__.py
index 94f3e8714a7..fd62623b92b 100644
--- a/addons/hr_attendance/models/__init__.py
+++ b/addons/hr_attendance/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from . import attendance_config_settings
+from . import res_config_settings
 from . import hr_attendance
 from . import hr_employee
diff --git a/addons/hr_attendance/models/attendance_config_settings.py b/addons/hr_attendance/models/res_config_settings.py
index 4a05ccadbe2..5e67d2e50df 100644
--- a/addons/hr_attendance/models/attendance_config_settings.py
+++ b/addons/hr_attendance/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     group_attendance_use_pin = fields.Boolean(string='Employee PIN',
diff --git a/addons/hr_attendance/views/attendance_config_settings_views.xml b/addons/hr_attendance/views/res_config_settings_views.xml
index f7bfa32602e..4c67a4fcd19 100644
--- a/addons/hr_attendance/views/attendance_config_settings_views.xml
+++ b/addons/hr_attendance/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_attendance_view_config" model="ir.ui.view">
-        <field name="name">attendance.config.settings.hr.form.attendance</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.attendance</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="16"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Attendances" data-key="hr_attendance" groups="hr_attendance.group_hr_attendance_manager">
diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index 10fa94ec0a2..e6fc131ba8a 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -39,7 +39,7 @@ This module also uses analytic accounting and is compatible with the invoice on
         'report/report_expense_sheet.xml',
         'views/hr_dashboard.xml',
         'views/hr_expense.xml',
-        'views/hr_expense_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/web_planner_data.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
diff --git a/addons/hr_expense/models/__init__.py b/addons/hr_expense/models/__init__.py
index aa63806bf9d..846f5603d2e 100644
--- a/addons/hr_expense/models/__init__.py
+++ b/addons/hr_expense/models/__init__.py
@@ -4,5 +4,5 @@ from . import account_move_line
 from . import hr_department
 from . import hr_expense
 from . import product_template
-from . import hr_expense_config_settings
+from . import res_config_settings
 from . import web_planner
diff --git a/addons/hr_expense/models/hr_expense_config_settings.py b/addons/hr_expense/models/res_config_settings.py
index d874c324f57..2f002991432 100644
--- a/addons/hr_expense/models/hr_expense_config_settings.py
+++ b/addons/hr_expense/models/res_config_settings.py
@@ -3,7 +3,7 @@
 from odoo import api, fields, models
 
 
-class HrExpenseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     alias_prefix = fields.Char('Default Alias Name for Expenses')
@@ -13,7 +13,7 @@ class HrExpenseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(HrExpenseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             alias_prefix=self.env.ref('hr_expense.mail_alias_expense').alias_name,
             use_mailgateway=self.env['ir.config_parameter'].sudo().get_param('hr_expense.use_mailgateway'),
@@ -22,7 +22,7 @@ class HrExpenseConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(HrExpenseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env.ref('hr_expense.mail_alias_expense').write({'alias_name': self.alias_prefix})
         self.env['ir.config_parameter'].sudo().set_param('hr_expense.use_mailgateway', self.use_mailgateway)
 
diff --git a/addons/hr_expense/views/hr_expense_config_settings_views.xml b/addons/hr_expense/views/res_config_settings_views.xml
index 4edd197b42d..27b1a960fc5 100644
--- a/addons/hr_expense/views/hr_expense_config_settings_views.xml
+++ b/addons/hr_expense/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="hr_expense_config_setting_view_form" model="ir.ui.view">
-            <field name="name">hr.expense.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.expense</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="17"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Expense" data-key="hr_expense" groups="hr_expense.group_hr_expense_manager">
diff --git a/addons/hr_payroll/__manifest__.py b/addons/hr_payroll/__manifest__.py
index 1171eb5ebce..f0584b9474b 100644
--- a/addons/hr_payroll/__manifest__.py
+++ b/addons/hr_payroll/__manifest__.py
@@ -25,7 +25,7 @@
         'views/hr_payroll_report.xml',
         'data/hr_payroll_data.xml',
         'wizard/hr_payroll_contribution_register_report_views.xml',
-        'views/hr_payroll_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/report_contributionregister_templates.xml',
         'views/report_payslip_templates.xml',
         'views/report_payslipdetails_templates.xml',
diff --git a/addons/hr_payroll/models/__init__.py b/addons/hr_payroll/models/__init__.py
index 7b5cf4c386a..99a241743cf 100644
--- a/addons/hr_payroll/models/__init__.py
+++ b/addons/hr_payroll/models/__init__.py
@@ -3,6 +3,6 @@
 
 from . import hr_contract
 from . import hr_employee
-from . import hr_payroll_config_settings
+from . import res_config_settings
 from . import hr_salary_rule
 from . import hr_payslip
diff --git a/addons/hr_payroll/models/hr_payroll_config_settings.py b/addons/hr_payroll/models/res_config_settings.py
index f0d0433176c..7653675c378 100644
--- a/addons/hr_payroll/models/hr_payroll_config_settings.py
+++ b/addons/hr_payroll/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class HrPayrollConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_account_accountant = fields.Boolean(string='Account Accountant')
diff --git a/addons/hr_payroll/views/hr_payroll_config_settings_views.xml b/addons/hr_payroll/views/res_config_settings_views.xml
index 4a8045c0c86..9ffc8e4158d 100644
--- a/addons/hr_payroll/views/hr_payroll_config_settings_views.xml
+++ b/addons/hr_payroll/views/res_config_settings_views.xml
@@ -8,11 +8,11 @@
             <field name="search_view_id" ref="base.view_module_filter"/>
         </record>
 
-        <record id="view_hr_payroll_configuration" model="ir.ui.view">
-            <field name="name">Configure Payroll</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.payroll</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="9"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Payroll" data-key="hr_payroll" groups="hr_payroll.group_hr_payroll_manager">
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index 96ae62bf46e..a1bbcc74e37 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -22,7 +22,7 @@
         'security/ir.model.access.csv',
         'data/hr_recruitment_data.xml',
         'views/hr_recruitment_views.xml',
-        'views/hr_recruitment_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_recruitment_templates.xml',
         'views/hr_department_views.xml',
         'views/hr_job_views.xml',
diff --git a/addons/hr_recruitment/models/__init__.py b/addons/hr_recruitment/models/__init__.py
index 124382e05ca..078e032e222 100644
--- a/addons/hr_recruitment/models/__init__.py
+++ b/addons/hr_recruitment/models/__init__.py
@@ -2,5 +2,5 @@ from . import hr_department
 from . import hr_recruitment
 from . import hr_employee
 from . import hr_job
-from . import hr_recruitment_config_settings
+from . import res_config_settings
 from . import calendar
diff --git a/addons/hr_recruitment/models/hr_recruitment_config_settings.py b/addons/hr_recruitment/models/res_config_settings.py
index 99b0f7fbad5..12b361a91db 100644
--- a/addons/hr_recruitment/models/hr_recruitment_config_settings.py
+++ b/addons/hr_recruitment/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class RecruitmentSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = ['res.config.settings']
 
     module_website_hr_recruitment = fields.Boolean(string='Online Posting')
diff --git a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml b/addons/hr_recruitment/views/res_config_settings_views.xml
index e975426da6f..4bf56fc7199 100644
--- a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
+++ b/addons/hr_recruitment/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="hr_recruitment_config_settings_view_form" model="ir.ui.view">
-            <field name="name">hr.recruitment.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.hr.recruitment</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="15"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Recruitment" data-key="hr_recruitment" groups="hr_recruitment.group_hr_recruitment_manager">
diff --git a/addons/hr_recruitment_survey/__manifest__.py b/addons/hr_recruitment_survey/__manifest__.py
index dcb46482eec..2b6c9c13939 100644
--- a/addons/hr_recruitment_survey/__manifest__.py
+++ b/addons/hr_recruitment_survey/__manifest__.py
@@ -16,7 +16,7 @@
         'data/survey_survey_data.xml',
         'views/hr_job_views.xml',
         'views/hr_applicant_views.xml',
-        'views/hr_recruitment_config_setting_views.xml',
+        'views/res_config_setting_views.xml',
     ],
     'demo': [
         'data/hr_job_demo.xml',
diff --git a/addons/hr_recruitment_survey/views/hr_recruitment_config_setting_views.xml b/addons/hr_recruitment_survey/views/res_config_setting_views.xml
index dabb0202a0c..135d85adcb2 100644
--- a/addons/hr_recruitment_survey/views/hr_recruitment_config_setting_views.xml
+++ b/addons/hr_recruitment_survey/views/res_config_setting_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_recruitment_config_settings_view_form_inherit_survey" model="ir.ui.view">
-        <field name="name">hr.recruitment.config.settings.inherit.recruitment.survey</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.recruitment.survey</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="hr_recruitment.hr_recruitment_config_settings_view_form"/>
+        <field name="inherit_id" ref="hr_recruitment.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="interview_forms" position="replace">
                 <div class="content-group">
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index 8295c7bd025..7bea3fc7495 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -25,7 +25,7 @@ up a management by affair.
         'security/hr_timesheet_security.xml',
         'security/ir.model.access.csv',
         'views/hr_timesheet_views.xml',
-        'views/hr_timesheet_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/project_views.xml',
         'views/project_portal_templates.xml',
         'report/hr_timesheet_report_view.xml',
diff --git a/addons/hr_timesheet/models/__init__.py b/addons/hr_timesheet/models/__init__.py
index a07ab14a3dc..1766ea8ddf9 100644
--- a/addons/hr_timesheet/models/__init__.py
+++ b/addons/hr_timesheet/models/__init__.py
@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import hr_timesheet
-from . import hr_timesheet_config_settings
+from . import res_config_settings
 from . import project
diff --git a/addons/hr_timesheet/models/hr_timesheet_config_settings.py b/addons/hr_timesheet/models/res_config_settings.py
index 0ca51823a76..31a25fdc597 100644
--- a/addons/hr_timesheet/models/hr_timesheet_config_settings.py
+++ b/addons/hr_timesheet/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class HrTimesheetConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet")
diff --git a/addons/hr_timesheet/views/hr_timesheet_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml
index b0bbf7953dc..6a6a96004fb 100644
--- a/addons/hr_timesheet/views/hr_timesheet_config_settings_views.xml
+++ b/addons/hr_timesheet/views/res_config_settings_views.xml
@@ -3,11 +3,11 @@
     <menuitem id="hr_timesheet_menu_configuration" name="Configuration" parent="timesheet_menu_root"
         groups="group_timesheet_manager" sequence="100"/>
 
-    <record id="hr_timesheet_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.timesheet.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.hr.timesheet</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="11"/>
-        <field name="inherit_id" ref="base.res_config_setting_form"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
diff --git a/addons/l10n_be_hr_payroll_fleet/__manifest__.py b/addons/l10n_be_hr_payroll_fleet/__manifest__.py
index 04ba7a62668..5577d12c671 100644
--- a/addons/l10n_be_hr_payroll_fleet/__manifest__.py
+++ b/addons/l10n_be_hr_payroll_fleet/__manifest__.py
@@ -9,7 +9,7 @@
     """,
     'data': [
         'views/fleet_views.xml',
-        'views/fleet_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_contract_views.xml',
     ],
     'auto_install': True,
diff --git a/addons/l10n_be_hr_payroll_fleet/models/__init__.py b/addons/l10n_be_hr_payroll_fleet/models/__init__.py
index 5316bae054e..79764ebaa92 100644
--- a/addons/l10n_be_hr_payroll_fleet/models/__init__.py
+++ b/addons/l10n_be_hr_payroll_fleet/models/__init__.py
@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import fleet
-from . import fleet_config_settings
+from . import res_config_settings
 from . import hr_contract
diff --git a/addons/l10n_be_hr_payroll_fleet/models/fleet_config_settings.py b/addons/l10n_be_hr_payroll_fleet/models/res_config_settings.py
index 2c2b3153591..470b03f03b5 100644
--- a/addons/l10n_be_hr_payroll_fleet/models/fleet_config_settings.py
+++ b/addons/l10n_be_hr_payroll_fleet/models/res_config_settings.py
@@ -4,19 +4,19 @@
 from odoo import api, fields, models
 
 
-class FleetConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = ['res.config.settings']
 
     max_unused_cars = fields.Integer(string='Maximum unused cars')
 
     def set_values(self):
-        super(FleetConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         Param = self.env['ir.config_parameter'].sudo()
         Param.set_param("l10n_be_hr_payroll_fleet.max_unused_cars", self.max_unused_cars)
 
     @api.model
     def get_values(self):
-        res = super(FleetConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
         res.update(max_unused_cars=int(params.get_param('l10n_be_hr_payroll_fleet.max_unused_cars', default=3)))
         return res
diff --git a/addons/l10n_be_hr_payroll_fleet/views/fleet_config_settings_views.xml b/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
index afcc64a8992..64b8b035bc3 100644
--- a/addons/l10n_be_hr_payroll_fleet/views/fleet_config_settings_views.xml
+++ b/addons/l10n_be_hr_payroll_fleet/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="fleet_config_settings_view_form" model="ir.ui.view">
-            <field name="name">fleet.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.l10n.be.hr.payroll.fleet</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="18"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Fleet" data-key="fleet" groups="fleet.fleet_group_manager">
diff --git a/addons/l10n_ch/__manifest__.py b/addons/l10n_ch/__manifest__.py
index afc3f4f2056..1db941997b1 100644
--- a/addons/l10n_ch/__manifest__.py
+++ b/addons/l10n_ch/__manifest__.py
@@ -40,7 +40,7 @@ Here is how it works:
         'report/isr_report.xml',
         'views/res_bank_view.xml',
         'views/account_invoice_view.xml',
-        'views/account_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
 
     'demo': [
diff --git a/addons/l10n_ch/models/__init__.py b/addons/l10n_ch/models/__init__.py
index 0926f969484..acb15c35730 100644
--- a/addons/l10n_ch/models/__init__.py
+++ b/addons/l10n_ch/models/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import account_config_settings
+from . import res_config_settings
 from . import account_invoice
 from . import mail_compose_message
 from . import mail_template
diff --git a/addons/l10n_ch/models/account_config_settings.py b/addons/l10n_ch/models/res_config_settings.py
index 520b95994b7..b1ff9537918 100644
--- a/addons/l10n_ch/models/account_config_settings.py
+++ b/addons/l10n_ch/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     l10n_ch_isr_print_bank_location = fields.Boolean(string="Print bank on ISR",
diff --git a/addons/l10n_ch/views/account_config_settings_views.xml b/addons/l10n_ch/views/res_config_settings_views.xml
index ca448bace29..02847355c7a 100644
--- a/addons/l10n_ch/views/account_config_settings_views.xml
+++ b/addons/l10n_ch/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="l10n_ch-isr_account_config_settings" model="ir.ui.view">
-            <field name="name">l10n_ch.isr.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.l10n.ch</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+            <field name="inherit_id" ref="account.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@id='accounting_reports']" position="inside">
                     <div class="col-xs-12 col-md-6 o_setting_box" id="l10n_ch-isr_print_bank">
diff --git a/addons/l10n_eu_service/__manifest__.py b/addons/l10n_eu_service/__manifest__.py
index e31eb61b1e9..f6b5e4bcdd8 100644
--- a/addons/l10n_eu_service/__manifest__.py
+++ b/addons/l10n_eu_service/__manifest__.py
@@ -57,6 +57,6 @@ References
         'security/ir.model.access.csv',
         'wizard/wizard.xml',
         'data/l10n_eu_service.service_tax_rate.csv',
-        'views/account_settings_config_views.xml'
+        'views/res_config_settings_views.xml'
     ],
 }
diff --git a/addons/l10n_eu_service/views/account_settings_config_views.xml b/addons/l10n_eu_service/views/res_config_settings_views.xml
index b6cbb4fe7c6..66946a0b104 100644
--- a/addons/l10n_eu_service/views/account_settings_config_views.xml
+++ b/addons/l10n_eu_service/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="account_config_settings_view_form" model="ir.ui.view">
-        <field name="name">account.config.settings.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.l10n.eu.service</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name="l10n_eu_service_right_pane" position="inside">
                 <div class="content-group" attrs="{'invisible': [('module_l10n_eu_service', '=', False)]}">
diff --git a/addons/l10n_fr_hr_payroll/__manifest__.py b/addons/l10n_fr_hr_payroll/__manifest__.py
index 7bb4d6e6abd..aad79850668 100644
--- a/addons/l10n_fr_hr_payroll/__manifest__.py
+++ b/addons/l10n_fr_hr_payroll/__manifest__.py
@@ -28,7 +28,7 @@ TODO:
     'data': [
         'data/l10n_fr_hr_payroll_data.xml',
         'views/l10n_fr_hr_payroll_view.xml',
-        'views/l10n_fr_hr_payroll_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'report/report_l10n_fr_fiche_paye.xml',
         'report/l10n_fr_hr_payroll_report.xml',
     ],
diff --git a/addons/l10n_fr_hr_payroll/models/__init__.py b/addons/l10n_fr_hr_payroll/models/__init__.py
index b9b724f3f83..df8a0324242 100644
--- a/addons/l10n_fr_hr_payroll/models/__init__.py
+++ b/addons/l10n_fr_hr_payroll/models/__init__.py
@@ -2,4 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import l10n_fr_hr_payroll
-from . import l10n_fr_hr_payroll_config_settings
+from . import res_config_settings
diff --git a/addons/l10n_fr_hr_payroll/models/l10n_fr_hr_payroll_config_settings.py b/addons/l10n_fr_hr_payroll/models/res_config_settings.py
index a136db9c3b2..5d6cda5fa0a 100644
--- a/addons/l10n_fr_hr_payroll/models/l10n_fr_hr_payroll_config_settings.py
+++ b/addons/l10n_fr_hr_payroll/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class HrPayrollConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
diff --git a/addons/l10n_fr_hr_payroll/views/l10n_fr_hr_payroll_config_settings_views.xml b/addons/l10n_fr_hr_payroll/views/res_config_settings_views.xml
index 642f6916a03..4444039af5f 100644
--- a/addons/l10n_fr_hr_payroll/views/l10n_fr_hr_payroll_config_settings_views.xml
+++ b/addons/l10n_fr_hr_payroll/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="hr_payroll_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.payroll.config.settings.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.l10n.fr.hr.payroll</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="hr_payroll.view_hr_payroll_configuration"/>
+        <field name="inherit_id" ref="hr_payroll.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='hr_payroll_localization']" position="after">
                 <field name="module_l10n_fr_hr_payroll" invisible="1"/>
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index d7bf6c4ede9..e86fe886475 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -40,6 +40,6 @@ With this module you will have:
         "data/account_tax_data.xml",
         "data/fiscal_position_data.xml",
         "data/account_chart_template_data.yml",
-        "views/account_config_settings_views.xml",
+        "views/res_config_settings_views.xml",
     ],
 }
diff --git a/addons/l10n_mx/models/__init__.py b/addons/l10n_mx/models/__init__.py
index 2e34a1305b9..2e1acea6eee 100644
--- a/addons/l10n_mx/models/__init__.py
+++ b/addons/l10n_mx/models/__init__.py
@@ -3,5 +3,5 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from . import account
-from . import account_config_settings
+from . import res_config_settings
 from . import chart_template
diff --git a/addons/l10n_mx/models/account_config_settings.py b/addons/l10n_mx/models/res_config_settings.py
index 913a422cf4b..a0776b7022b 100644
--- a/addons/l10n_mx/models/account_config_settings.py
+++ b/addons/l10n_mx/models/res_config_settings.py
@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing')
diff --git a/addons/l10n_mx/views/account_config_settings_views.xml b/addons/l10n_mx/views/res_config_settings_views.xml
index 3a13504f1ee..4407019c06e 100644
--- a/addons/l10n_mx/views/account_config_settings_views.xml
+++ b/addons/l10n_mx/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="account_config_settings_account_mx_inherit" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.l10n.mx</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr=".//div[@id='invoicing_settings']" position="inside">
                 <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index b375bf1f5ff..f5b2944a05a 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -20,7 +20,7 @@
         'views/mail_channel_views.xml',
         'views/mail_shortcode_views.xml',
         'views/mail_activity_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/mail_data.xml',
         'data/mail_channel_data.xml',
         'data/mail_shortcode_data.xml',
diff --git a/addons/mail/models/__init__.py b/addons/mail/models/__init__.py
index 1005d2527e0..daf70f23ca4 100644
--- a/addons/mail/models/__init__.py
+++ b/addons/mail/models/__init__.py
@@ -14,7 +14,7 @@ from . import mail_template
 from . import mail_shortcode
 from . import res_partner
 from . import res_users
-from . import base_config_settings
+from . import res_config_settings
 from . import update
 from . import ir_actions
 from . import ir_autovacuum
diff --git a/addons/mail/models/base_config_settings.py b/addons/mail/models/res_config_settings.py
index 320c0ec1afc..19d70b0973d 100644
--- a/addons/mail/models/base_config_settings.py
+++ b/addons/mail/models/res_config_settings.py
@@ -8,7 +8,7 @@ from werkzeug import urls
 from odoo import api, fields, models, tools
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     """ Inherit the base settings to add a counter of failed email + configure
     the alias domain. """
     _inherit = 'res.config.settings'
@@ -19,7 +19,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
 
         previous_date = datetime.datetime.now() - datetime.timedelta(days=30)
 
@@ -41,5 +41,5 @@ class BaseConfigSettings(models.TransientModel):
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].set_param("mail.catchall.domain", self.alias_domain or '')
diff --git a/addons/mail/views/base_config_settings_views.xml b/addons/mail/views/res_config_settings_views.xml
index 398af73a88d..94a3c6065e1 100644
--- a/addons/mail/views/base_config_settings_views.xml
+++ b/addons/mail/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="base_config_settings_view_form_inherit_mail" model="ir.ui.view">
-            <field name="name">base.config.settings.form.inherit.mail</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.mail</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="emails" position='replace'>
                     <h2>Discuss</h2>
diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 8d1bedd3018..c1b19e12238 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -26,7 +26,7 @@
         'views/link_tracker_views.xml',
         'views/mass_mailing_template.xml',
         'views/mass_mailing_views.xml',
-        'views/mass_mailing_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'security/ir.model.access.csv',
         'views/editor_field_html.xml',
         'views/themes_templates.xml',
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index a04c0c665f6..6afa7a98d09 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -5,6 +5,6 @@ from . import mass_mailing
 from . import mass_mailing_stats
 from . import mail_mail
 from . import mail_thread
-from . import mass_mailing_config_settings
+from . import res_config_settings
 from . import mass_mailing_report
 from . import link_tracker
diff --git a/addons/mass_mailing/models/mass_mailing_config_settings.py b/addons/mass_mailing/models/res_config_settings.py
index fe3f9ee5f89..d23866c366b 100644
--- a/addons/mass_mailing/models/mass_mailing_config_settings.py
+++ b/addons/mass_mailing/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class MassMailingConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     group_mass_mailing_campaign = fields.Boolean(string="Mass Mailing Campaigns", implied_group='mass_mailing.group_mass_mailing_campaign', help="""This is useful if your marketing campaigns are composed of several emails""")
diff --git a/addons/mass_mailing/views/mass_mailing_config_settings_views.xml b/addons/mass_mailing/views/res_config_settings_views.xml
index 613960eecc0..8cd6f0d9fab 100644
--- a/addons/mass_mailing/views/mass_mailing_config_settings_views.xml
+++ b/addons/mass_mailing/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="view_mass_mailing_configuration" model="ir.ui.view">
-            <field name="name">Configure Mass Mailing</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.mass.mailing</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="12"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Email Marketing" data-key="mass_mailing" groups="mass_mailing.group_mass_mailing_user">
diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index ddd375b1c5e..bea1202c3f3 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -33,7 +33,7 @@
         'views/stock_picking_views.xml',
         'views/mrp_unbuild_views.xml',
         'views/ir_attachment_view.xml',
-        'views/mrp_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/mrp_templates.xml',
         'views/stock_scrap_views.xml',
         'report/mrp_report_views_main.xml',
diff --git a/addons/mrp/models/__init__.py b/addons/mrp/models/__init__.py
index 295d045c1e8..35239e53b1c 100644
--- a/addons/mrp/models/__init__.py
+++ b/addons/mrp/models/__init__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import mrp_document
-from . import mrp_config_settings
+from . import res_config_settings
 from . import mrp_bom
 from . import mrp_message
 from . import mrp_routing
diff --git a/addons/mrp/models/mrp_config_settings.py b/addons/mrp/models/res_config_settings.py
index 5fce91bfc76..0086f24c0fd 100644
--- a/addons/mrp/models/mrp_config_settings.py
+++ b/addons/mrp/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class MrpConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -18,7 +18,7 @@ class MrpConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(MrpConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             use_manufacturing_lead=self.env['ir.config_parameter'].sudo().get_param('mrp.use_manufacturing_lead')
         )
@@ -26,7 +26,7 @@ class MrpConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(MrpConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('mrp.use_manufacturing_lead', self.use_manufacturing_lead)
 
     @api.onchange('use_manufacturing_lead')
diff --git a/addons/mrp/views/mrp_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index e3a50d31083..c3973211fbe 100644
--- a/addons/mrp/views/mrp_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="view_mrp_config" model="ir.ui.view">
-            <field name="name">mrp settings</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.mrp</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="7"/>
-            <field name="inherit_id" ref="base.res_config_setting_form" />
+            <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
diff --git a/addons/pad/__manifest__.py b/addons/pad/__manifest__.py
index 7781f56c562..22e7c14bffa 100644
--- a/addons/pad/__manifest__.py
+++ b/addons/pad/__manifest__.py
@@ -16,7 +16,7 @@ pads (by default, http://etherpad.com/).
     'depends': ['web', 'base_setup'],
     'data': [
         'views/pad.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': ['data/pad_demo.xml'],
     'web': True,
diff --git a/addons/pad/models/__init__.py b/addons/pad/models/__init__.py
index 91cef398de7..24e85f37e82 100644
--- a/addons/pad/models/__init__.py
+++ b/addons/pad/models/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import base_config_settings
+from . import res_config_settings
 from . import pad
 from . import res_company
diff --git a/addons/pad/models/base_config_settings.py b/addons/pad/models/res_config_settings.py
index 56dd343f149..939bb10e934 100644
--- a/addons/pad/models/base_config_settings.py
+++ b/addons/pad/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     pad_server = fields.Char(related='company_id.pad_server', string="Pad Server *")
diff --git a/addons/pad/views/base_config_settings_views.xml b/addons/pad/views/res_config_settings_views.xml
index 5b792197cf2..4d0744d9d73 100644
--- a/addons/pad/views/base_config_settings_views.xml
+++ b/addons/pad/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>     
 <odoo>        
-    <record id="base_config_settings_view_form_inherit_pad" model="ir.ui.view">       
-        <field name="name">base.config.settings.form.inherit.pad</field>      
+    <record id="res_config_settings_view_form" model="ir.ui.view">       
+        <field name="name">res.config.settings.view.form.inherit.pad</field>      
         <field name="model">res.config.settings</field>      
-        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>        
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>        
         <field name="arch" type="xml">        
             <div id="msg_module_pad" position="replace">      
                 <div class="content-group" attrs="{'invisible': [('module_pad','=',False)]}">     
diff --git a/addons/pad_project/__manifest__.py b/addons/pad_project/__manifest__.py
index 85b1da9aa98..b5a16a8be03 100644
--- a/addons/pad_project/__manifest__.py
+++ b/addons/pad_project/__manifest__.py
@@ -14,7 +14,7 @@ This module adds a PAD in all project form views.
         'pad'
     ],
     'data': [
-        'views/project_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/project_views.xml'
     ],
     'auto_install': True,
diff --git a/addons/pad_project/views/project_config_settings_views.xml b/addons/pad_project/views/res_config_settings_views.xml
index f28fc1661c7..469f203e650 100644
--- a/addons/pad_project/views/project_config_settings_views.xml
+++ b/addons/pad_project/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="project_config_settings_view_form_inherit_pad_project" model="ir.ui.view">
-        <field name="name">project.config.settings.form.inherit.pad.project</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.pad.project</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="project.project_config_settings_view_form"/>
+        <field name="inherit_id" ref="project.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name="pad_project_right_pane" position="inside">
                 <div class="content-group">
diff --git a/addons/product/__manifest__.py b/addons/product/__manifest__.py
index 54e6eb75716..f0c923d1293 100644
--- a/addons/product/__manifest__.py
+++ b/addons/product/__manifest__.py
@@ -31,7 +31,7 @@ Print product labels with barcode.
         'security/product_security.xml',
         'security/ir.model.access.csv',
         'wizard/product_price_list_views.xml',
-        'views/base_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/product_attribute_views.xml',
         'views/product_uom_views.xml',
         'views/product_views.xml',
diff --git a/addons/product/models/__init__.py b/addons/product/models/__init__.py
index 2caa030a81a..a8b4525cc4c 100644
--- a/addons/product/models/__init__.py
+++ b/addons/product/models/__init__.py
@@ -3,7 +3,7 @@
 
 # flake8: noqa: F401
 
-from . import base_config_settings
+from . import res_config_settings
 from . import decimal_precision
 
 # don't try to be a good boy and sort imports alphabetically.
diff --git a/addons/product/models/base_config_settings.py b/addons/product/models/res_config_settings.py
index ae8ccc29a93..1d08f2a9a4c 100644
--- a/addons/product/models/base_config_settings.py
+++ b/addons/product/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class BaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_share_product = fields.Boolean(
@@ -28,7 +28,7 @@ class BaseConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(BaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         product_rule = self.env.ref('product.product_comp_rule')
         res.update(
             company_share_product=not bool(product_rule.active),
@@ -36,6 +36,6 @@ class BaseConfigSettings(models.TransientModel):
         return res
 
     def set_values(self):
-        super(BaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         product_rule = self.env.ref('product.product_comp_rule')
         product_rule.write({'active': not bool(self.company_share_product)})
diff --git a/addons/product/views/base_config_settings_views.xml b/addons/product/views/res_config_settings_views.xml
index c3a756c561f..bb23206d34a 100644
--- a/addons/product/views/base_config_settings_views.xml
+++ b/addons/product/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="base_config_settings_view_form_inherit_product" model="ir.ui.view">
-            <field name="name">base.config.settings.inherit.product</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.product</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.base_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='company_share_partner']" position="after">
                     <field name="company_share_product"/>
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index a4f95b3c203..214588a81c8 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -27,7 +27,7 @@
         'report/project_report_views.xml',
         'views/project_views.xml',
         'views/res_partner_views.xml',
-        'views/project_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/project_templates.xml',
         'views/project_portal_templates.xml',
         'data/web_planner_data.xml',
diff --git a/addons/project/models/__init__.py b/addons/project/models/__init__.py
index 0b24938aa3e..0507afc3e0a 100644
--- a/addons/project/models/__init__.py
+++ b/addons/project/models/__init__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import project
-from . import project_config_settings
+from . import res_config_settings
 from . import res_company
 from . import res_partner
 from . import web_planner
diff --git a/addons/project/models/project_config_settings.py b/addons/project/models/res_config_settings.py
index 134227c3832..4f061e9d898 100644
--- a/addons/project/models/project_config_settings.py
+++ b/addons/project/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class ProjectConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
diff --git a/addons/project/views/project_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index e7d2fcb41db..275f44e3fe3 100644
--- a/addons/project/views/project_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <record id="project_config_settings_view_form" model="ir.ui.view">
-            <field name="name">project.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.project</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="10"/>
-            <field name="inherit_id" ref="base.res_config_setting_form" />
+            <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Project" data-key="project" groups="project.group_project_manager">
diff --git a/addons/project_timesheet_holidays/__manifest__.py b/addons/project_timesheet_holidays/__manifest__.py
index d4374097a22..39f549e5b0c 100644
--- a/addons/project_timesheet_holidays/__manifest__.py
+++ b/addons/project_timesheet_holidays/__manifest__.py
@@ -15,7 +15,7 @@ on leaves. Project and task can be configured company-wide.
     """,
     'depends': ['hr_timesheet', 'hr_holidays'],
     'data': [
-        'views/hr_timesheet_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_holidays_views.xml',
     ],
     'demo': [],
diff --git a/addons/project_timesheet_holidays/models/__init__.py b/addons/project_timesheet_holidays/models/__init__.py
index 26656f63db2..61a9dde07a7 100644
--- a/addons/project_timesheet_holidays/models/__init__.py
+++ b/addons/project_timesheet_holidays/models/__init__.py
@@ -3,5 +3,5 @@
 
 from . import account_analytic
 from . import hr_holidays
-from . import hr_timesheet_config_settings
+from . import res_config_settings
 from . import res_company
diff --git a/addons/project_timesheet_holidays/models/hr_timesheet_config_settings.py b/addons/project_timesheet_holidays/models/res_config_settings.py
index 4b5f2f63636..6e264971e76 100644
--- a/addons/project_timesheet_holidays/models/hr_timesheet_config_settings.py
+++ b/addons/project_timesheet_holidays/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class TimesheetConfig(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     leave_timesheet_project_id = fields.Many2one(related='company_id.leave_timesheet_project_id', string="Internal Project")
diff --git a/addons/project_timesheet_holidays/views/hr_timesheet_config_settings_views.xml b/addons/project_timesheet_holidays/views/res_config_settings_views.xml
index e80b78397f6..a7485bec714 100644
--- a/addons/project_timesheet_holidays/views/hr_timesheet_config_settings_views.xml
+++ b/addons/project_timesheet_holidays/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="timesheet_config_settings_view_form_inherit" model="ir.ui.view">
-        <field name="name">hr.timesheet.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.project.timesheet.holidays</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_config_settings_view_form"/>
+        <field name="inherit_id" ref="hr_timesheet.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='module_project_timesheet_holidays']" position="replace">
                 <div attrs="{'invisible': [('module_project_timesheet_holidays','=',False)]}">
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index 689729b62a6..1994afd8ada 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -20,12 +20,10 @@
         'views/purchase_views.xml',
         'views/procurement_views.xml',
         'views/stock_views.xml',
-        'views/stock_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
         'report/purchase_report_views.xml',
         'data/mail_template_data.xml',
-        'views/purchase_config_settings_views.xml',
-        'views/account_config_settings_views.xml',
         'views/portal_templates.xml',
         'report/purchase_order_templates.xml',
         'report/purchase_quotation_templates.xml',
diff --git a/addons/purchase/models/__init__.py b/addons/purchase/models/__init__.py
index 7de7d10071f..0c9a850081e 100644
--- a/addons/purchase/models/__init__.py
+++ b/addons/purchase/models/__init__.py
@@ -3,7 +3,7 @@
 
 from . import account_invoice
 from . import purchase
-from . import purchase_config_settings
+from . import res_config_settings
 from . import res_company
 from . import res_partner
 from . import stock
diff --git a/addons/purchase/models/purchase_config_settings.py b/addons/purchase/models/res_config_settings.py
index 26e8f3de55c..5aaf47b8108 100644
--- a/addons/purchase/models/purchase_config_settings.py
+++ b/addons/purchase/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class PurchaseConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -29,22 +29,20 @@ class PurchaseConfigSettings(models.TransientModel):
         implied_group="purchase.group_manage_vendor_price")
     module_account_3way_match = fields.Boolean("3-way matching: purchases, receptions and bills")
     is_installed_sale = fields.Boolean()
+    group_analytic_account_for_purchases = fields.Boolean('Analytic accounting for purchases',
+        implied_group='purchase.group_analytic_accounting')
 
     @api.multi
     def get_values(self):
-        res = super(PurchaseConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             is_installed_sale=self.env['ir.module.module'].search([('name', '=', 'sale'), ('state', '=', 'installed')]).id
         )
         return res
 
     def set_values(self):
-        super(PurchaseConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.po_lock = 'lock' if self.lock_confirmed_po else 'edit'
         self.po_double_validation = 'two_step' if self.po_order_approval else 'one_step'
 
 
-class AccountConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-    group_analytic_account_for_purchases = fields.Boolean('Analytic accounting for purchases',
-        implied_group='purchase.group_analytic_accounting')
diff --git a/addons/purchase/models/stock_config_settings.py b/addons/purchase/models/stock_config_settings.py
index 538be0bc12a..1b506911f59 100644
--- a/addons/purchase/models/stock_config_settings.py
+++ b/addons/purchase/models/stock_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class StockConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     po_lead = fields.Float(related='company_id.po_lead')
@@ -19,12 +19,12 @@ class StockConfigSettings(models.TransientModel):
             self.po_lead = 0.0
 
     def get_values(self):
-        res = super(StockConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             use_po_lead=self.env['ir.config_parameter'].sudo().get_param('purchase.use_po_lead')
         )
         return res
 
     def set_values(self):
-        super(StockConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('purchase.use_po_lead', self.use_po_lead)
diff --git a/addons/purchase/views/account_config_settings_views.xml b/addons/purchase/views/account_config_settings_views.xml
deleted file mode 100644
index 6452582ccdf..00000000000
--- a/addons/purchase/views/account_config_settings_views.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="account_config_settings_view_form_inherit_purchase" model="ir.ui.view">
-        <field name="name">account.config.settings.form.inherit.purchase</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="account.account_config_settings_view_form"/>
-        <field name="arch" type="xml">
-            <div id="account_budget" position="before">
-                <div class="col-xs-12 col-md-6 o_setting_box" title="Allows you to specify an analytic account on purchase order lines." groups="account.group_account_user">
-                    <div class="o_setting_left_pane">
-                        <field name="group_analytic_account_for_purchases" class="oe_inline"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label string="Purchase Analytics" for="group_analytic_account_for_purchases"/>
-                        <div class="text-muted">
-                            Set analytic accounts in purchase orders
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </field>
-    </record>
-
-</odoo>
diff --git a/addons/purchase/views/purchase_config_settings_views.xml b/addons/purchase/views/purchase_config_settings_views.xml
deleted file mode 100644
index 25b4f2c4390..00000000000
--- a/addons/purchase/views/purchase_config_settings_views.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <record id="view_purchase_configuration" model="ir.ui.view">
-            <field name="name">purchase.res.config.view</field>
-            <field name="model">res.config.settings</field>
-            <field name="priority" eval="5"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[hasclass('settings')]" position="inside">
-                    <div class="app_settings_block" data-string="Purchase" data-key="purchase" groups="purchase.group_purchase_manager">
-                        <field name="po_double_validation" invisible="1"/>
-                        <field name="company_id" invisible="1"/>
-                        <field name="company_currency_id" invisible="1"/>
-                        <field name="po_lock" invisible="1"/>
-                        <h2>Orders</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="po_order_approval"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="po_order_approval"/>
-                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                    <div class="text-muted">
-                                        Managers must approve orders
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('po_order_approval', '=', False)]}">
-                                        <div class="row mt16">
-                                            <label for="po_double_validation_amount" class="col-md-4 o_light_label"/>
-                                            <field name="po_double_validation_amount"/>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_purchase_requisition"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_purchase_requisition"/>
-                                    <div class="text-muted">
-                                        Manage your purchase agreements (call for tenders, blanket orders)
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('module_purchase_requisition', '=', False)]}">
-                                        <div id="use_purchase_requisition"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="lock_confirmed_po"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="lock_confirmed_po"/>
-                                    <div class="text-muted">
-                                        No longer edit orders once confirmed
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_warning_purchase"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="group_warning_purchase"/>
-                                    <div class="text-muted">
-                                        Get warnings in orders for products or vendors
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <h2>Invoicing</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="This default value is applied to any new product created. This can be changed in the product detail form.">
-                                <div class="o_setting_left_pane"/>
-                                <div class="o_setting_right_pane">
-                                    <label for="default_purchase_method"/>
-                                    <div class="text-muted">
-                                        Quantities billed by vendors
-                                    </div>
-                                    <div class="content-group">
-                                        <div class="mt16">
-                                            <field name="default_purchase_method" widget="radio"/>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_3way_match" string="3-way matching" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_account_3way_match"/>
-                                    <div class="text-muted">
-                                        Make sure you only pay bills for which you received the goods you ordered
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <h2>Products</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box" title="By default, vendor prices can be set manually in the product detail form. If your vendors provide you with pricelist files, this option allows you to easily import them into the system from ‘Purchase > Vendor Pricelists’ menu.">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_manage_vendor_price"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="group_manage_vendor_price"/>
-                                    <div class="text-muted">
-                                        Import vendor pricelists
-                                    </div>
-                                    <div class="content-group" attrs="{'invisible': [('group_manage_vendor_price', '=', False)]}">
-                                        <div class="mt16">
-                                            <a class="btn-link fa fa-arrow-right" target="_blank" href="https://www.odoo.com/documentation/user/10.0/general/base_import/import_faq.html">
-                                            How to import
-                                            </a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <field name="is_installed_sale" invisible="1"/>
-                        <h2 attrs="{'invisible': [('is_installed_sale', '=', False)]}">Logistics</h2>
-                        <div class="row mt16 o_settings_container">
-                            <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('is_installed_sale', '=', False)]}" title="This adds a dropshipping route to apply on products in order to request your vendors to deliver to your customers. A product to dropship will generate a purchase request for quotation once the sales order confirmed. This is a on-demand flow. The requested delivery address will be the customer delivery address and not your warehouse.">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_stock_dropshipping"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_stock_dropshipping"/>
-                                    <div class="text-muted">
-                                        Request your vendors to deliver to your customers
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="action_purchase_configuration" model="ir.actions.act_window">
-            <field name="name">Configure Purchases</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-            <field name="context">{'module' : 'purchase'}</field>
-        </record>
-
-        <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config"
-            sequence="0" action="action_purchase_configuration" groups="base.group_system"/>
-
-</odoo>
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
new file mode 100644
index 00000000000..38fd0a25a13
--- /dev/null
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="res_config_settings_view_form_purchase" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.purchase</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="5"/>
+        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
+                <div class="app_settings_block" data-string="Purchase" data-key="purchase" groups="purchase.group_purchase_manager">
+                    <field name="po_double_validation" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="company_currency_id" invisible="1"/>
+                    <field name="po_lock" invisible="1"/>
+                    <h2>Orders</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="po_order_approval"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="po_order_approval"/>
+                                <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                                <div class="text-muted">
+                                    Managers must approve orders
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('po_order_approval', '=', False)]}">
+                                    <div class="row mt16">
+                                        <label for="po_double_validation_amount" class="col-md-4 o_light_label"/>
+                                        <field name="po_double_validation_amount"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors.">
+                            <div class="o_setting_left_pane">
+                                <field name="module_purchase_requisition"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_purchase_requisition"/>
+                                <div class="text-muted">
+                                    Manage your purchase agreements (call for tenders, blanket orders)
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('module_purchase_requisition', '=', False)]}">
+                                    <div id="use_purchase_requisition"/>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="lock_confirmed_po"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="lock_confirmed_po"/>
+                                <div class="text-muted">
+                                    No longer edit orders once confirmed
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="group_warning_purchase"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="group_warning_purchase"/>
+                                <div class="text-muted">
+                                    Get warnings in orders for products or vendors
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <h2>Invoicing</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="This default value is applied to any new product created. This can be changed in the product detail form.">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <label for="default_purchase_method"/>
+                                <div class="text-muted">
+                                    Quantities billed by vendors
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16">
+                                        <field name="default_purchase_method" widget="radio"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice.">
+                            <div class="o_setting_left_pane">
+                                <field name="module_account_3way_match" string="3-way matching" widget="upgrade_boolean"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_account_3way_match"/>
+                                <div class="text-muted">
+                                    Make sure you only pay bills for which you received the goods you ordered
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <h2>Products</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="By default, vendor prices can be set manually in the product detail form. If your vendors provide you with pricelist files, this option allows you to easily import them into the system from ‘Purchase > Vendor Pricelists’ menu.">
+                            <div class="o_setting_left_pane">
+                                <field name="group_manage_vendor_price"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="group_manage_vendor_price"/>
+                                <div class="text-muted">
+                                    Import vendor pricelists
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('group_manage_vendor_price', '=', False)]}">
+                                    <div class="mt16">
+                                        <a class="btn-link fa fa-arrow-right" target="_blank" href="https://www.odoo.com/documentation/user/10.0/general/base_import/import_faq.html">
+                                        How to import
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <field name="is_installed_sale" invisible="1"/>
+                    <h2 attrs="{'invisible': [('is_installed_sale', '=', False)]}">Logistics</h2>
+                    <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('is_installed_sale', '=', False)]}" title="This adds a dropshipping route to apply on products in order to request your vendors to deliver to your customers. A product to dropship will generate a purchase request for quotation once the sales order confirmed. This is a on-demand flow. The requested delivery address will be the customer delivery address and not your warehouse.">
+                            <div class="o_setting_left_pane">
+                                <field name="module_stock_dropshipping"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_stock_dropshipping"/>
+                                <div class="text-muted">
+                                    Request your vendors to deliver to your customers
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="action_purchase_configuration" model="ir.actions.act_window">
+        <field name="name">Configure Purchases</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module' : 'purchase'}</field>
+    </record>
+
+    <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config"
+        sequence="0" action="action_purchase_configuration" groups="base.group_system"/>
+
+    <record id="res_config_settings_view_form_account" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.purchase.account</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="account_budget" position="before">
+                <div class="col-xs-12 col-md-6 o_setting_box" title="Allows you to specify an analytic account on purchase order lines." groups="account.group_account_user">
+                    <div class="o_setting_left_pane">
+                        <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label string="Purchase Analytics" for="group_analytic_account_for_purchases"/>
+                        <div class="text-muted">
+                            Set analytic accounts in purchase orders
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+
+    <record id="res_config_settings_view_form_stock" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.purchase.stock</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="purchase_po_lead" position="replace">
+                <div class="col-xs-12 col-md-6 o_setting_box" title="Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays.">
+                    <div class="o_setting_left_pane">
+                        <field name="use_po_lead"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="use_po_lead"/>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                        <div class="text-muted">
+                            Schedule receivings earlier to avoid delays
+                        </div>
+                        <div class="content-group">
+                            <div class="mt16" attrs="{'invisible': [('use_po_lead','=',False)]}">
+                                <span>Move forward expected delivery dates by <field name="po_lead" class="oe_inline"/> days</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-md-6 o_setting_box" title="Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).  By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules.">
+                    <div class="o_setting_left_pane">
+                        <field name="module_stock_calendar"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="module_stock_calendar"/>
+                        <div class="text-muted">
+                            Adapt reordering scheduling with vendor's open days calendar
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/purchase/views/stock_config_settings_views.xml b/addons/purchase/views/stock_config_settings_views.xml
deleted file mode 100644
index 88e7a8c0e4f..00000000000
--- a/addons/purchase/views/stock_config_settings_views.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="stock_config_settings_view_form_inherit_purchase" model="ir.ui.view">
-            <field name="name">stock.config.settings.view.form.inherit.purchase</field>
-            <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="stock.view_stock_config_settings"/>
-            <field name="arch" type="xml">
-                <div id="purchase_po_lead" position="replace">
-                    <div class="col-xs-12 col-md-6 o_setting_box" title="Margin of error for vendor lead times. When the system generates Purchase Orders for reordering products,they will be scheduled that many days earlier to cope with unexpected vendor delays.">
-                        <div class="o_setting_left_pane">
-                            <field name="use_po_lead"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="use_po_lead"/>
-                            <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                            <div class="text-muted">
-                                Schedule receivings earlier to avoid delays
-                            </div>
-                            <div class="content-group">
-                                <div class="mt16" attrs="{'invisible': [('use_po_lead','=',False)]}">
-                                    <span>Move forward expected delivery dates by <field name="po_lead" class="oe_inline"/> days</span>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box" title="Scheduled dates of requests for quotation generated from reordering rules are based on vendor lead times (defined on products).  By default, such a scheduling is made on calendar days. This option allow to adapt the scheduling with vendor calendars to set on reordering rules.">
-                        <div class="o_setting_left_pane">
-                            <field name="module_stock_calendar"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="module_stock_calendar"/>
-                            <div class="text-muted">
-                                Adapt reordering scheduling with vendor's open days calendar
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </field>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/purchase_requisition/__manifest__.py b/addons/purchase_requisition/__manifest__.py
index e8a24e48d54..a345ae30def 100644
--- a/addons/purchase_requisition/__manifest__.py
+++ b/addons/purchase_requisition/__manifest__.py
@@ -19,7 +19,7 @@ are agreements you have with vendors to benefit from a predetermined pricing.
         'security/ir.model.access.csv',
         'data/purchase_requisition_data.xml',
         'views/purchase_requisition_views.xml',
-        'views/purchase_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'report/purchase_requisition_report.xml',
         'report/report_purchaserequisition.xml',
     ],
diff --git a/addons/purchase_requisition/views/purchase_config_settings_views.xml b/addons/purchase_requisition/views/res_config_settings_views.xml
index 04b6edccf15..ba0e177460c 100644
--- a/addons/purchase_requisition/views/purchase_config_settings_views.xml
+++ b/addons/purchase_requisition/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="view_purchase_configuration_inherit_purchase_requisition" model="ir.ui.view">
-        <field name="name">purchase.config.settings.form.inherit.purchase.requisition</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.purchase.requisition</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
+        <field name="inherit_id" ref="purchase.res_config_settings_view_form_purchase"/>
         <field name="arch" type="xml">
             <div id="use_purchase_requisition" position="replace">
                 <div class="mt16">
diff --git a/addons/rating_project/__manifest__.py b/addons/rating_project/__manifest__.py
index 1b7ab3038f6..3222ae86b8f 100644
--- a/addons/rating_project/__manifest__.py
+++ b/addons/rating_project/__manifest__.py
@@ -13,7 +13,7 @@ This module Allows a customer to give rating on Project.
     ],
     'data': [
         'data/project_data.xml',
-        'views/project_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/project_view.xml',
     ],
     'demo': ['data/project_demo.xml'],
diff --git a/addons/rating_project/views/project_config_settings_views.xml b/addons/rating_project/views/res_config_settings_views.xml
index 46299de5587..e5e6857ad07 100644
--- a/addons/rating_project/views/project_config_settings_views.xml
+++ b/addons/rating_project/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="project_config_settings_view_form_inherit_rating_project" model="ir.ui.view">
-        <field name="name">project.config.settings.form.inherit.rating.project</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.rating.project</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="project.project_config_settings_view_form"/>
+        <field name="inherit_id" ref="project.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_module_rating_project" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_rating_project', '=', False)]}">
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index 7a280137939..662edad980c 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -29,7 +29,7 @@ This module contains all the common features of Sales Management and eCommerce.
         'views/sale_templates.xml',
         'views/sale_portal_templates.xml',
         'views/sale_layout_category_view.xml',
-        'views/sale_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/sale_demo.xml',
diff --git a/addons/sale/models/__init__.py b/addons/sale/models/__init__.py
index 72ef1e44f9e..ec077e25adc 100644
--- a/addons/sale/models/__init__.py
+++ b/addons/sale/models/__init__.py
@@ -10,6 +10,6 @@ from . import res_company
 from . import res_partner
 from . import sale
 from . import sale_analytic
-from . import sale_config_settings
+from . import res_config_settings
 from . import sale_layout
 from . import sales_team
\ No newline at end of file
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/res_config_settings.py
index 627a63f21d9..ac8588ebe56 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class SaleConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -121,7 +121,7 @@ class SaleConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(SaleConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         ICPSudo = self.env['ir.config_parameter'].sudo()
         sale_pricelist_setting = ICPSudo.get_param('sale.sale_pricelist_setting')
         res.update(
@@ -138,7 +138,7 @@ class SaleConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(SaleConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         ICPSudo = self.env['ir.config_parameter'].sudo()
         ICPSudo.set_param('auth_signup.allow_uninvited', repr(self.auth_signup_uninvited == 'b2c'))
         ICPSudo.set_param("sale.use_sale_note", self.use_sale_note)
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index ec1d102cdaa..d56f42d4eb2 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="sale_config_settings_view_form" model="ir.ui.view">
-        <field name="name">sale.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="3"/>
-        <field name="inherit_id" ref="base.res_config_setting_form" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('settings')]" position="inside">
                 <div class="app_settings_block" data-string="Sales" data-key="sale_management" groups="sales_team.group_sale_manager">
@@ -351,7 +351,7 @@
         <field name="name">Configure Sales</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.config.settings</field>
-        <field name="view_id" ref="sale_config_settings_view_form"/>
+        <field name="view_id" ref="res_config_settings_view_form"/>
         <field name="view_mode">form</field>
         <field name="target">inline</field>
         <field name="context">{'module' : 'sale_management'}</field>
diff --git a/addons/sale_stock/__manifest__.py b/addons/sale_stock/__manifest__.py
index 8d63ed20dd8..b21d32013d5 100644
--- a/addons/sale_stock/__manifest__.py
+++ b/addons/sale_stock/__manifest__.py
@@ -31,8 +31,7 @@ You can choose flexible invoicing methods:
         'security/ir.model.access.csv',
         'views/sale_order_views.xml',
         'views/stock_views.xml',
-        'views/sale_config_settings_views.xml',
-        'views/stock_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/account_invoice_views.xml',
         'report/sale_order_report_templates.xml',
         'report/stock_report_deliveryslip.xml',
diff --git a/addons/sale_stock/models/__init__.py b/addons/sale_stock/models/__init__.py
index 71d84fbca4f..bdec99be319 100644
--- a/addons/sale_stock/models/__init__.py
+++ b/addons/sale_stock/models/__init__.py
@@ -6,6 +6,5 @@ from . import procurement
 from . import product
 from . import res_company
 from . import sale_order
-from . import sale_config_settings
-from . import stock_config_settings
+from . import res_config_settings
 from . import stock
diff --git a/addons/sale_stock/models/stock_config_settings.py b/addons/sale_stock/models/res_config_settings.py
index a852d386291..bd15f1e904d 100644
--- a/addons/sale_stock/models/stock_config_settings.py
+++ b/addons/sale_stock/models/res_config_settings.py
@@ -4,10 +4,14 @@
 from odoo import api, fields, models
 
 
-class StockConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    security_lead = fields.Float(related='company_id.security_lead')
+    security_lead = fields.Float(related='company_id.security_lead', string="Security Lead Time")
+    group_route_so_lines = fields.Boolean("Order-Specific Routes",
+        implied_group='sale_stock.group_route_so_lines')
+    module_sale_order_dates = fields.Boolean("Delivery Date")
+    group_display_incoterm = fields.Boolean("Incoterms", implied_group='sale_stock.group_display_incoterm')
     use_security_lead = fields.Boolean(
         string="Security Lead Time for Sales",
         oldname='default_new_security_lead',
@@ -23,12 +27,12 @@ class StockConfigSettings(models.TransientModel):
             self.security_lead = 0.0
 
     def get_values(self):
-        res = super(StockConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             use_security_lead=self.env['ir.config_parameter'].sudo().get_param('sale_stock.use_security_lead')
         )
         return res
 
     def set_values(self):
-        super(StockConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('sale_stock.use_security_lead', self.use_security_lead)
diff --git a/addons/sale_stock/models/sale_config_settings.py b/addons/sale_stock/models/sale_config_settings.py
deleted file mode 100644
index b1d0dbbcff0..00000000000
--- a/addons/sale_stock/models/sale_config_settings.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import fields, models
-
-
-class SaleConfiguration(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    security_lead = fields.Float(related='company_id.security_lead', string="Security Lead Time")
-    group_route_so_lines = fields.Boolean("Order-Specific Routes",
-        implied_group='sale_stock.group_route_so_lines')
-    module_sale_order_dates = fields.Boolean("Delivery Date")
-    group_display_incoterm = fields.Boolean("Incoterms", implied_group='sale_stock.group_display_incoterm')
diff --git a/addons/sale_stock/views/res_config_settings_views.xml b/addons/sale_stock/views/res_config_settings_views.xml
new file mode 100644
index 00000000000..cf734b0dd66
--- /dev/null
+++ b/addons/sale_stock/views/res_config_settings_views.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="res_config_settings_view_form_sale" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale.stock.sale</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="sale.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='delivery']" position="after">
+                <div class="col-xs-12 col-md-6 o_setting_box" title="By default Odoo computes the expected delivery date this way: order date + highest customer lead time of products. With this option, you can set a specific delivery date on orders rather than setting lead times on products.">
+                    <div class="o_setting_left_pane">
+                        <field name="module_sale_order_dates"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="module_sale_order_dates"/>
+                        <div class="text-muted">
+                            Set a delivery date on orders
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                        <field name="group_display_incoterm"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="group_display_incoterm"/>
+                        <div class="text-muted">
+                            Display incoterms on orders &amp; invoices
+                        </div>
+                        <div class="content-group" attrs="{'invisible': [('group_display_incoterm','=',False)]}">
+                            <div class="mt16">
+                                <button name="%(stock.action_incoterms_tree)d" icon="fa-arrow-right" type="action" string="Incoterms" class="btn-link"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-md-6 o_setting_box" title="This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form.">
+                    <div class="o_setting_left_pane">
+                        <field name="group_route_so_lines"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="group_route_so_lines"/>
+                        <div class="text-muted">
+                            Apply special routes from orders (e.g. dropshipping, MTO)
+                        </div>
+                        <div class="content-group" attrs="{'invisible': [('group_route_so_lines','=',False)]}">
+                            <div class="mt16">
+                                <button name="%(stock.action_routes_form)d" icon="fa-arrow-right" type="action" string="Routes for Sales Order Lines" class="btn-link" context="{'default_sale_selectable': 1}"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="res_config_settings_view_form_stock" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale.stock.stock</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <div id="warning_info" position="after">
+                <div class="col-xs-12 col-md-6 o_setting_box" title="Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs. By default, the scheduler runs automatically every 24 hours.">
+                    <div class="o_setting_right_pane">
+                        <label for="module_procurement_jit"/>
+                        <div class="text-muted">
+                            When to reserve sold products
+                        </div>
+                        <div class="content-group">
+                            <div class="mt16">
+                                <field name="module_procurement_jit" class="o_light_label" widget="radio"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-md-6 o_setting_box">
+                    <div class="o_setting_right_pane">
+                        <label for="default_picking_policy"/>
+                        <div class="text-muted">
+                            When to start shipping
+                        </div>
+                        <div class="content-group">
+                            <div class="mt16">
+                                <field name="default_picking_policy" class="o_light_label" widget="selection"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="sale_security_lead" position="replace">
+                <div class="col-xs-12 col-md-6 o_setting_box" title="Margin of error for dates promised to customers. Products will be scheduled for procurement and delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain.">
+                    <div class="o_setting_left_pane">
+                        <field name="use_security_lead"/>
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="use_security_lead"/>
+                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                        <div class="text-muted">
+                            Schedule deliveries earlier to avoid delays
+                        </div>
+                        <div class="content-group">
+                            <div class="mt16" attrs="{'invisible': [('use_security_lead','=',False)]}">
+                                <span>Move forward expected delivery dates by <field name="security_lead" class="oe_inline"/> days</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/sale_stock/views/sale_config_settings_views.xml b/addons/sale_stock/views/sale_config_settings_views.xml
deleted file mode 100644
index 7d7f60acb2c..00000000000
--- a/addons/sale_stock/views/sale_config_settings_views.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="sale_config_settings_view_form_inherit_sale_stock" model="ir.ui.view">
-        <field name="name">sale.config.settings.inherit.sale_stock</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="sale.sale_config_settings_view_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@id='delivery']" position="after">
-                <div class="col-xs-12 col-md-6 o_setting_box" title="By default Odoo computes the expected delivery date this way: order date + highest customer lead time of products. With this option, you can set a specific delivery date on orders rather than setting lead times on products.">
-                    <div class="o_setting_left_pane">
-                        <field name="module_sale_order_dates"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="module_sale_order_dates"/>
-                        <div class="text-muted">
-                            Set a delivery date on orders
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-                        <field name="group_display_incoterm"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="group_display_incoterm"/>
-                        <div class="text-muted">
-                            Display incoterms on orders &amp; invoices
-                        </div>
-                        <div class="content-group" attrs="{'invisible': [('group_display_incoterm','=',False)]}">
-                            <div class="mt16">
-                                <button name="%(stock.action_incoterms_tree)d" icon="fa-arrow-right" type="action" string="Incoterms" class="btn-link"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-6 o_setting_box" title="This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form.">
-                    <div class="o_setting_left_pane">
-                        <field name="group_route_so_lines"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="group_route_so_lines"/>
-                        <div class="text-muted">
-                            Apply special routes from orders (e.g. dropshipping, MTO)
-                        </div>
-                        <div class="content-group" attrs="{'invisible': [('group_route_so_lines','=',False)]}">
-                            <div class="mt16">
-                                <button name="%(stock.action_routes_form)d" icon="fa-arrow-right" type="action" string="Routes for Sales Order Lines" class="btn-link" context="{'default_sale_selectable': 1}"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>
diff --git a/addons/sale_stock/views/stock_config_settings_views.xml b/addons/sale_stock/views/stock_config_settings_views.xml
deleted file mode 100644
index 894de6f7bda..00000000000
--- a/addons/sale_stock/views/stock_config_settings_views.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="stock_config_settings_view_form_inherit_sale_stock" model="ir.ui.view">
-        <field name="name">stock.config.settings.inherit.sale.stock</field>
-        <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="stock.view_stock_config_settings"/>
-        <field name="arch" type="xml">
-            <div id="warning_info" position="after">
-                <div class="col-xs-12 col-md-6 o_setting_box" title="Reserving products manually in delivery orders or by running the scheduler is advised to better manage priorities in case of long customer lead times or/and frequent stock-outs. By default, the scheduler runs automatically every 24 hours.">
-                    <div class="o_setting_right_pane">
-                        <label for="module_procurement_jit"/>
-                        <div class="text-muted">
-                            When to reserve sold products
-                        </div>
-                        <div class="content-group">
-                            <div class="mt16">
-                                <field name="module_procurement_jit" class="o_light_label" widget="radio"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-6 o_setting_box">
-                    <div class="o_setting_right_pane">
-                        <label for="default_picking_policy"/>
-                        <div class="text-muted">
-                            When to start shipping
-                        </div>
-                        <div class="content-group">
-                            <div class="mt16">
-                                <field name="default_picking_policy" class="o_light_label" widget="selection"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div id="sale_security_lead" position="replace">
-                <div class="col-xs-12 col-md-6 o_setting_box" title="Margin of error for dates promised to customers. Products will be scheduled for procurement and delivery that many days earlier than the actual promised date, to cope with unexpected delays in the supply chain.">
-                    <div class="o_setting_left_pane">
-                        <field name="use_security_lead"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="use_security_lead"/>
-                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                        <div class="text-muted">
-                            Schedule deliveries earlier to avoid delays
-                        </div>
-                        <div class="content-group">
-                            <div class="mt16" attrs="{'invisible': [('use_security_lead','=',False)]}">
-                                <span>Move forward expected delivery dates by <field name="security_lead" class="oe_inline"/> days</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </field>
-    </record>
-
-</odoo>
diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py
index 87a456b3e3e..9343ca71f7f 100644
--- a/addons/sale_timesheet/__manifest__.py
+++ b/addons/sale_timesheet/__manifest__.py
@@ -24,7 +24,7 @@ have real delivered quantities in sales orders.
         'views/project_task_views.xml',
         'views/procurement_views.xml',
         'views/hr_timesheet_views.xml',
-        'views/res_config_views.xml',
+        'views/res_config_settings_views.xml',
         'views/hr_timesheet_templates.xml',
     ],
     'demo': [
diff --git a/addons/sale_timesheet/views/res_config_views.xml b/addons/sale_timesheet/views/res_config_settings_views.xml
index be8bf6f9c39..7315c9ce029 100644
--- a/addons/sale_timesheet/views/res_config_views.xml
+++ b/addons/sale_timesheet/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
-    <record id="hr_timesheet_config_settings_view_form" model="ir.ui.view">
-        <field name="name">hr.timesheet.config.settings.view.form</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale.timesheet</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_config_settings_view_form"/>
+        <field name="inherit_id" ref="hr_timesheet.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='msg_module_sale_timesheet']" position="replace">
                 <div class="content-group" name="msg_module_sale_timesheet" attrs="{'invisible': [('module_sale_timesheet', '=', False)]}">
diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index 3c3509539db..5a27f9ff20c 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -57,7 +57,7 @@
         'views/stock_move_line_views.xml',
         'views/stock_move_views.xml',
         'views/product_views.xml',
-        'views/stock_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/report_stock_traceability.xml',
         'views/stock_template.xml',
 
diff --git a/addons/stock/models/__init__.py b/addons/stock/models/__init__.py
index 16f84e77ab4..bd6f1102672 100644
--- a/addons/stock/models/__init__.py
+++ b/addons/stock/models/__init__.py
@@ -7,7 +7,7 @@ from . import procurement
 from . import product_strategy
 from . import res_company
 from . import res_partner
-from . import stock_config_settings
+from . import res_config_settings
 from . import stock_incoterms
 from . import stock_inventory
 from . import stock_location
diff --git a/addons/stock/models/stock_config_settings.py b/addons/stock/models/res_config_settings.py
index abe49ec59ef..e57e7e51cbf 100644
--- a/addons/stock/models/stock_config_settings.py
+++ b/addons/stock/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class StockConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     company_id = fields.Many2one(
@@ -68,7 +68,7 @@ class StockConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(StockConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             use_propagation_minimum_delta=self.env['ir.config_parameter'].sudo().get_param('stock.use_propagation_minimum_delta')
         )
@@ -76,7 +76,7 @@ class StockConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(StockConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('stock.use_propagation_minimum_delta', self.use_propagation_minimum_delta)
         """ If we are not in multiple locations, we can deactivate the internal
         operation types of the warehouses, so they won't appear in the dashboard.
diff --git a/addons/stock/views/stock_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 6210299ce77..4598effc6bb 100644
--- a/addons/stock/views/stock_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="view_stock_config_settings" model="ir.ui.view">
-            <field name="name">stock settings</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.stock</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="6"/>
-            <field name="inherit_id" ref="base.res_config_setting_form" />
+            <field name="inherit_id" ref="base.res_config_settings_view_form" />
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside" >
                     <div class="app_settings_block" data-string="Inventory" data-key="stock" groups="stock.group_stock_manager">
diff --git a/addons/stock_account/__manifest__.py b/addons/stock_account/__manifest__.py
index ffd04e663d8..4ee5c1b8468 100644
--- a/addons/stock_account/__manifest__.py
+++ b/addons/stock_account/__manifest__.py
@@ -33,7 +33,7 @@ Dashboard / Reports for Warehouse Management includes:
         'wizard/wizard_valuation_history_views.xml',
         'views/product_views.xml',
         'views/stock_account_views.xml',
-        'views/stock_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/product_data.xml',
         'data/stock_account_data.xml',
         'data/stock_account_data_post_install.yml',
diff --git a/addons/stock_account/models/__init__.py b/addons/stock_account/models/__init__.py
index 7ba53628062..707d4618bda 100644
--- a/addons/stock_account/models/__init__.py
+++ b/addons/stock_account/models/__init__.py
@@ -6,4 +6,4 @@ from . import account_invoice
 from . import account_move
 from . import product
 from . import stock
-from . import stock_config_settings
+from . import res_config_settings
diff --git a/addons/stock_account/models/stock_config_settings.py b/addons/stock_account/models/res_config_settings.py
index 9f4ceb849fa..3fa7481036f 100644
--- a/addons/stock_account/models/stock_config_settings.py
+++ b/addons/stock_account/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class StockConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_stock_landed_costs = fields.Boolean("Landed Costs",
diff --git a/addons/stock_account/views/stock_config_settings_views.xml b/addons/stock_account/views/res_config_settings_views.xml
index 7b67e803572..9453a8c763f 100644
--- a/addons/stock_account/views/stock_config_settings_views.xml
+++ b/addons/stock_account/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <record id="view_stock_config_settings_inherit" model="ir.ui.view">
-            <field name="name">stock.config.settings.inherit</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.stock.account</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="stock.view_stock_config_settings"/>
+            <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="production_lot_info" position="after">
                     <h2>Costing</h2>
diff --git a/addons/stock_landed_costs/__manifest__.py b/addons/stock_landed_costs/__manifest__.py
index a04bc7eeaff..767c538c8bb 100644
--- a/addons/stock_landed_costs/__manifest__.py
+++ b/addons/stock_landed_costs/__manifest__.py
@@ -21,7 +21,7 @@ This module allows you to easily add extra costs on pickings and decide the spli
         'data/stock_landed_cost_data.xml',
         'views/product_views.xml',
         'views/stock_landed_cost_views.xml',
-        'views/stock_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'test': [
         # '../account/test/account_minimal_test.xml',
diff --git a/addons/stock_landed_costs/views/stock_config_settings_views.xml b/addons/stock_landed_costs/views/res_config_settings_views.xml
index 510c0346922..4117f94c4d7 100644
--- a/addons/stock_landed_costs/views/stock_config_settings_views.xml
+++ b/addons/stock_landed_costs/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="view_stock_config_settings_inherit_landed_cost" model="ir.ui.view">
-        <field name="name">stock.config.settings.inherit.landed.cost</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.stock.landed.costs</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="stock.view_stock_config_settings"/>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div name="landed_cost_info" position="replace">
                 <div class="mt16" attrs="{'invisible': [('module_stock_landed_costs','=',False)]}">
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 8ab5925f81e..b84896b5f63 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -19,7 +19,7 @@
         'views/website_navbar_templates.xml',
         'views/snippets.xml',
         'views/website_views.xml',
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/ir_actions_views.xml',
         'wizard/base_language_install_views.xml',
         'data/web_planner_data.xml',
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index 99fd60cddd5..48ab2e710f6 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -10,4 +10,4 @@ from . import ir_ui_view
 from . import res_company
 from . import res_partner
 from . import web_planner
-from . import website_config_settings
+from . import res_config_settings
diff --git a/addons/website/models/website_config_settings.py b/addons/website/models/res_config_settings.py
index ff7295eaed3..052ab83d080 100644
--- a/addons/website/models/website_config_settings.py
+++ b/addons/website/models/res_config_settings.py
@@ -5,7 +5,7 @@ from odoo import api, fields, models
 from odoo.exceptions import AccessDenied
 
 
-class WebsiteConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     def _default_website(self):
@@ -77,7 +77,7 @@ class WebsiteConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(WebsiteConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         get_param = self.env['ir.config_parameter'].sudo().get_param
         res.update(
             auth_signup_uninvited='b2c' if get_param('auth_signup.allow_uninvited', 'False').lower() == 'true' else 'b2b',
@@ -91,7 +91,7 @@ class WebsiteConfigSettings(models.TransientModel):
     def set_values(self):
         if not self.user_has_groups('website.group_website_designer'):
             raise AccessDenied()
-        super(WebsiteConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         set_param = self.env['ir.config_parameter'].sudo().set_param
         set_param('auth_signup.allow_uninvited', repr(self.auth_signup_uninvited == 'b2c'))
         set_param('website.has_google_analytics', self.has_google_analytics)
diff --git a/addons/website/views/website_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 240e5e1d857..b5942f60d2c 100644
--- a/addons/website/views/website_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -2,11 +2,11 @@
 <odoo>
 
 
-        <record id="website_config_settings_view_form" model="ir.ui.view">
-            <field name="name">website.config.settings.form</field>
+        <record id="res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.website</field>
             <field name="model">res.config.settings</field>
             <field name="priority" eval="4"/>
-            <field name="inherit_id" ref="base.res_config_setting_form"/>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('settings')]" position="inside">
                     <div class="app_settings_block" data-string="Website" data-key="website" groups="website.group_website_designer">
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index e549a5ca173..626eb6e25fa 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -10,7 +10,7 @@
     'data': [
         'data/website_crm_data.xml',
         'views/website_crm_templates.xml',
-        'views/website_crm_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_crm/models/__init__.py b/addons/website_crm/models/__init__.py
index 3a501e9196d..7ac0406ee23 100644
--- a/addons/website_crm/models/__init__.py
+++ b/addons/website_crm/models/__init__.py
@@ -2,4 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import crm_lead
-from . import website_crm_config_settings
+from . import res_config_settings
diff --git a/addons/website_crm/models/website_crm_config_settings.py b/addons/website_crm/models/res_config_settings.py
index 6606041cf25..8f29ae1ebb3 100644
--- a/addons/website_crm/models/website_crm_config_settings.py
+++ b/addons/website_crm/models/res_config_settings.py
@@ -3,7 +3,7 @@
 from odoo import fields, models
 
 
-class WebsiteCrmConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     def _get_crm_default_team_domain(self):
diff --git a/addons/website_crm/views/website_crm_config_settings_views.xml b/addons/website_crm/views/res_config_settings_views.xml
index 778266b662d..1256859a53c 100644
--- a/addons/website_crm/views/website_crm_config_settings_views.xml
+++ b/addons/website_crm/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="website_config_settings_view_form_inherit_website_crm" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.crm</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.crm</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.website_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_contact_form_install_setting" position="after">
                 <div class="content-group mt16" attrs="{'invisible': [('module_website_crm', '=', False)]}">
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index cd93d9b580c..10bf8af2006 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -10,7 +10,7 @@
     'depends': ['website', 'website_partner', 'website_mail', 'event'],
     'data': [
         'data/event_data.xml',
-        'views/event_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/event_templates.xml',
         'views/event_views.xml',
         'security/ir.model.access.csv',
diff --git a/addons/website_event/views/event_config_settings_views.xml b/addons/website_event/views/res_config_settings_views.xml
index 428d97357d5..1b65dab7571 100644
--- a/addons/website_event/views/event_config_settings_views.xml
+++ b/addons/website_event/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="event_config_settings_view_form_inherit_website" model="ir.ui.view">
-        <field name="name">event.config.settings.view.form.inherit.website</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.event</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="event.event_config_settings_view_form"/>
+        <field name="inherit_id" ref="event.res_config_settings_view_form"/>
         <field name="arch" type="xml"> 
             <div name="event_settings_website" position="after">
                 <div class="col-xs-12 col-md-6 o_setting_box">
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index cb789e6b5f3..01b92138f5c 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -15,7 +15,7 @@ It also will include the feedback tool for the livechat, and web pages to displa
     'auto_install': True,
     'data': [
         'views/website_livechat.xml',
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/website_livechat_view.xml',
         'security/ir.model.access.csv',
         'security/website_livechat.xml',
diff --git a/addons/website_livechat/models/__init__.py b/addons/website_livechat/models/__init__.py
index f90e6c892b0..13835e02e09 100644
--- a/addons/website_livechat/models/__init__.py
+++ b/addons/website_livechat/models/__init__.py
@@ -2,4 +2,4 @@
 
 from . import im_livechat
 from . import website
-from . import website_config_settings
\ No newline at end of file
+from . import res_config_settings
\ No newline at end of file
diff --git a/addons/website_livechat/models/website_config_settings.py b/addons/website_livechat/models/res_config_settings.py
index 15203959d05..6b0c96cd2e0 100644
--- a/addons/website_livechat/models/website_config_settings.py
+++ b/addons/website_livechat/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class WebsiteConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     channel_id = fields.Many2one('im_livechat.channel', string='Website Live Channel', related='website_id.channel_id')
diff --git a/addons/website_livechat/views/website_config_settings_views.xml b/addons/website_livechat/views/res_config_settings_views.xml
index 09427149fc7..1e012a9ec73 100644
--- a/addons/website_livechat/views/website_config_settings_views.xml
+++ b/addons/website_livechat/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="website_config_settings_view_form_inherit_website_livechat" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.livechat</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.livechat</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.website_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_module_website_livechat" position="replace">
                 <div class="content-group mt16" attrs="{'invisible': [('module_website_livechat', '=', False)]}">
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index f2253996f94..ac3d34c0e1c 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -15,7 +15,7 @@ Add a snippet in the website builder to subscribe a mass_mailing list
         'views/unsubscribe_templates.xml',
         'views/snippets_templates.xml',
         'views/mass_mailing_view.xml',
-        'views/mass_mailing_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'auto_install': True,
 }
diff --git a/addons/website_mass_mailing/models/__init__.py b/addons/website_mass_mailing/models/__init__.py
index 18a7a1b26b2..c9e39e466ca 100644
--- a/addons/website_mass_mailing/models/__init__.py
+++ b/addons/website_mass_mailing/models/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import mass_mailing_config_settings
+from . import res_config_settings
 from . import mass_mailing_list
diff --git a/addons/website_mass_mailing/models/mass_mailing_config_settings.py b/addons/website_mass_mailing/models/res_config_settings.py
index 3a35c6cd501..b39a9eb10b1 100644
--- a/addons/website_mass_mailing/models/mass_mailing_config_settings.py
+++ b/addons/website_mass_mailing/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models
 
 
-class MassMailingConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     group_website_popup_on_exit = fields.Boolean(string="Website Popup", implied_group="website_mass_mailing.group_website_popup_on_exit")
diff --git a/addons/website_mass_mailing/views/mass_mailing_config_settings_views.xml b/addons/website_mass_mailing/views/res_config_settings_views.xml
index 7aca9bba06f..f9366ed6160 100644
--- a/addons/website_mass_mailing/views/mass_mailing_config_settings_views.xml
+++ b/addons/website_mass_mailing/views/res_config_settings_views.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="inherited_view_mass_mailing_configuration" model="ir.ui.view">
-        <field name="inherit_id" ref="mass_mailing.view_mass_mailing_configuration"/>
-        <field name="name">mass.mailing.config.settings.inherit</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="inherit_id" ref="mass_mailing.res_config_settings_view_form"/>
+        <field name="name">res.config.settings.view.form.inherit.website.mass.mailing</field>
         <field name="model">res.config.settings</field>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='mailing_list']" position="inside">
diff --git a/addons/website_quote/__manifest__.py b/addons/website_quote/__manifest__.py
index 2e02e12fba9..e6a0a1c274f 100644
--- a/addons/website_quote/__manifest__.py
+++ b/addons/website_quote/__manifest__.py
@@ -16,7 +16,7 @@
         'views/sale_order_views.xml',
         'views/sale_quote_views.xml',
         'views/website_quote_templates.xml',
-        'views/sale_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [
diff --git a/addons/website_quote/models/__init__.py b/addons/website_quote/models/__init__.py
index 87c70f6e984..08bb5a18917 100644
--- a/addons/website_quote/models/__init__.py
+++ b/addons/website_quote/models/__init__.py
@@ -4,4 +4,4 @@
 from .import sale_order
 from .import sale_quote
 from .import product_template
-from .import sale_config_settings
+from .import res_config_settings
diff --git a/addons/website_quote/models/sale_config_settings.py b/addons/website_quote/models/res_config_settings.py
index 1460c007ade..356606164ac 100644
--- a/addons/website_quote/models/sale_config_settings.py
+++ b/addons/website_quote/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class SaleConfiguration(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     default_template_id = fields.Many2one('sale.quote.template', default_model='sale.order', string='Default Template')
diff --git a/addons/website_quote/views/sale_config_settings_views.xml b/addons/website_quote/views/res_config_settings_views.xml
index dea51f4030c..6af5203e6c2 100644
--- a/addons/website_quote/views/sale_config_settings_views.xml
+++ b/addons/website_quote/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="sale_config_settings_view_form_inherit_website_quote" model="ir.ui.view">
-        <field name="name">sale.config.settings.view.form.inherit.website.quote</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.quote</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="sale.sale_config_settings_view_form"/>
+        <field name="inherit_id" ref="sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@id='website_quote']" position="after">
                 <div class="content-group">
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index 4a30dbdf0c1..a6e1e9d3cbc 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -21,7 +21,7 @@
         'views/payment_views.xml',
         'views/snippets.xml',
         'views/report_shop_saleorder.xml',
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
     ],
     'demo': [
         'data/demo.xml',
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index 94adf33f350..dd9c198c5c7 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -6,4 +6,4 @@ from . import ir_http
 from . import product
 from . import sale_order
 from . import website
-from . import website_config_settings
+from . import res_config_settings
diff --git a/addons/website_sale/models/website_config_settings.py b/addons/website_sale/models/res_config_settings.py
index 1fd68d02bb2..fe1229553d2 100644
--- a/addons/website_sale/models/website_config_settings.py
+++ b/addons/website_sale/models/res_config_settings.py
@@ -3,7 +3,7 @@
 
 from odoo import api, models, fields
 
-class WebsiteConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     def _default_order_mail_template(self):
@@ -86,7 +86,7 @@ class WebsiteConfigSettings(models.TransientModel):
 
     @api.model
     def get_values(self):
-        res = super(WebsiteConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         params = self.env['ir.config_parameter'].sudo()
 
         sale_delivery_settings = 'none'
@@ -108,7 +108,7 @@ class WebsiteConfigSettings(models.TransientModel):
         return res
 
     def set_values(self):
-        super(WebsiteConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         value = self.module_account_invoicing and self.default_invoice_policy == 'order' and self.automatic_invoice
         self.env['ir.config_parameter'].sudo().set_param('website_sale.automatic_invoice', value)
         self.env['ir.config_parameter'].sudo().set_param('sale.sale_pricelist_setting', self.sale_pricelist_setting)
diff --git a/addons/website_sale/views/website_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index 5c2d79758e5..f7d2e762056 100644
--- a/addons/website_sale/views/website_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="website_config_settings_view_form_inherit_website_sale" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.sale</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.sale</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.website_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="features_settings" position="after">
                 <h2>Pricing</h2>
diff --git a/addons/website_sale_delivery/__manifest__.py b/addons/website_sale_delivery/__manifest__.py
index 2383d8246fa..7672cd20592 100644
--- a/addons/website_sale_delivery/__manifest__.py
+++ b/addons/website_sale_delivery/__manifest__.py
@@ -12,7 +12,7 @@ Delivery Costs
     'data': [
         'views/website_sale_delivery_templates.xml',
         'views/website_sale_delivery_views.xml',
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'data/website_sale_delivery_data.xml'
     ],
     'demo': [
diff --git a/addons/website_sale_delivery/views/website_config_settings_views.xml b/addons/website_sale_delivery/views/res_config_settings_views.xml
index 4a237364c09..16c14d66973 100644
--- a/addons/website_sale_delivery/views/website_config_settings_views.xml
+++ b/addons/website_sale_delivery/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="website_config_settings_view_form_inherit_sale_delivery" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.delivery</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.sale.delivery</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website_sale.website_config_settings_view_form_inherit_website_sale"/>
+        <field name="inherit_id" ref="website_sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_delivery_method_setting" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_website_sale_delivery', '=', False)]}">
diff --git a/addons/website_sale_stock/__manifest__.py b/addons/website_sale_stock/__manifest__.py
index ea18f8555de..4f34872fff5 100644
--- a/addons/website_sale_stock/__manifest__.py
+++ b/addons/website_sale_stock/__manifest__.py
@@ -14,7 +14,7 @@
     'auto_install': True,
     'data': [
         'views/product_template_views.xml',
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/website_sale_stock_templates.xml'
     ]
 }
diff --git a/addons/website_sale_stock/models/__init__.py b/addons/website_sale_stock/models/__init__.py
index f7b7e68cc5f..65614897665 100644
--- a/addons/website_sale_stock/models/__init__.py
+++ b/addons/website_sale_stock/models/__init__.py
@@ -4,5 +4,5 @@
 from . import website
 from . import product_product
 from . import product_template
-from . import website_config_settings
+from . import res_config_settings
 from . import sale_order
diff --git a/addons/website_sale_stock/models/website_config_settings.py b/addons/website_sale_stock/models/res_config_settings.py
index 13e31506edb..04152d8ccb3 100644
--- a/addons/website_sale_stock/models/website_config_settings.py
+++ b/addons/website_sale_stock/models/res_config_settings.py
@@ -4,7 +4,7 @@
 from odoo import fields, models, api
 
 
-class WebsiteConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     inventory_availability = fields.Selection([
@@ -17,14 +17,14 @@ class WebsiteConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(WebsiteConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         IrDefault = self.env['ir.default'].sudo()
         IrDefault.set('product.template', 'inventory_availability', self.inventory_availability)
         IrDefault.set('product.template', 'available_threshold', self.available_threshold if self.inventory_availability == 'threshold' else None)
 
     @api.model
     def get_values(self):
-        res = super(WebsiteConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         IrDefault = self.env['ir.default'].sudo()
         res.update(inventory_availability=IrDefault.get('product.template', 'inventory_availability') or 'never',
                    available_threshold=IrDefault.get('product.template', 'available_threshold') or 5.0)
diff --git a/addons/website_sale_stock/views/website_config_settings_views.xml b/addons/website_sale_stock/views/res_config_settings_views.xml
index 6ac56054fdc..b35f6210b22 100644
--- a/addons/website_sale_stock/views/website_config_settings_views.xml
+++ b/addons/website_sale_stock/views/res_config_settings_views.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="website_config_settings_view_form_inherit_website_sale_stock" model="ir.ui.view">
-        <field name="name">website.config.settings.inherit.website.sale.stock</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.sale.stock</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website_sale.website_config_settings_view_form_inherit_website_sale" />
+        <field name="inherit_id" ref="website_sale.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//div[@id='product_availability_setting']" position="attributes">
                 <attribute name="title">Manage the inventory of your products and display their availability status on the website.</attribute>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index f0755ab62b4..388234c6e7e 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -18,7 +18,7 @@ Share and Publish Videos, Presentations and Documents'
 """,
     'depends': ['website', 'website_mail'],
     'data': [
-        'views/website_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/website_slides.xml',
         'views/website_slides_embed.xml',
         'views/website_slides_backend.xml',
diff --git a/addons/website_slides/models/__init__.py b/addons/website_slides/models/__init__.py
index 2644fb217ef..63cd0092c43 100644
--- a/addons/website_slides/models/__init__.py
+++ b/addons/website_slides/models/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from . import slides
-from . import website_config_settings
+from . import res_config_settings
diff --git a/addons/website_slides/models/website_config_settings.py b/addons/website_slides/models/res_config_settings.py
index e1b0c837774..65c8604bc53 100644
--- a/addons/website_slides/models/website_config_settings.py
+++ b/addons/website_slides/models/res_config_settings.py
@@ -4,14 +4,14 @@
 from odoo import api, fields, models
 
 
-class WebsiteConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     website_slide_google_app_key = fields.Char(string='Google Doc Key')
 
     @api.model
     def get_values(self):
-        res = super(WebsiteConfigSettings, self).get_values()
+        res = super(ResConfigSettings, self).get_values()
         res.update(
             website_slide_google_app_key=self.env['ir.config_parameter'].sudo().get_param('website_slides.google_app_key'),
         )
@@ -19,5 +19,5 @@ class WebsiteConfigSettings(models.TransientModel):
 
     @api.multi
     def set_values(self):
-        super(WebsiteConfigSettings, self).set_values()
+        super(ResConfigSettings, self).set_values()
         self.env['ir.config_parameter'].sudo().set_param('website_slides.google_app_key', self.website_slide_google_app_key)
diff --git a/addons/website_slides/views/website_config_settings_views.xml b/addons/website_slides/views/res_config_settings_views.xml
index c06fb9789fa..5ff3e5ff8fc 100644
--- a/addons/website_slides/views/website_config_settings_views.xml
+++ b/addons/website_slides/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="website_config_settings_view_form_inherit_website_slides" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.slides</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.slides</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.website_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_slides_install_setting" position="replace">
                 <div class="content-group" groups="base.group_no_one" attrs="{'invisible': [('module_website_slides', '=', False)]}">
diff --git a/addons/website_twitter/__manifest__.py b/addons/website_twitter/__manifest__.py
index afb8eebe129..34e43edd8ca 100644
--- a/addons/website_twitter/__manifest__.py
+++ b/addons/website_twitter/__manifest__.py
@@ -16,7 +16,7 @@ Display best tweets
     'data': [
         'security/ir.model.access.csv',
         'data/website_twitter_data.xml',
-        'views/website_twitter_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/website_twitter_snippet_templates.xml'
     ],
     'installable': True,
diff --git a/addons/website_twitter/models/__init__.py b/addons/website_twitter/models/__init__.py
index ceedf4344e6..037801e8540 100644
--- a/addons/website_twitter/models/__init__.py
+++ b/addons/website_twitter/models/__init__.py
@@ -2,5 +2,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import website_twitter
-from . import website_twitter_config
+from . import res_config_settings
 from . import website_twitter_tweet
diff --git a/addons/website_twitter/models/website_twitter_config.py b/addons/website_twitter/models/res_config_settings.py
index a23be06e403..b3ff02ae5d8 100644
--- a/addons/website_twitter/models/website_twitter_config.py
+++ b/addons/website_twitter/models/res_config_settings.py
@@ -23,7 +23,7 @@ TWITTER_EXCEPTION = {
 }
 
 
-class WebsiteTwitterConfig(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     twitter_api_key = fields.Char(
@@ -63,14 +63,14 @@ class WebsiteTwitterConfig(models.TransientModel):
 
     @api.model
     def create(self, vals):
-        TwitterConfig = super(WebsiteTwitterConfig, self).create(vals)
+        TwitterConfig = super(ResConfigSettings, self).create(vals)
         if vals.get('twitter_api_key') or vals.get('twitter_api_secret') or vals.get('twitter_screen_name'):
             TwitterConfig._check_twitter_authorization()
         return TwitterConfig
 
     @api.multi
     def write(self, vals):
-        TwitterConfig = super(WebsiteTwitterConfig, self).write(vals)
+        TwitterConfig = super(ResConfigSettings, self).write(vals)
         if vals.get('twitter_api_key') or vals.get('twitter_api_secret') or vals.get('twitter_screen_name'):
             self._check_twitter_authorization()
         return TwitterConfig
diff --git a/addons/website_twitter/views/website_twitter_settings_views.xml b/addons/website_twitter/views/res_config_settings_views.xml
index 02f337fbfcd..5d195470256 100644
--- a/addons/website_twitter/views/website_twitter_settings_views.xml
+++ b/addons/website_twitter/views/res_config_settings_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="website_config_settings_view_form_inherit_website_twitter" model="ir.ui.view">
-        <field name="name">website.config.settings.form.inherit.twitter</field>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.website.twitter</field>
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="website.website_config_settings_view_form"/>
+        <field name="inherit_id" ref="website.res_config_settings_view_form"/>
         <field name="arch" type="xml">
             <div id="msg_twitter_roller_install_setting" position="replace">
                 <div class="content-group" attrs="{'invisible': [('module_website_twitter', '=', False)]}">