diff --git a/.tx/config b/.tx/config
index 5b38ce630b7..5acc7ed4c60 100644
--- a/.tx/config
+++ b/.tx/config
@@ -217,9 +217,9 @@ file_filter = addons/crm_iap_lead/i18n/<lang>.po
 source_file = addons/crm_iap_lead/i18n/crm_iap_lead.pot
 source_lang = en
 
-[odoo-master.crm_iap_lead_enrich]
-file_filter = addons/crm_iap_lead_enrich/i18n/<lang>.po
-source_file = addons/crm_iap_lead_enrich/i18n/crm_iap_lead_enrich.pot
+[odoo-master.crm_iap_enrich]
+file_filter = addons/crm_iap_enrich/i18n/<lang>.po
+source_file = addons/crm_iap_enrich/i18n/crm_iap_enrich.pot
 source_lang = en
 
 [odoo-master.crm_iap_lead_website]
diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py
index 70e3ca98420..8512f7972bc 100644
--- a/addons/crm/models/res_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -38,7 +38,7 @@ class ResConfigSettings(models.TransientModel):
     # IAP
     module_crm_iap_lead = fields.Boolean("Generate new leads based on their country, industries, size, etc.")
     module_crm_iap_lead_website = fields.Boolean("Create Leads/Opportunities from your website's traffic")
