diff --git a/addons/base_setup/models/res_config_settings.py b/addons/base_setup/models/res_config_settings.py
index ff6dc35bc3c..083d846d245 100644
--- a/addons/base_setup/models/res_config_settings.py
+++ b/addons/base_setup/models/res_config_settings.py
@@ -22,7 +22,7 @@ class ResConfigSettings(models.TransientModel):
         string='Allow the users to synchronize their calendar  with Google Calendar')
     module_microsoft_calendar = fields.Boolean(
         string='Allow the users to synchronize their calendar with Outlook Calendar')
-    module_mail_client_extension = fields.Boolean(
+    module_mail_plugin = fields.Boolean(
         string='Allow integration with the mail plugins'
     )
     module_google_drive = fields.Boolean("Attach Google documents to any record")
diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index ecc361dc8fd..b27a1d51a52 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -210,12 +210,12 @@
 
                         <h2>Integrations</h2>
                         <div class="row mt16 o_settings_container" name="integration">
-                            <div class="col-12 col-lg-6 o_setting_box" id="mail_client_extension_setting">
+                            <div class="col-12 col-lg-6 o_setting_box" id="mail_pluggin_setting">
                                 <div class="o_setting_left_pane">
-                                    <field name="module_mail_client_extension" />
+                                    <field name="module_mail_plugin" />
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label string="Mail Client Extension" for="module_mail_client_extension"/>
+                                    <label string="Mail Plugin" for="module_mail_plugin"/>
                                     <a href="https://www.odoo.com/documentation/user/crm/optimize/outlook_extension.html" title="Documentation" class="o_doc_link" target="_blank"></a>
                                     <div class="text-muted">
                                         Integrate with mail client plugins
diff --git a/addons/crm_mail_client_extension/__init__.py b/addons/crm_mail_plugin/__init__.py
similarity index 100%
rename from addons/crm_mail_client_extension/__init__.py
rename to addons/crm_mail_plugin/__init__.py
diff --git a/addons/crm_mail_client_extension/__manifest__.py b/addons/crm_mail_plugin/__manifest__.py
similarity index 82%
rename from addons/crm_mail_client_extension/__manifest__.py
rename to addons/crm_mail_plugin/__manifest__.py
index b3f2a016cf8..aec93db3e10 100644
--- a/addons/crm_mail_client_extension/__manifest__.py
+++ b/addons/crm_mail_plugin/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'CRM Mail Client Extension',
+    'name': 'CRM Mail Plugin',
     'version': '1.0',
     'category': 'Sales/CRM',
     'sequence': 5,
@@ -11,10 +11,10 @@
     'website': 'https://www.odoo.com/page/crm',
     'depends': [
         'crm',
-        'mail_client_extension',
+        'mail_plugin',
     ],
     'data': [
-        'views/crm_mail_client_extension_lead.xml',
+        'views/crm_mail_plugin_lead.xml',
         'views/crm_lead_views.xml'
     ],
     'installable': True,
diff --git a/addons/crm_mail_client_extension/controllers/__init__.py b/addons/crm_mail_plugin/controllers/__init__.py
similarity index 100%
rename from addons/crm_mail_client_extension/controllers/__init__.py
rename to addons/crm_mail_plugin/controllers/__init__.py
diff --git a/addons/crm_mail_client_extension/controllers/crm_client.py b/addons/crm_mail_plugin/controllers/crm_client.py
similarity index 96%
rename from addons/crm_mail_client_extension/controllers/crm_client.py
rename to addons/crm_mail_plugin/controllers/crm_client.py
index 459f65100b8..fccee1dee7d 100644
--- a/addons/crm_mail_client_extension/controllers/crm_client.py
+++ b/addons/crm_mail_plugin/controllers/crm_client.py
@@ -35,7 +35,7 @@ class CrmClient(http.Controller):
             deprecated as of saas-14.3, not needed for newer versions of the mail plugin but necessary
             for supporting older versions
         """
-        server_action = http.request.env.ref("crm_mail_client_extension.lead_creation_prefilled_action")
+        server_action = http.request.env.ref("crm_mail_plugin.lead_creation_prefilled_action")
         return werkzeug.utils.redirect(
             '/web#action=%s&model=crm.lead&partner_id=%s' % (server_action.id, int(partner_id)))
 
diff --git a/addons/crm_mail_client_extension/controllers/mail_plugin.py b/addons/crm_mail_plugin/controllers/mail_plugin.py
similarity index 97%
rename from addons/crm_mail_client_extension/controllers/mail_plugin.py
rename to addons/crm_mail_plugin/controllers/mail_plugin.py
index c25ad893169..ebde2a99e51 100644
--- a/addons/crm_mail_client_extension/controllers/mail_plugin.py
+++ b/addons/crm_mail_plugin/controllers/mail_plugin.py
@@ -6,7 +6,7 @@ import logging
 from odoo.http import request
 from odoo.tools.misc import formatLang
 
-from odoo.addons.mail_client_extension.controllers import mail_plugin
+from odoo.addons.mail_plugin.controllers import mail_plugin
 
 _logger = logging.getLogger(__name__)
 
diff --git a/addons/crm_mail_client_extension/models/__init__.py b/addons/crm_mail_plugin/models/__init__.py
similarity index 100%
rename from addons/crm_mail_client_extension/models/__init__.py
rename to addons/crm_mail_plugin/models/__init__.py
diff --git a/addons/crm_mail_client_extension/models/crm_lead.py b/addons/crm_mail_plugin/models/crm_lead.py
similarity index 100%
rename from addons/crm_mail_client_extension/models/crm_lead.py
rename to addons/crm_mail_plugin/models/crm_lead.py
diff --git a/addons/crm_mail_client_extension/views/crm_lead_views.xml b/addons/crm_mail_plugin/views/crm_lead_views.xml
similarity index 100%
rename from addons/crm_mail_client_extension/views/crm_lead_views.xml
rename to addons/crm_mail_plugin/views/crm_lead_views.xml
diff --git a/addons/crm_mail_client_extension/views/crm_mail_client_extension_lead.xml b/addons/crm_mail_plugin/views/crm_mail_plugin_lead.xml
similarity index 100%
rename from addons/crm_mail_client_extension/views/crm_mail_client_extension_lead.xml
rename to addons/crm_mail_plugin/views/crm_mail_plugin_lead.xml
diff --git a/addons/mail_client_extension/__init__.py b/addons/mail_plugin/__init__.py
similarity index 100%
rename from addons/mail_client_extension/__init__.py
rename to addons/mail_plugin/__init__.py
diff --git a/addons/mail_client_extension/__manifest__.py b/addons/mail_plugin/__manifest__.py
similarity index 86%
rename from addons/mail_client_extension/__manifest__.py
rename to addons/mail_plugin/__manifest__.py
index 62f19489363..62fbdfe95ea 100644
--- a/addons/mail_client_extension/__manifest__.py
+++ b/addons/mail_plugin/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Mail Client Extension',
+    'name': 'Mail Plugin',
     'version': '1.0',
     'category': 'Sales/CRM',
     'sequence': 5,
@@ -14,7 +14,7 @@
         'iap'
     ],
     'data': [
-        'views/mail_client_extension_login.xml',
+        'views/mail_plugin_login.xml',
     ],
     'installable': True,
     'application': False,
diff --git a/addons/mail_client_extension/controllers/__init__.py b/addons/mail_plugin/controllers/__init__.py
similarity index 100%
rename from addons/mail_client_extension/controllers/__init__.py
rename to addons/mail_plugin/controllers/__init__.py
diff --git a/addons/mail_client_extension/controllers/authenticate.py b/addons/mail_plugin/controllers/authenticate.py
similarity index 96%
rename from addons/mail_client_extension/controllers/authenticate.py
rename to addons/mail_plugin/controllers/authenticate.py
index 7c96423d12b..72523d78592 100644
--- a/addons/mail_client_extension/controllers/authenticate.py
+++ b/addons/mail_plugin/controllers/authenticate.py
@@ -26,7 +26,7 @@ class Authenticate(http.Controller):
          old route name "/mail_client_extension/auth is deprecated as of saas-14.3,it is not needed for newer
          versions of the mail plugin but necessary for supporting older versions
          """
-        return request.render('mail_client_extension.app_auth', values)
+        return request.render('mail_plugin.app_auth', values)
 
     @http.route(['/mail_client_extension/auth/confirm', '/mail_plugin/auth/confirm'], type='http', auth="user", methods=['POST'])
     def auth_confirm(self, scope, friendlyname, redirect, info=None, do=None, **kw):
@@ -75,7 +75,7 @@ class Authenticate(http.Controller):
         data, auth_code_signature = auth_code.split('.')
         data = base64.b64decode(data)
         auth_code_signature = base64.b64decode(auth_code_signature)
-        signature = odoo.tools.misc.hmac(request.env(su=True), 'mail_client_extension', data).encode()
+        signature = odoo.tools.misc.hmac(request.env(su=True), 'mail_plugin', data).encode()
         if not hmac.compare_digest(auth_code_signature, signature):
             return None
 
@@ -98,7 +98,7 @@ class Authenticate(http.Controller):
             'uid': request.uid,
         }
         auth_message = json.dumps(auth_dict, sort_keys=True).encode()
