7 files changed, 28 insertions, 17 deletions
diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index 2d8d43ffe0c..c511b44fb73 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -11,8 +11,14 @@ class ResConfigSettings(models.TransientModel):
     group_multi_company = fields.Boolean("Manage multiple companies", implied_group='base.group_multi_company')
     company_id = fields.Many2one('res.company', string='Company', required=True,
         default=lambda self: self.env.user.company_id)
-    default_user_rights = fields.Boolean("Default Access Rights", config_parameter='base_setup.default_user_rights')
-    default_external_email_server = fields.Boolean("External Email Servers", config_parameter='base_setup.default_external_email_server')
+    user_default_rights = fields.Boolean(
+        "Default Access Rights",
+        config_parameter='base_setup.default_user_rights',
+        oldname='default_user_rights')
+    external_email_server_default = fields.Boolean(
+        "External Email Servers",
+        config_parameter='base_setup.default_external_email_server',
+        oldname='default_external_email_server')
     module_base_import = fields.Boolean("Allow users to import data from CSV/XLS/XLSX/ODS files")
     module_google_calendar = fields.Boolean(
         string='Allow the users to synchronize their calendar  with Google Calendar')
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 12b60ef5914..a58f3e0d808 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -50,17 +50,17 @@
                         </div>
                         <div id="emails"/>
                         <h2>Users</h2>
-                        <div class="row mt16 o_settings_container" id="default_user_rights">
+                        <div class="row mt16 o_settings_container" id="user_default_rights">
                             <div class="col-xs-12 col-md-6 o_setting_box"  title="By default, new users get highest access rights for all installed apps." id="access_rights">
                                 <div class="o_setting_left_pane">
-                                    <field name="default_user_rights"/>
+                                    <field name="user_default_rights"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label string="Access Rights" for="default_user_rights"/>
+                                    <label string="Access Rights" for="user_default_rights"/>
                                     <div class="text-muted">
                                         Set custom access rights for new users
                                     </div>
-                                    <div class="content-group" attrs="{'invisible': [('default_user_rights','=',False)]}">
+                                    <div class="content-group" attrs="{'invisible': [('user_default_rights','=',False)]}">
                                         <div class="mt16">
                                             <button type="object" name="open_default_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
                                         </div>
diff --git a/addons/mail/views/res_config_settings_views.xml b/addons/mail/views/res_config_settings_views.xml
index 94a3c6065e1..8450b6de760 100644
--- a/addons/mail/views/res_config_settings_views.xml
+++ b/addons/mail/views/res_config_settings_views.xml
@@ -25,14 +25,14 @@
                         </div>
                         <div class="col-xs-12 col-md-6 o_setting_box" title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com).">
                             <div class="o_setting_left_pane">
-                                <field name="default_external_email_server"/>
+                                <field name="external_email_server_default"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="default_external_email_server"/>
-                                <div class="text-muted" id="default_external_email_server">
+                                <label for="external_email_server_default"/>
+                                <div class="text-muted" id="external_email_server_default">
                                     Use your own email servers
                                 </div>
-                                <div class="content-group"  attrs="{'invisible': [('default_external_email_server', '=', False)]}">
+                                <div class="content-group"  attrs="{'invisible': [('external_email_server_default', '=', False)]}">
                                     <div class="row mt16" id="mail_alias_domain">
                                         <label for="alias_domain" class="col-md-3 o_light_label"/>
                                         <field name="alias_domain" placeholder="mycompany.odoo.com"/>
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 99d3bf6d291..e7d345a1e19 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -57,12 +57,12 @@ class ResConfigSettings(models.TransientModel):
         ], 'Invoicing Policy',
         default='order',
         default_model='product.template')
-    default_deposit_product_id = fields.Many2one(
+    deposit_default_product_id = fields.Many2one(
         'product.product',
         'Deposit Product',
         domain="[('type', '=', 'service')]",
         config_parameter='sale.default_deposit_product_id',
-        oldname='deposit_product_id_setting',
+        oldname='default_deposit_product_id',
         help='Default product used for payment advances')
     auto_done_setting = fields.Boolean("Lock Confirmed Sales", config_parameter='sale.auto_done_setting')
     module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 58e3909a720..970c2722c95 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -371,7 +371,7 @@
                                     Product used for down payments
                                 </div>
                                 <div class="text-muted">
-                                    <field name="default_deposit_product_id"/>
+                                    <field name="deposit_default_product_id"/>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py
index 20b6f0703a0..351919e2397 100644
--- a/addons/website/models/res_config_settings.py
+++ b/addons/website/models/res_config_settings.py
@@ -18,8 +18,13 @@ class ResConfigSettings(models.TransientModel):
     website_name = fields.Char('Website Name', related='website_id.name')
     language_ids = fields.Many2many(related='website_id.language_ids', relation='res.lang')
     language_count = fields.Integer(string='Number of languages', compute='_compute_language_count', readonly=True)
-    default_lang_id = fields.Many2one(string='Default language', related='website_id.default_lang_id', relation='res.lang', required=True)
-    default_lang_code = fields.Char('Default language code', related='website_id.default_lang_code')
+    website_default_lang_id = fields.Many2one(
+        string='Default language', related='website_id.default_lang_id',
+        relation='res.lang', required=True,
+        oldname='default_lang_id')
+    website_default_lang_code = fields.Char(
+        'Default language code', related='website_id.default_lang_code',
+        oldname='default_lang_code')
     google_analytics_key = fields.Char('Google Analytics Key', related='website_id.google_analytics_key')
     google_management_client_id = fields.Char('Google Client ID', related='website_id.google_management_client_id')
     google_management_client_secret = fields.Char('Google Client Secret', related='website_id.google_management_client_secret')
diff --git a/addons/website/views/res_config_settings_views.xml b/addons/website/views/res_config_settings_views.xml
index 1f43ae1b157..63e407fb9e0 100644
--- a/addons/website/views/res_config_settings_views.xml
+++ b/addons/website/views/res_config_settings_views.xml
@@ -43,8 +43,8 @@
                                             </div>
                                             <field name="language_count" invisible="1"/>
                                             <div class="mt8" attrs="{'invisible':[('language_count', '&lt;', 2)]}">
-                                                <label class="o_light_label mr8" string="Default" for="default_lang_id"/>
-                                                <field name="default_lang_id" widget="selection"/>
+                                                <label class="o_light_label mr8" string="Default" for="website_default_lang_id"/>
+                                                <field name="website_default_lang_id" widget="selection"/>
                                             </div>
                                         </div>
                                         <div>