-    module_crm_iap_lead_enrich = fields.Boolean("Enrich your leads automatically with company data based on their email address.")
+    module_crm_iap_enrich = fields.Boolean("Enrich your leads automatically with company data based on their email address.")
     lead_enrich_auto = fields.Selection([
         ('manual', 'Enrich leads on demand only'),
         ('auto', 'Enrich all leads automatically'),
diff --git a/addons/crm/views/res_config_settings_views.xml b/addons/crm/views/res_config_settings_views.xml
index 4290decd4eb..4c3803c0d54 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -121,18 +121,16 @@
                     <div class="row mt16 o_settings_container" name="convert_visitor_setting_container">
                         <div class="col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_crm_iap_lead_enrich"/>
+                                <field name="module_crm_iap_enrich"/>
                             </div>
 
-                            <div class="o_setting_right_pane" id="crm_iap_lead_enrich">
-                                <label string="Lead Enrichment" for="module_crm_iap_lead_enrich"/>
+                            <div class="o_setting_right_pane" id="crm_iap_enrich_settings">
+                                <label string="Lead Enrichment" for="module_crm_iap_enrich"/>
                                 <div class="text-muted">
                                     Enrich your leads automatically with company data based on their email address
                                 </div>
-                                <div id="crm_iap_lead_enrich">
-                                    <div class="mt8" attrs="{'invisible': [('module_crm_iap_lead_enrich','=',False)]}">
-                                        <field name="lead_enrich_auto" class="o_light_label" widget="radio" required="True"/>
-                                    </div>
+                                <div class="mt8" attrs="{'invisible': [('module_crm_iap_enrich','=',False)]}">
+                                    <field name="lead_enrich_auto" class="o_light_label" widget="radio" required="True"/>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/crm_iap_lead_enrich/__init__.py b/addons/crm_iap_enrich/__init__.py
similarity index 86%
rename from addons/crm_iap_lead_enrich/__init__.py
rename to addons/crm_iap_enrich/__init__.py
index 8a93c379fe1..7d48060de73 100644
--- a/addons/crm_iap_lead_enrich/__init__.py
+++ b/addons/crm_iap_enrich/__init__.py
@@ -8,7 +8,7 @@ from odoo.api import Environment, SUPERUSER_ID
 
 def _synchronize_cron(cr, registry):
     env = Environment(cr, SUPERUSER_ID, {'active_test': False})
-    cron = env.ref('crm_iap_lead_enrich.ir_cron_lead_enrichment')
+    cron = env.ref('crm_iap_enrich.ir_cron_lead_enrichment')
     if cron:
         config = env['ir.config_parameter'].get_param('crm.iap.lead.enrich.setting', 'manual')
         cron.active = config != 'manual'
diff --git a/addons/crm_iap_lead_enrich/__manifest__.py b/addons/crm_iap_enrich/__manifest__.py
similarity index 100%
rename from addons/crm_iap_lead_enrich/__manifest__.py
rename to addons/crm_iap_enrich/__manifest__.py
diff --git a/addons/crm_iap_lead_enrich/data/ir_action.xml b/addons/crm_iap_enrich/data/ir_action.xml
similarity index 100%
rename from addons/crm_iap_lead_enrich/data/ir_action.xml
rename to addons/crm_iap_enrich/data/ir_action.xml
diff --git a/addons/crm_iap_lead_enrich/data/ir_cron.xml b/addons/crm_iap_enrich/data/ir_cron.xml
similarity index 100%
rename from addons/crm_iap_lead_enrich/data/ir_cron.xml
rename to addons/crm_iap_enrich/data/ir_cron.xml
diff --git a/addons/crm_iap_lead_enrich/data/mail_templates.xml b/addons/crm_iap_enrich/data/mail_templates.xml
similarity index 100%
rename from addons/crm_iap_lead_enrich/data/mail_templates.xml
rename to addons/crm_iap_enrich/data/mail_templates.xml
diff --git a/addons/crm_iap_lead_enrich/i18n/ar.po b/addons/crm_iap_enrich/i18n/ar.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/ar.po
rename to addons/crm_iap_enrich/i18n/ar.po
diff --git a/addons/crm_iap_lead_enrich/i18n/crm_iap_lead_enrich.pot b/addons/crm_iap_enrich/i18n/crm_iap_enrich.pot
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/crm_iap_lead_enrich.pot
rename to addons/crm_iap_enrich/i18n/crm_iap_enrich.pot
diff --git a/addons/crm_iap_lead_enrich/i18n/cs.po b/addons/crm_iap_enrich/i18n/cs.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/cs.po
rename to addons/crm_iap_enrich/i18n/cs.po
diff --git a/addons/crm_iap_lead_enrich/i18n/da.po b/addons/crm_iap_enrich/i18n/da.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/da.po
rename to addons/crm_iap_enrich/i18n/da.po
diff --git a/addons/crm_iap_lead_enrich/i18n/de.po b/addons/crm_iap_enrich/i18n/de.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/de.po
rename to addons/crm_iap_enrich/i18n/de.po
diff --git a/addons/crm_iap_lead_enrich/i18n/es.po b/addons/crm_iap_enrich/i18n/es.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/es.po
rename to addons/crm_iap_enrich/i18n/es.po
diff --git a/addons/crm_iap_lead_enrich/i18n/fr.po b/addons/crm_iap_enrich/i18n/fr.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/fr.po
rename to addons/crm_iap_enrich/i18n/fr.po
diff --git a/addons/crm_iap_lead_enrich/i18n/he.po b/addons/crm_iap_enrich/i18n/he.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/he.po
rename to addons/crm_iap_enrich/i18n/he.po
diff --git a/addons/crm_iap_lead_enrich/i18n/hr.po b/addons/crm_iap_enrich/i18n/hr.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/hr.po
rename to addons/crm_iap_enrich/i18n/hr.po
diff --git a/addons/crm_iap_lead_enrich/i18n/hu.po b/addons/crm_iap_enrich/i18n/hu.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/hu.po
rename to addons/crm_iap_enrich/i18n/hu.po
diff --git a/addons/crm_iap_lead_enrich/i18n/it.po b/addons/crm_iap_enrich/i18n/it.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/it.po
rename to addons/crm_iap_enrich/i18n/it.po
diff --git a/addons/crm_iap_lead_enrich/i18n/lb.po b/addons/crm_iap_enrich/i18n/lb.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/lb.po
rename to addons/crm_iap_enrich/i18n/lb.po
diff --git a/addons/crm_iap_lead_enrich/i18n/lt.po b/addons/crm_iap_enrich/i18n/lt.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/lt.po
rename to addons/crm_iap_enrich/i18n/lt.po
diff --git a/addons/crm_iap_lead_enrich/i18n/mn.po b/addons/crm_iap_enrich/i18n/mn.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/mn.po
rename to addons/crm_iap_enrich/i18n/mn.po
diff --git a/addons/crm_iap_lead_enrich/i18n/nb.po b/addons/crm_iap_enrich/i18n/nb.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/nb.po
rename to addons/crm_iap_enrich/i18n/nb.po
diff --git a/addons/crm_iap_lead_enrich/i18n/nl.po b/addons/crm_iap_enrich/i18n/nl.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/nl.po
rename to addons/crm_iap_enrich/i18n/nl.po
diff --git a/addons/crm_iap_lead_enrich/i18n/pl.po b/addons/crm_iap_enrich/i18n/pl.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/pl.po
rename to addons/crm_iap_enrich/i18n/pl.po
diff --git a/addons/crm_iap_lead_enrich/i18n/pt.po b/addons/crm_iap_enrich/i18n/pt.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/pt.po
rename to addons/crm_iap_enrich/i18n/pt.po
diff --git a/addons/crm_iap_lead_enrich/i18n/pt_BR.po b/addons/crm_iap_enrich/i18n/pt_BR.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/pt_BR.po
rename to addons/crm_iap_enrich/i18n/pt_BR.po
diff --git a/addons/crm_iap_lead_enrich/i18n/ro.po b/addons/crm_iap_enrich/i18n/ro.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/ro.po
rename to addons/crm_iap_enrich/i18n/ro.po
diff --git a/addons/crm_iap_lead_enrich/i18n/ru.po b/addons/crm_iap_enrich/i18n/ru.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/ru.po
rename to addons/crm_iap_enrich/i18n/ru.po
diff --git a/addons/crm_iap_lead_enrich/i18n/tr.po b/addons/crm_iap_enrich/i18n/tr.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/tr.po
rename to addons/crm_iap_enrich/i18n/tr.po
diff --git a/addons/crm_iap_lead_enrich/i18n/uk.po b/addons/crm_iap_enrich/i18n/uk.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/uk.po
rename to addons/crm_iap_enrich/i18n/uk.po
diff --git a/addons/crm_iap_lead_enrich/i18n/vi.po b/addons/crm_iap_enrich/i18n/vi.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/vi.po
rename to addons/crm_iap_enrich/i18n/vi.po
diff --git a/addons/crm_iap_lead_enrich/i18n/zh_CN.po b/addons/crm_iap_enrich/i18n/zh_CN.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/zh_CN.po
rename to addons/crm_iap_enrich/i18n/zh_CN.po
diff --git a/addons/crm_iap_lead_enrich/i18n/zh_TW.po b/addons/crm_iap_enrich/i18n/zh_TW.po
similarity index 100%
rename from addons/crm_iap_lead_enrich/i18n/zh_TW.po
rename to addons/crm_iap_enrich/i18n/zh_TW.po
diff --git a/addons/crm_iap_lead_enrich/models/__init__.py b/addons/crm_iap_enrich/models/__init__.py
similarity index 100%
rename from addons/crm_iap_lead_enrich/models/__init__.py
rename to addons/crm_iap_enrich/models/__init__.py
diff --git a/addons/crm_iap_lead_enrich/models/crm_lead.py b/addons/crm_iap_enrich/models/crm_lead.py
similarity index 94%
rename from addons/crm_iap_lead_enrich/models/crm_lead.py
rename to addons/crm_iap_enrich/models/crm_lead.py
index 53494592542..bd10c879143 100644
--- a/addons/crm_iap_lead_enrich/models/crm_lead.py
+++ b/addons/crm_iap_enrich/models/crm_lead.py
@@ -59,7 +59,7 @@ class Lead(models.Model):
                         normalized_email = tools.email_normalize(lead.email_from)
                         if not normalized_email:
                             lead.message_post_with_view(
-                                'crm_iap_lead_enrich.mail_message_lead_enrich_no_email',
+                                'crm_iap_enrich.mail_message_lead_enrich_no_email',
                                 subtype_id=self.env.ref('mail.mt_note').id)
                             continue
 
@@ -68,7 +68,7 @@ class Lead(models.Model):
                         if email_domain in iap_tools._MAIL_DOMAIN_BLACKLIST:
                             lead.write({'iap_enrich_done': True})
                             lead.message_post_with_view(
-                                'crm_iap_lead_enrich.mail_message_lead_enrich_notfound',
+                                'crm_iap_enrich.mail_message_lead_enrich_notfound',
                                 subtype_id=self.env.ref('mail.mt_note').id)
                         else:
                             lead_emails[lead.id] = email_domain
@@ -83,7 +83,7 @@ class Lead(models.Model):
                                     'url': self.env['iap.account'].get_credits_url('reveal'),
                                 }
                                 leads[0].message_post_with_view(
-                                    'crm_iap_lead_enrich.mail_message_lead_enrich_no_credit',
+                                    'crm_iap_enrich.mail_message_lead_enrich_no_credit',
                                     values=data,
                                     subtype_id=self.env.ref('mail.mt_note').id)
                             # Since there are no credits left, there is no point to process the other batches
@@ -110,7 +110,7 @@ class Lead(models.Model):
             iap_data = iap_response.get(str(lead.id))
             if not iap_data:
                 lead.write({'iap_enrich_done': True})
-                lead.message_post_with_view('crm_iap_lead_enrich.mail_message_lead_enrich_notfound', subtype_id=self.env.ref('mail.mt_note').id)
+                lead.message_post_with_view('crm_iap_enrich.mail_message_lead_enrich_notfound', subtype_id=self.env.ref('mail.mt_note').id)
                 continue
 
             values = {'iap_enrich_done': True}
diff --git a/addons/crm_iap_lead_enrich/models/res_config_settings.py b/addons/crm_iap_enrich/models/res_config_settings.py
similarity index 82%
rename from addons/crm_iap_lead_enrich/models/res_config_settings.py
rename to addons/crm_iap_enrich/models/res_config_settings.py
index e04dbc57c9e..64a439f2207 100644
--- a/addons/crm_iap_lead_enrich/models/res_config_settings.py
+++ b/addons/crm_iap_enrich/models/res_config_settings.py
@@ -10,12 +10,12 @@ class ResConfigSettings(models.TransientModel):
     @api.model
     def get_values(self):
         values = super(ResConfigSettings, self).get_values()
-        cron = self.sudo().with_context(active_test=False).env.ref('crm_iap_lead_enrich.ir_cron_lead_enrichment', raise_if_not_found=False)
+        cron = self.sudo().with_context(active_test=False).env.ref('crm_iap_enrich.ir_cron_lead_enrichment', raise_if_not_found=False)
         values['lead_enrich_auto'] = 'auto' if cron and cron.active else 'manual'
         return values
 
     def set_values(self):
         super(ResConfigSettings, self).set_values()
-        cron = self.sudo().with_context(active_test=False).env.ref('crm_iap_lead_enrich.ir_cron_lead_enrichment', raise_if_not_found=False)
+        cron = self.sudo().with_context(active_test=False).env.ref('crm_iap_enrich.ir_cron_lead_enrichment', raise_if_not_found=False)
         if cron:
             cron.active = self.lead_enrich_auto == 'auto'
diff --git a/addons/crm_iap_lead_enrich/tests/__init__.py b/addons/crm_iap_enrich/tests/__init__.py
similarity index 100%
rename from addons/crm_iap_lead_enrich/tests/__init__.py
rename to addons/crm_iap_enrich/tests/__init__.py
diff --git a/addons/crm_iap_lead_enrich/tests/test_lead_enrich.py b/addons/crm_iap_enrich/tests/test_lead_enrich.py
similarity index 100%
rename from addons/crm_iap_lead_enrich/tests/test_lead_enrich.py
rename to addons/crm_iap_enrich/tests/test_lead_enrich.py
diff --git a/addons/crm_iap_lead_enrich/views/crm_lead_views.xml b/addons/crm_iap_enrich/views/crm_lead_views.xml
similarity index 100%
rename from addons/crm_iap_lead_enrich/views/crm_lead_views.xml
rename to addons/crm_iap_enrich/views/crm_lead_views.xml
diff --git a/addons/crm_iap_lead_enrich/views/res_config_settings_view.xml b/addons/crm_iap_enrich/views/res_config_settings_view.xml
similarity index 84%
rename from addons/crm_iap_lead_enrich/views/res_config_settings_view.xml
rename to addons/crm_iap_enrich/views/res_config_settings_view.xml
index 832f88e44a3..70dae0bd791 100644
--- a/addons/crm_iap_lead_enrich/views/res_config_settings_view.xml
+++ b/addons/crm_iap_enrich/views/res_config_settings_view.xml
@@ -2,7 +2,7 @@
 <data>
 
     <record id="res_config_settings_view_form" model="ir.ui.view">
-        <field name="name">crm_iap_lead_enrich rechargement</field>
+        <field name="name">res.config.settings.view.form.inherit.crm.iap.enrich</field>
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="crm.res_config_settings_view_form"/>
         <field name="arch" type="xml">