-        signature = odoo.tools.misc.hmac(request.env(su=True), 'mail_client_extension', auth_message).encode()
+        signature = odoo.tools.misc.hmac(request.env(su=True), 'mail_plugin', auth_message).encode()
         auth_code = "%s.%s" % (base64.b64encode(auth_message).decode(), base64.b64encode(signature).decode())
         _logger.info('Auth code created - user %s, scope %s', request.env.user, scope)
         return auth_code
diff --git a/addons/mail_client_extension/controllers/mail_plugin.py b/addons/mail_plugin/controllers/mail_plugin.py
similarity index 100%
rename from addons/mail_client_extension/controllers/mail_plugin.py
rename to addons/mail_plugin/controllers/mail_plugin.py
diff --git a/addons/mail_client_extension/i18n/mail_client_extension.pot b/addons/mail_plugin/i18n/mail_client_extension.pot
similarity index 100%
rename from addons/mail_client_extension/i18n/mail_client_extension.pot
rename to addons/mail_plugin/i18n/mail_client_extension.pot
diff --git a/addons/mail_client_extension/models/__init__.py b/addons/mail_plugin/models/__init__.py
similarity index 100%
rename from addons/mail_client_extension/models/__init__.py
rename to addons/mail_plugin/models/__init__.py
diff --git a/addons/mail_client_extension/models/ir_http.py b/addons/mail_plugin/models/ir_http.py
similarity index 96%
rename from addons/mail_client_extension/models/ir_http.py
rename to addons/mail_plugin/models/ir_http.py
index e69a12324c3..f7bc5628076 100644
--- a/addons/mail_client_extension/models/ir_http.py
+++ b/addons/mail_plugin/models/ir_http.py
@@ -23,4 +23,4 @@ class IrHttp(models.AbstractModel):
             raise BadRequest('Access token invalid')
 
         # take the identity of the API key user
-        request.uid = user_id
\ No newline at end of file
+        request.uid = user_id
diff --git a/addons/mail_client_extension/models/res_partner.py b/addons/mail_plugin/models/res_partner.py
similarity index 100%
rename from addons/mail_client_extension/models/res_partner.py
rename to addons/mail_plugin/models/res_partner.py
diff --git a/addons/mail_client_extension/views/mail_client_extension_login.xml b/addons/mail_plugin/views/mail_plugin_login.xml
similarity index 90%
rename from addons/mail_client_extension/views/mail_client_extension_login.xml
rename to addons/mail_plugin/views/mail_plugin_login.xml
index 6bc3d935954..b322b73096b 100644
--- a/addons/mail_client_extension/views/mail_client_extension_login.xml
+++ b/addons/mail_plugin/views/mail_plugin_login.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <template id="mail_client_extension.app_auth" name="Accept app">
+    <template id="mail_plugin.app_auth" name="Accept app">
         <t t-call="web.login_layout">
             <t t-set="disable_database_manager" t-value="1"/>
-            <form class="oe_login_form" role="form" method="post" action="/mail_client_extension/auth/confirm">
+            <form class="oe_login_form" role="form" method="post" action="/mail_plugin/auth/confirm">
                 <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
                 <input type="hidden" name="redirect" t-att-value="redirect"/>
                 <input type="hidden" name="scope" t-att-value="scope"/>