diff --git a/.tx/config b/.tx/config
index 5b38ce630b7..a0a2d819e63 100644
--- a/.tx/config
+++ b/.tx/config
@@ -212,19 +212,14 @@ file_filter = addons/crm/i18n/<lang>.po
 source_file = addons/crm/i18n/crm.pot
 source_lang = en
 
-[odoo-master.crm_iap_lead]
-file_filter = addons/crm_iap_lead/i18n/<lang>.po
-source_file = addons/crm_iap_lead/i18n/crm_iap_lead.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_enrich]
-file_filter = addons/crm_iap_lead_enrich/i18n/<lang>.po
-source_file = addons/crm_iap_lead_enrich/i18n/crm_iap_lead_enrich.pot
-source_lang = en
-
-[odoo-master.crm_iap_lead_website]
-file_filter = addons/crm_iap_lead_website/i18n/<lang>.po
-source_file = addons/crm_iap_lead_website/i18n/crm_iap_lead_website.pot
+[odoo-master.crm_iap_mine]
+file_filter = addons/crm_iap_mine/i18n/<lang>.po
+source_file = addons/crm_iap_mine/i18n/crm_iap_mine.pot
 source_lang = en
 
 [odoo-master.crm_livechat]
@@ -1007,6 +1002,11 @@ file_filter = addons/website_crm/i18n/<lang>.po
 source_file = addons/website_crm/i18n/website_crm.pot
 source_lang = en
 
+[odoo-master.website_crm_iap_reveal]
+file_filter = addons/website_crm_iap_reveal/i18n/<lang>.po
+source_file = addons/website_crm_iap_reveal/i18n/website_crm_iap_reveal.pot
+source_lang = en
+
 [odoo-master.website_crm_livechat]
 file_filter = addons/website_crm_livechat/i18n/<lang>.po
 source_file = addons/website_crm_livechat/i18n/website_crm_livechat.pot
diff --git a/addons/crm/models/res_config_settings.py b/addons/crm/models/res_config_settings.py
index 70e3ca98420..587d49aa38c 100644
--- a/addons/crm/models/res_config_settings.py
+++ b/addons/crm/models/res_config_settings.py
@@ -36,9 +36,9 @@ class ResConfigSettings(models.TransientModel):
         string="Auto Assignment Next Execution Date", compute='_compute_crm_auto_assignment_data',
         readonly=False, store=True)
     # 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_mine = fields.Boolean("Generate new leads based on their country, industries, size, etc.")
+    module_crm_iap_enrich = fields.Boolean("Enrich your leads automatically with company data based on their email address.")
+    module_website_crm_iap_reveal = fields.Boolean("Create Leads/Opportunities from your website's traffic")
     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..8571e2ddcf0 100644
--- a/addons/crm/views/res_config_settings_views.xml
+++ b/addons/crm/views/res_config_settings_views.xml
@@ -121,29 +121,27 @@
                     <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>
 
                         <div class="col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_crm_iap_lead"/>
+                                <field name="module_crm_iap_mine"/>
                             </div>
 
-                            <div class="o_setting_right_pane" id="crm_iap_lead_settings">
-                                <label string="Lead Mining" for="module_crm_iap_lead"/>
+                            <div class="o_setting_right_pane" id="crm_iap_mine_settings">
+                                <label string="Lead Mining" for="module_crm_iap_mine"/>
                                 <a href="https://www.odoo.com/documentation/14.0/applications/sales/crm/acquire_leads/lead_mining.html" title="Documentation" class="o_doc_link" target="_blank"></a>
                                 <div class="text-muted">
                                     Generate new leads based on their country, industry, size, etc.
@@ -155,11 +153,11 @@
                     <div class="row mt16 o_settings_container" name="generate_lead_setting_container">
                         <div class="col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">
-                                <field name="module_crm_iap_lead_website"/>
+                                <field name="module_website_crm_iap_reveal"/>
                             </div>
 
-                            <div class="o_setting_right_pane" id="crm_iap_lead_website_settings">
-                                <label string="Visits to Leads" for="module_crm_iap_lead_website"/>
+                            <div class="o_setting_right_pane" id="website_crm_iap_reveal_settings">
+                                <label string="Visits to Leads" for="module_website_crm_iap_reveal"/>
                                 <div class="text-muted">
                                     Convert visitors of your website into leads and perform data enrichment based on their IP address
                                 </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">
diff --git a/addons/crm_iap_lead/data/crm.iap.lead.industry.csv b/addons/crm_iap_lead/data/crm.iap.lead.industry.csv
deleted file mode 100644
index 1cb9ccb0757..00000000000
--- a/addons/crm_iap_lead/data/crm.iap.lead.industry.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-"id",name,reveal_ids,sequence
-"crm_iap_lead_industry_30_155","Consumer Discretionary","30,155",1
-"crm_iap_lead_industry_33","Consumer Staples","33",4
-"crm_iap_lead_industry_69_157","Banks & Insurance","69,157",2
-"crm_iap_lead_industry_86","Media","86",7
-"crm_iap_lead_industry_114","Real Estate","114",21
-"crm_iap_lead_industry_136","Transportation","136",16
-"crm_iap_lead_industry_138_156","Energy & Utilities ","138",22
-"crm_iap_lead_industry_148","Materials","148",17
-"crm_iap_lead_industry_149","Telecommunication Services","149",20
-"crm_iap_lead_industry_150_151","Consumer Services","150,151",9
-"crm_iap_lead_industry_152","Retailing","152",3
-"crm_iap_lead_industry_153_154","Food, Beverage & Tobacco","153,154",12
-"crm_iap_lead_industry_158_159","Diversified Financials & Financial Services","158,159",15
-"crm_iap_lead_industry_160","Health Care Equipment & Services","160",11
-"crm_iap_lead_industry_161","Pharmaceuticals, Biotechnology & Life Sciences","161",13
-"crm_iap_lead_industry_162","Capital Goods","162",6
-"crm_iap_lead_industry_163","Commercial & Professional Services","163",5
-"crm_iap_lead_industry_165","Software & Services","165",8
-"crm_iap_lead_industry_166","Technology Hardware & Equipment","166",19
-"crm_iap_lead_industry_167","Construction Materials","167",23
-"crm_iap_lead_industry_168","Independent Power and Renewable Electricity Producers","168",14
-"crm_iap_lead_industry_238","Automobiles & Components","238",18
-"crm_iap_lead_industry_239","Consumer Durables & Apparel","239",10
diff --git a/addons/crm_iap_lead/data/crm.iap.lead.role.csv b/addons/crm_iap_lead/data/crm.iap.lead.role.csv
deleted file mode 100644
index ff438c230c7..00000000000
--- a/addons/crm_iap_lead/data/crm.iap.lead.role.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-"id",name,reveal_id
-"crm_iap_lead_role_1","CEO","CEO"
-"crm_iap_lead_role_2","communications","communications"
-"crm_iap_lead_role_3","consulting","consulting"
-"crm_iap_lead_role_4","customer_service","customer_service"
-"crm_iap_lead_role_5","education","education"
-"crm_iap_lead_role_6","engineering","engineering"
-"crm_iap_lead_role_7","finance","finance"
-"crm_iap_lead_role_8","founder","founder"
-"crm_iap_lead_role_9","health_professional","health_professional"
-"crm_iap_lead_role_10","human_resources","human_resources"
-"crm_iap_lead_role_11","information_technology","information_technology"
-"crm_iap_lead_role_12","legal","legal"
-"crm_iap_lead_role_13","marketing","marketing"
-"crm_iap_lead_role_14","operations","operations"
-"crm_iap_lead_role_15","owner","owner"
-"crm_iap_lead_role_16","president","president"
-"crm_iap_lead_role_17","product","product"
-"crm_iap_lead_role_18","public_relations","public_relations"
-"crm_iap_lead_role_19","real_estate","real_estate"
-"crm_iap_lead_role_20","recruiting","recruiting"
-"crm_iap_lead_role_21","research","research"
-"crm_iap_lead_role_22","sale","sale"
diff --git a/addons/crm_iap_lead/data/crm.iap.lead.seniority.csv b/addons/crm_iap_lead/data/crm.iap.lead.seniority.csv
deleted file mode 100644
index c7cceb6655c..00000000000
--- a/addons/crm_iap_lead/data/crm.iap.lead.seniority.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"id",name,reveal_id
-"crm_iap_lead_seniority_1","director","director"
-"crm_iap_lead_seniority_2","executive","executive"
-"crm_iap_lead_seniority_3","manager","manager"
diff --git a/addons/crm_iap_lead/__init__.py b/addons/crm_iap_mine/__init__.py
similarity index 100%
rename from addons/crm_iap_lead/__init__.py
rename to addons/crm_iap_mine/__init__.py
diff --git a/addons/crm_iap_lead/__manifest__.py b/addons/crm_iap_mine/__manifest__.py
similarity index 79%
rename from addons/crm_iap_lead/__manifest__.py
rename to addons/crm_iap_mine/__manifest__.py
index 4ddebfda8e7..c00386253a3 100644
--- a/addons/crm_iap_lead/__manifest__.py
+++ b/addons/crm_iap_mine/__manifest__.py
@@ -17,18 +17,19 @@
         'data/mail_template_data.xml',
         'data/ir_sequence_data.xml',
         'security/ir.model.access.csv',
-        'views/crm_lead_view.xml',
-        'views/crm_iap_lead_views.xml',
+        'views/crm_lead_views.xml',
+        'views/crm_iap_lead_mining_request_views.xml',
         'views/res_config_settings_views.xml',
         'views/mail_templates.xml',
+        'views/crm_menus.xml',
     ],
     'auto_install': True,
     'assets': {
         'web.assets_backend': [
-            'crm_iap_lead/static/src/js/**/*',
+            'crm_iap_mine/static/src/js/**/*',
         ],
         'web.assets_qweb': [
-            'crm_iap_lead/static/src/xml/**/*',
+            'crm_iap_mine/static/src/xml/**/*',
         ],
     },
     'license': 'LGPL-3',
diff --git a/addons/crm_iap_mine/data/crm.iap.lead.industry.csv b/addons/crm_iap_mine/data/crm.iap.lead.industry.csv
new file mode 100644
index 00000000000..08615537749
--- /dev/null
+++ b/addons/crm_iap_mine/data/crm.iap.lead.industry.csv
@@ -0,0 +1,24 @@
+"id",name,reveal_ids,sequence
+"crm_iap_mine_industry_30_155","Consumer Discretionary","30,155",1
+"crm_iap_mine_industry_33","Consumer Staples","33",4
+"crm_iap_mine_industry_69_157","Banks & Insurance","69,157",2
+"crm_iap_mine_industry_86","Media","86",7
+"crm_iap_mine_industry_114","Real Estate","114",21
+"crm_iap_mine_industry_136","Transportation","136",16
+"crm_iap_mine_industry_138_156","Energy & Utilities ","138",22
+"crm_iap_mine_industry_148","Materials","148",17
+"crm_iap_mine_industry_149","Telecommunication Services","149",20
+"crm_iap_mine_industry_150_151","Consumer Services","150,151",9
+"crm_iap_mine_industry_152","Retailing","152",3
+"crm_iap_mine_industry_153_154","Food, Beverage & Tobacco","153,154",12
+"crm_iap_mine_industry_158_159","Diversified Financials & Financial Services","158,159",15
+"crm_iap_mine_industry_160","Health Care Equipment & Services","160",11
+"crm_iap_mine_industry_161","Pharmaceuticals, Biotechnology & Life Sciences","161",13
+"crm_iap_mine_industry_162","Capital Goods","162",6
+"crm_iap_mine_industry_163","Commercial & Professional Services","163",5
+"crm_iap_mine_industry_165","Software & Services","165",8
+"crm_iap_mine_industry_166","Technology Hardware & Equipment","166",19
+"crm_iap_mine_industry_167","Construction Materials","167",23
+"crm_iap_mine_industry_168","Independent Power and Renewable Electricity Producers","168",14
+"crm_iap_mine_industry_238","Automobiles & Components","238",18
+"crm_iap_mine_industry_239","Consumer Durables & Apparel","239",10
diff --git a/addons/crm_iap_mine/data/crm.iap.lead.role.csv b/addons/crm_iap_mine/data/crm.iap.lead.role.csv
new file mode 100644
index 00000000000..65d9f1983e8
--- /dev/null
+++ b/addons/crm_iap_mine/data/crm.iap.lead.role.csv
@@ -0,0 +1,23 @@
+"id",name,reveal_id
+"crm_iap_mine_role_1","CEO","CEO"
+"crm_iap_mine_role_2","communications","communications"
+"crm_iap_mine_role_3","consulting","consulting"
+"crm_iap_mine_role_4","customer_service","customer_service"
+"crm_iap_mine_role_5","education","education"
+"crm_iap_mine_role_6","engineering","engineering"
+"crm_iap_mine_role_7","finance","finance"
+"crm_iap_mine_role_8","founder","founder"
+"crm_iap_mine_role_9","health_professional","health_professional"
+"crm_iap_mine_role_10","human_resources","human_resources"
+"crm_iap_mine_role_11","information_technology","information_technology"
+"crm_iap_mine_role_12","legal","legal"
+"crm_iap_mine_role_13","marketing","marketing"
+"crm_iap_mine_role_14","operations","operations"
+"crm_iap_mine_role_15","owner","owner"
+"crm_iap_mine_role_16","president","president"
+"crm_iap_mine_role_17","product","product"
+"crm_iap_mine_role_18","public_relations","public_relations"
+"crm_iap_mine_role_19","real_estate","real_estate"
+"crm_iap_mine_role_20","recruiting","recruiting"
+"crm_iap_mine_role_21","research","research"
+"crm_iap_mine_role_22","sale","sale"
diff --git a/addons/crm_iap_mine/data/crm.iap.lead.seniority.csv b/addons/crm_iap_mine/data/crm.iap.lead.seniority.csv
new file mode 100644
index 00000000000..b1866a11cb6
--- /dev/null
+++ b/addons/crm_iap_mine/data/crm.iap.lead.seniority.csv
@@ -0,0 +1,4 @@
+"id",name,reveal_id
+"crm_iap_mine_seniority_1","director","director"
+"crm_iap_mine_seniority_2","executive","executive"
+"crm_iap_mine_seniority_3","manager","manager"
diff --git a/addons/crm_iap_lead/data/ir_sequence_data.xml b/addons/crm_iap_mine/data/ir_sequence_data.xml
similarity index 85%
rename from addons/crm_iap_lead/data/ir_sequence_data.xml
rename to addons/crm_iap_mine/data/ir_sequence_data.xml
index 89be4f1607b..65a06595cfa 100644
--- a/addons/crm_iap_lead/data/ir_sequence_data.xml
+++ b/addons/crm_iap_mine/data/ir_sequence_data.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <!-- Sequences for lead mining requests -->
-        <record id="seq_crm_iap_lead_mining_request" model="ir.sequence">
+        <record id="ir_sequence_crm_iap_mine" model="ir.sequence">
             <field name="name">Lead Mining Request</field>
             <field name="code">crm.iap.lead.mining.request</field>
             <field name="prefix">LMR</field>
diff --git a/addons/crm_iap_lead/data/mail_template_data.xml b/addons/crm_iap_mine/data/mail_template_data.xml
similarity index 100%
rename from addons/crm_iap_lead/data/mail_template_data.xml
rename to addons/crm_iap_mine/data/mail_template_data.xml
diff --git a/addons/crm_iap_lead/i18n/ar.po b/addons/crm_iap_mine/i18n/ar.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/ar.po
rename to addons/crm_iap_mine/i18n/ar.po
diff --git a/addons/crm_iap_lead/i18n/crm_iap_lead.pot b/addons/crm_iap_mine/i18n/crm_iap_mine.pot
similarity index 100%
rename from addons/crm_iap_lead/i18n/crm_iap_lead.pot
rename to addons/crm_iap_mine/i18n/crm_iap_mine.pot
diff --git a/addons/crm_iap_lead/i18n/cs.po b/addons/crm_iap_mine/i18n/cs.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/cs.po
rename to addons/crm_iap_mine/i18n/cs.po
diff --git a/addons/crm_iap_lead/i18n/da.po b/addons/crm_iap_mine/i18n/da.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/da.po
rename to addons/crm_iap_mine/i18n/da.po
diff --git a/addons/crm_iap_lead/i18n/de.po b/addons/crm_iap_mine/i18n/de.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/de.po
rename to addons/crm_iap_mine/i18n/de.po
diff --git a/addons/crm_iap_lead/i18n/es.po b/addons/crm_iap_mine/i18n/es.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/es.po
rename to addons/crm_iap_mine/i18n/es.po
diff --git a/addons/crm_iap_lead/i18n/fr.po b/addons/crm_iap_mine/i18n/fr.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/fr.po
rename to addons/crm_iap_mine/i18n/fr.po
diff --git a/addons/crm_iap_lead/i18n/he.po b/addons/crm_iap_mine/i18n/he.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/he.po
rename to addons/crm_iap_mine/i18n/he.po
diff --git a/addons/crm_iap_lead/i18n/hr.po b/addons/crm_iap_mine/i18n/hr.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/hr.po
rename to addons/crm_iap_mine/i18n/hr.po
diff --git a/addons/crm_iap_lead/i18n/hu.po b/addons/crm_iap_mine/i18n/hu.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/hu.po
rename to addons/crm_iap_mine/i18n/hu.po
diff --git a/addons/crm_iap_lead/i18n/it.po b/addons/crm_iap_mine/i18n/it.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/it.po
rename to addons/crm_iap_mine/i18n/it.po
diff --git a/addons/crm_iap_lead/i18n/lb.po b/addons/crm_iap_mine/i18n/lb.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/lb.po
rename to addons/crm_iap_mine/i18n/lb.po
diff --git a/addons/crm_iap_lead/i18n/lt.po b/addons/crm_iap_mine/i18n/lt.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/lt.po
rename to addons/crm_iap_mine/i18n/lt.po
diff --git a/addons/crm_iap_lead/i18n/mn.po b/addons/crm_iap_mine/i18n/mn.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/mn.po
rename to addons/crm_iap_mine/i18n/mn.po
diff --git a/addons/crm_iap_lead/i18n/nb.po b/addons/crm_iap_mine/i18n/nb.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/nb.po
rename to addons/crm_iap_mine/i18n/nb.po
diff --git a/addons/crm_iap_lead/i18n/nl.po b/addons/crm_iap_mine/i18n/nl.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/nl.po
rename to addons/crm_iap_mine/i18n/nl.po
diff --git a/addons/crm_iap_lead/i18n/pl.po b/addons/crm_iap_mine/i18n/pl.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/pl.po
rename to addons/crm_iap_mine/i18n/pl.po
diff --git a/addons/crm_iap_lead/i18n/pt.po b/addons/crm_iap_mine/i18n/pt.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/pt.po
rename to addons/crm_iap_mine/i18n/pt.po
diff --git a/addons/crm_iap_lead/i18n/pt_BR.po b/addons/crm_iap_mine/i18n/pt_BR.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/pt_BR.po
rename to addons/crm_iap_mine/i18n/pt_BR.po
diff --git a/addons/crm_iap_lead/i18n/ro.po b/addons/crm_iap_mine/i18n/ro.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/ro.po
rename to addons/crm_iap_mine/i18n/ro.po
diff --git a/addons/crm_iap_lead/i18n/ru.po b/addons/crm_iap_mine/i18n/ru.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/ru.po
rename to addons/crm_iap_mine/i18n/ru.po
diff --git a/addons/crm_iap_lead/i18n/tr.po b/addons/crm_iap_mine/i18n/tr.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/tr.po
rename to addons/crm_iap_mine/i18n/tr.po
diff --git a/addons/crm_iap_lead/i18n/uk.po b/addons/crm_iap_mine/i18n/uk.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/uk.po
rename to addons/crm_iap_mine/i18n/uk.po
diff --git a/addons/crm_iap_lead/i18n/vi.po b/addons/crm_iap_mine/i18n/vi.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/vi.po
rename to addons/crm_iap_mine/i18n/vi.po
diff --git a/addons/crm_iap_lead/i18n/zh_CN.po b/addons/crm_iap_mine/i18n/zh_CN.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/zh_CN.po
rename to addons/crm_iap_mine/i18n/zh_CN.po
diff --git a/addons/crm_iap_lead/i18n/zh_TW.po b/addons/crm_iap_mine/i18n/zh_TW.po
similarity index 100%
rename from addons/crm_iap_lead/i18n/zh_TW.po
rename to addons/crm_iap_mine/i18n/zh_TW.po
diff --git a/addons/crm_iap_lead/models/__init__.py b/addons/crm_iap_mine/models/__init__.py
similarity index 77%
rename from addons/crm_iap_lead/models/__init__.py
rename to addons/crm_iap_mine/models/__init__.py
index 0c77343b653..dd0f85a9843 100644
--- a/addons/crm_iap_lead/models/__init__.py
+++ b/addons/crm_iap_mine/models/__init__.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from . import crm_lead
-from . import crm_iap_lead
 from . import crm_iap_lead_helpers
 from . import crm_iap_lead_industry
+from . import crm_iap_lead_role
+from . import crm_iap_lead_seniority
 from . import crm_iap_lead_mining_request
diff --git a/addons/crm_iap_lead/models/crm_iap_lead_helpers.py b/addons/crm_iap_mine/models/crm_iap_lead_helpers.py
similarity index 96%
rename from addons/crm_iap_lead/models/crm_iap_lead_helpers.py
rename to addons/crm_iap_mine/models/crm_iap_lead_helpers.py
index 5a2d80923c0..9dc4baa0c11 100644
--- a/addons/crm_iap_lead/models/crm_iap_lead_helpers.py
+++ b/addons/crm_iap_mine/models/crm_iap_lead_helpers.py
@@ -4,7 +4,7 @@ from odoo import api, models
 
 class CRMHelpers(models.Model):
     _name = 'crm.iap.lead.helpers'
-    _description = 'Helper methods for crm_iap_lead modules'
+    _description = 'Helper methods for crm_iap_mine modules'
 
     @api.model
     def notify_no_more_credit(self, service_name, model_name, notification_parameter):
@@ -15,7 +15,7 @@ class CRMHelpers(models.Model):
         already_notified = self.env['ir.config_parameter'].sudo().get_param(notification_parameter, False)
         if already_notified:
             return
-        mail_template = self.env.ref('crm_iap_lead.lead_generation_no_credits')
+        mail_template = self.env.ref('crm_iap_mine.lead_generation_no_credits')
         iap_account = self.env['iap.account'].search([('service_name', '=', service_name)], limit=1)
         # Get the email address of the creators of the records
         res = self.env[model_name].search_read([], ['create_uid'])
diff --git a/addons/crm_iap_lead/models/crm_iap_lead_industry.py b/addons/crm_iap_mine/models/crm_iap_lead_industry.py
similarity index 100%
rename from addons/crm_iap_lead/models/crm_iap_lead_industry.py
rename to addons/crm_iap_mine/models/crm_iap_lead_industry.py
diff --git a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py b/addons/crm_iap_mine/models/crm_iap_lead_mining_request.py
similarity index 98%
rename from addons/crm_iap_lead/models/crm_iap_lead_mining_request.py
rename to addons/crm_iap_mine/models/crm_iap_lead_mining_request.py
index e4888e1446a..c12be1e8ed3 100644
--- a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py
+++ b/addons/crm_iap_mine/models/crm_iap_lead_mining_request.py
@@ -184,7 +184,13 @@ class CRMLeadMiningRequest(models.Model):
     def _onchange_company_size_max(self):
         if self.company_size_max < self.company_size_min:
             self.company_size_max = self.company_size_min
-    
+
+    @api.model
+    def get_empty_list_help(self, help_string):
+        help_title = _('Create a Lead Mining Request')
+        sub_title = _('Generate new leads based on their country, industry, size, etc.')
+        return '<p class="o_view_nocontent_smiling_face">%s</p><p class="oe_view_nocontent_alias">%s</p>' % (help_title, sub_title)
+
     def _prepare_iap_payload(self):
         """
         This will prepare the data to send to the server
@@ -227,14 +233,13 @@ class CRMLeadMiningRequest(models.Model):
         server_payload = self._prepare_iap_payload()
         reveal_account = self.env['iap.account'].get('reveal')
         dbuuid = self.env['ir.config_parameter'].sudo().get_param('database.uuid')
-        endpoint = self.env['ir.config_parameter'].sudo().get_param('reveal.endpoint', DEFAULT_ENDPOINT) + '/iap/clearbit/1/lead_mining_request'
         params = {
             'account_token': reveal_account.account_token,
             'dbuuid': dbuuid,
             'data': server_payload
         }
         try:
-            response = iap_tools.iap_jsonrpc(endpoint, params=params, timeout=300)
+            response = self._iap_contact_mining(params, timeout=300)
             if not response.get('data'):
                 self.error_type = 'no_result'
                 return False
@@ -247,6 +252,10 @@ class CRMLeadMiningRequest(models.Model):
         except Exception as e:
             raise UserError(_("Your request could not be executed: %s", e))
 
+    def _iap_contact_mining(self, params, timeout=300):
+        endpoint = self.env['ir.config_parameter'].sudo().get_param('reveal.endpoint', DEFAULT_ENDPOINT) + '/iap/clearbit/1/lead_mining_request'
+        return iap_tools.iap_jsonrpc(endpoint, params=params, timeout=timeout)
+
     def _create_leads_from_response(self, result):
         """ This method will get the response from the service and create the leads accordingly """
         self.ensure_one()
@@ -276,12 +285,6 @@ class CRMLeadMiningRequest(models.Model):
         lead_vals['lead_mining_request_id'] = self.id
         return lead_vals
 
-    @api.model
-    def get_empty_list_help(self, help):
-        help_title = _('Create a Lead Mining Request')
-        sub_title = _('Generate new leads based on their country, industry, size, etc.')
-        return '<p class="o_view_nocontent_smiling_face">%s</p><p class="oe_view_nocontent_alias">%s</p>' % (help_title, sub_title)
-
     def action_draft(self):
         self.ensure_one()
         self.name = _('New')
diff --git a/addons/crm_iap_lead/models/crm_iap_lead.py b/addons/crm_iap_mine/models/crm_iap_lead_role.py
similarity index 91%
rename from addons/crm_iap_lead/models/crm_iap_lead.py
rename to addons/crm_iap_mine/models/crm_iap_lead_role.py
index 9a43ca8cce8..6ab177b30fc 100644
--- a/addons/crm_iap_lead/models/crm_iap_lead.py
+++ b/addons/crm_iap_mine/models/crm_iap_lead_role.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from odoo import api, fields, models
 
 
diff --git a/addons/crm_iap_mine/models/crm_iap_lead_seniority.py b/addons/crm_iap_mine/models/crm_iap_lead_seniority.py
new file mode 100644
index 00000000000..f110c4f69ca
--- /dev/null
+++ b/addons/crm_iap_mine/models/crm_iap_lead_seniority.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class PeopleSeniority(models.Model):
+    """ Seniority for People Rules """
+    _name = 'crm.iap.lead.seniority'
+    _description = 'People Seniority'
+
+    name = fields.Char(string='Name', required=True, translate=True)
+    reveal_id = fields.Char(required=True)
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', 'Name already exists!'),
+    ]
+
+    @api.depends('name')
+    def name_get(self):
+        return [(seniority.id, seniority.name.replace('_', ' ').title()) for seniority in self]
diff --git a/addons/crm_iap_lead/models/crm_lead.py b/addons/crm_iap_mine/models/crm_lead.py
similarity index 100%
rename from addons/crm_iap_lead/models/crm_lead.py
rename to addons/crm_iap_mine/models/crm_lead.py
diff --git a/addons/crm_iap_lead/security/ir.model.access.csv b/addons/crm_iap_mine/security/ir.model.access.csv
similarity index 100%
rename from addons/crm_iap_lead/security/ir.model.access.csv
rename to addons/crm_iap_mine/security/ir.model.access.csv
diff --git a/addons/crm_iap_lead/static/img/crunchbase.ico b/addons/crm_iap_mine/static/img/crunchbase.ico
similarity index 100%
rename from addons/crm_iap_lead/static/img/crunchbase.ico
rename to addons/crm_iap_mine/static/img/crunchbase.ico
diff --git a/addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js b/addons/crm_iap_mine/static/src/js/leads_tree_generate_leads.js
similarity index 100%
rename from addons/crm_iap_lead/static/src/js/leads_tree_generate_leads.js
rename to addons/crm_iap_mine/static/src/js/leads_tree_generate_leads.js
diff --git a/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js b/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js
similarity index 94%
rename from addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js
rename to addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js
index 10a49b2fb12..444d96e318d 100644
--- a/addons/crm_iap_lead/static/src/js/tours/crm_iap_lead.js
+++ b/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js
@@ -1,4 +1,4 @@
-odoo.define('crm_iap_lead.generate_leads_steps', function (require) {
+odoo.define('crm_iap_mine.generate_leads_steps', function (require) {
 "use strict";
 
 var tour = require('web_tour.tour');
@@ -16,7 +16,7 @@ tour.tours.crm_tour.steps.splice(DragOppToWonStepIndex + 1, 0, {
     /**
      * Add some steps between "Drag your opportunity to <b>Won</b> when you get
      * the deal. Congrats !" and "Let’s have a look at an Opportunity." to
-     * include the steps related to the lead generation (crm_iap_lead).
+     * include the steps related to the lead generation (crm_iap_mine).
      * This eases the on boarding for the Lead Generation process.
      *
      */
diff --git a/addons/crm_iap_lead/static/src/xml/leads_tree_generate_leads_views.xml b/addons/crm_iap_mine/static/src/xml/leads_tree_generate_leads_views.xml
similarity index 100%
rename from addons/crm_iap_lead/static/src/xml/leads_tree_generate_leads_views.xml
rename to addons/crm_iap_mine/static/src/xml/leads_tree_generate_leads_views.xml
diff --git a/addons/crm_iap_mine/tests/__init__.py b/addons/crm_iap_mine/tests/__init__.py
new file mode 100644
index 00000000000..0c2ed496e47
--- /dev/null
+++ b/addons/crm_iap_mine/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_lead_mine
diff --git a/addons/crm_iap_mine/tests/common.py b/addons/crm_iap_mine/tests/common.py
new file mode 100644
index 00000000000..9a6fd3a11af
--- /dev/null
+++ b/addons/crm_iap_mine/tests/common.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+
+from contextlib import contextmanager
+from unittest.mock import patch
+
+from odoo import exceptions
+from odoo.addons.crm.models.crm_lead import Lead
+from odoo.addons.crm_iap_mine.models.crm_iap_lead_mining_request import CRMLeadMiningRequest
+from odoo.addons.iap.tests.common import MockIAPEnrich
+from odoo.addons.iap.tools import iap_tools
+
+
+class MockIAPReveal(MockIAPEnrich):
+
+    @classmethod
+    def setUpClass(cls):
+        super(MockIAPReveal, cls).setUpClass()
+        cls._new_leads = cls.env['crm.lead'].sudo()
+        cls.mine = False
+
+    @contextmanager
+    def mock_IAP_mine(self, mine, name_list=None, default_data=None, sim_error=None):
+        self._new_leads = self.env['crm.lead'].sudo()
+        self.mine = mine
+        crm_lead_create_origin = Lead.create
+
+        def _crm_lead_create(model, *args, **kwargs):
+            res = crm_lead_create_origin(model, *args, **kwargs)
+            self._new_leads += res.sudo()
+            return res
+
+        def _iap_contact_mining(params, timeout):
+            self.assertMineCallParams(params)
+            self.assertMinePayload(mine, params['data'])
+
+            if sim_error and sim_error == 'credit':
+                raise iap_tools.InsufficientCreditError('InsufficientCreditError')
+            if sim_error and sim_error == 'jsonrpc_exception':
+                raise exceptions.AccessError(
+                    'The url that this service requested returned an error. Please contact the author of the app. The url it tried to contact was [STRIPPED]'
+                )
+            if sim_error and sim_error == 'no_result':
+                return {'credit_error': False, 'data': []}
+
+            response = []
+            for counter in range(0, mine.lead_number):
+                if name_list:
+                    base_name = name_list[counter % len(name_list)]
+                else:
+                    base_name = 'heinrich_%d' % counter
+
+                iap_payload = {}
+                company_data = self._get_iap_company_data(base_name, service='mine')
+                if default_data:
+                    company_data.update(default_data)
+                iap_payload['company_data'] = company_data
+
+                if mine.search_type == 'people':
+                    people_data = self._get_iap_contact_data(base_name, service='mine')
+                    iap_payload['people_data'] = people_data
+
+                response.append(iap_payload)
+
+            return {
+                'data': response,
+                'credit_error': False
+            }
+
+        with patch.object(CRMLeadMiningRequest, '_iap_contact_mining', side_effect=_iap_contact_mining), \
+             patch.object(Lead, 'create', autospec=True, wraps=Lead, side_effect=_crm_lead_create):
+            yield
+
+    def _get_iap_company_data(self, base_name, service=None, add_values=None):
+        company_data = super(MockIAPReveal, self)._get_iap_company_data(base_name, service=service, add_values=add_values)
+        if service == 'mine':
+            company_data['phone'] = company_data['phone_numbers'][0]
+            company_data['sector'] = 'Sector Info'
+        return company_data
+
+    def assertMineCallParams(self, params):
+        self.assertTrue(bool(params['account_token']))
+        self.assertTrue(bool(params['dbuuid']))
+
+    def assertMinePayload(self, mine, payload):
+        if mine.search_type == 'people':
+            self.assertEqual(payload['contact_number'], mine.contact_number)
+        else:
+            self.assertTrue('contact_number' not in payload)
+        self.assertEqual(payload['countries'], mine.mapped('country_ids.code'))
+        self.assertEqual(payload['lead_number'], mine.lead_number)
+        self.assertEqual(payload['search_type'], mine.search_type)
diff --git a/addons/crm_iap_mine/tests/test_lead_mine.py b/addons/crm_iap_mine/tests/test_lead_mine.py
new file mode 100644
index 00000000000..6be53ca3ed8
--- /dev/null
+++ b/addons/crm_iap_mine/tests/test_lead_mine.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import exceptions
+from odoo.addons.crm.tests.common import TestCrmCommon
+from odoo.addons.crm_iap_mine.tests.common import MockIAPReveal
+from odoo.tests.common import users
+
+
+class TestLeadMine(TestCrmCommon, MockIAPReveal):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestLeadMine, cls).setUpClass()
+        cls.registry.enter_test_mode(cls.cr)
+
+        cls.test_crm_tags = cls.env['crm.tag'].create([
+            {'name': 'TestTag1'},
+            {'name': 'TestTag2'}
+        ])
+        cls.test_request = cls.env['crm.iap.lead.mining.request'].create({
+            'contact_number': 3,
+            'error_type': False,
+            'lead_number': 3,
+            'lead_type': 'lead',
+            'name': 'Test Mine',
+            'search_type': 'people',
+            'state': 'draft',
+            'tag_ids': [(6, 0, cls.test_crm_tags.ids)],
+            'team_id':  cls.sales_team_1.id,
+            'user_id': cls.user_sales_leads.id,
+        })
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.registry.leave_test_mode()
+        super().tearDownClass()
+
+    @users('user_sales_manager')
+    def test_mine_error_credit(self):
+        mine_request = self.env['crm.iap.lead.mining.request'].browse(self.test_request.ids)
+        with self.mock_IAP_mine(mine_request, sim_error='credit'):
+            mine_request.action_submit()
+
+        self.assertEqual(mine_request.error_type, 'credits')
+        self.assertEqual(mine_request.state, 'error')
+
+    @users('user_sales_manager')
+    def test_mine_error_jsonrpc_exception(self):
+        mine_request = self.env['crm.iap.lead.mining.request'].browse(self.test_request.ids)
+        with self.assertRaises(exceptions.UserError):
+            with self.mock_IAP_mine(mine_request, sim_error='jsonrpc_exception'):
+                mine_request.action_submit()
+
+    @users('user_sales_manager')
+    def test_mine_error_no_result(self):
+        mine_request = self.env['crm.iap.lead.mining.request'].browse(self.test_request.ids)
+        with self.mock_IAP_mine(mine_request, sim_error='no_result'):
+            mine_request.action_submit()
+
+        self.assertEqual(mine_request.error_type, 'no_result')
+        self.assertEqual(mine_request.state, 'draft')
+
+    @users('user_sales_manager')
+    def test_mine_wpeople(self):
+        country_de = self.base_de
+        state_de = self.de_state_st
+
+        mine_request = self.env['crm.iap.lead.mining.request'].browse(self.test_request.ids)
+        with self.mock_IAP_mine(mine_request, name_list=['Heinrich', 'Rivil', 'LidGen']):
+            mine_request.action_submit()
+
+        self.assertFalse(mine_request.error_type)
+        self.assertEqual(mine_request.state, 'done')
+
+        self.assertEqual(len(self._new_leads), 3, 'Number of leads should match mine request')
+
+        for base_name in ['Heinrich', 'Rivil', 'LidGen']:
+            lead = self._new_leads.filtered(lambda lead: lead.name == '%s GmbH' % base_name)
+            self.assertTrue(bool(lead))
+
+            # mine information
+            self.assertEqual(lead.type, 'lead')
+            self.assertEqual(lead.tag_ids, self.test_crm_tags)
+            self.assertEqual(lead.team_id, self.sales_team_1)
+            self.assertEqual(lead.user_id, self.user_sales_leads)
+            # iap
+            self.assertEqual(lead.reveal_id, '123_ClearbitID_%s' % base_name, 'Ensure reveal_id is set to clearbit ID')
+            # clearbit information
+            self.assertEqual(lead.contact_name, 'Contact %s 0' % base_name)
+            self.assertEqual(lead.city, 'Mönchengladbach')
+            self.assertEqual(lead.country_id, country_de)
+            self.assertEqual(lead.email_from, 'test.contact.0@%s.example.com' % base_name,
+                             'Lead email should be the one from first contact if search_type people is given')
+            self.assertEqual(lead.function, 'Doing stuff')
+            self.assertFalse(lead.partner_id)
+            self.assertEqual(lead.partner_name, '%s GmbH legal_name' % base_name)
+            self.assertEqual(lead.phone, '+4930499193937')
+            self.assertEqual(lead.state_id, state_de)
+            self.assertEqual(lead.street, 'Mennrather Str. 123456')
+            self.assertEqual(lead.website, 'https://www.%s.de' % base_name)
+            self.assertEqual(lead.zip, '41179')
+
+    @users('user_sales_manager')
+    def test_mine_wcompany(self):
+        country_de = self.base_de
+        state_de = self.de_state_st
+
+        mine_request = self.env['crm.iap.lead.mining.request'].browse(self.test_request.ids)
+        mine_request.write({'search_type': 'companies'})
+        with self.mock_IAP_mine(mine_request, name_list=['Heinrich', 'Rivil', 'LidGen']):
+            mine_request.action_submit()
+
+        self.assertFalse(mine_request.error_type)
+        self.assertEqual(mine_request.state, 'done')
+
+        self.assertEqual(len(self._new_leads), 3, 'Number of leads should match mine request')
+
+        for base_name in ['Heinrich', 'Rivil', 'LidGen']:
+            lead = self._new_leads.filtered(lambda lead: lead.name == '%s GmbH' % base_name)
+            self.assertTrue(bool(lead))
+
+            # mine information
+            self.assertEqual(lead.type, 'lead')
+            self.assertEqual(lead.tag_ids, self.test_crm_tags)
+            self.assertEqual(lead.team_id, self.sales_team_1)
+            self.assertEqual(lead.user_id, self.user_sales_leads)
+            # iap
+            self.assertEqual(lead.reveal_id, '123_ClearbitID_%s' % base_name, 'Ensure reveal_id is set to clearbit ID')
+            # clearbit information
+            self.assertFalse(lead.contact_name)
+            self.assertEqual(lead.city, 'Mönchengladbach')
+            self.assertEqual(lead.country_id, country_de)
+            self.assertEqual(lead.email_from, 'info@%s.example.com' % base_name)
+            self.assertFalse(lead.function)
+            self.assertFalse(lead.partner_id)
+            self.assertEqual(lead.partner_name, '%s GmbH legal_name' % base_name)
+            self.assertEqual(lead.phone, '+4930499193937')
+            self.assertEqual(lead.state_id, state_de)
+            self.assertEqual(lead.street, 'Mennrather Str. 123456')
+            self.assertEqual(lead.website, 'https://www.%s.de' % base_name)
+            self.assertEqual(lead.zip, '41179')
diff --git a/addons/crm_iap_lead/views/crm_iap_lead_views.xml b/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
similarity index 92%
rename from addons/crm_iap_lead/views/crm_iap_lead_views.xml
rename to addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
index 9a8ee12bd3f..d88cc564e85 100644
--- a/addons/crm_iap_lead/views/crm_iap_lead_views.xml
+++ b/addons/crm_iap_mine/views/crm_iap_lead_mining_request_views.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="crm_iap_lead_mining_request_form" model="ir.ui.view">
-        <field name="name">crm.iap.lead.mining.request.form</field>
+    <record id="crm_iap_lead_mining_request_view_form" model="ir.ui.view">
+        <field name="name">crm.iap.lead.mining.request.view.form</field>
         <field name="model">crm.iap.lead.mining.request</field>
         <field name="arch" type="xml">
             <form>
@@ -107,8 +107,8 @@
         </field>
     </record>
 
-    <record id="crm_iap_lead_mining_request_tree" model="ir.ui.view">
-        <field name="name">crm.iap.lead.mining.request.tree</field>
+    <record id="crm_iap_lead_mining_request_view_tree" model="ir.ui.view">
+        <field name="name">crm.iap.lead.mining.request.view.tree</field>
         <field name="model">crm.iap.lead.mining.request</field>
         <field name="arch" type="xml">
             <tree>
@@ -124,8 +124,8 @@
         </field>
     </record>
 
-    <record id="crm_iap_lead_mining_request_search" model="ir.ui.view">
-        <field name="name">crm.iap.lead.mining.request.search</field>
+    <record id="crm_iap_lead_mining_request_view_search" model="ir.ui.view">
+        <field name="name">crm.iap.lead.mining.request.view.search</field>
         <field name="model">crm.iap.lead.mining.request</field>
         <field name="arch" type="xml">
             <search string="Lead Mining Request">
@@ -153,18 +153,4 @@
         <field name="res_model">crm.iap.lead.mining.request</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <!-- This menu is display in CRM app when crm_iap_lead is installed-->
-    <menuitem
-        id="crm_menu_lead_generation"
-        name="Lead Generation"
-        parent="crm.crm_menu_config"
-        sequence="20"/>
-
-    <menuitem
-        id="crm_iap_lead_mining_request_menu_action"
-        action="crm_iap_lead_mining_request_action"
-        parent="crm_menu_lead_generation"
-        sequence="0"/>
-
 </odoo>
diff --git a/addons/crm_iap_lead/views/crm_lead_view.xml b/addons/crm_iap_mine/views/crm_lead_views.xml
similarity index 71%
rename from addons/crm_iap_lead/views/crm_lead_view.xml
rename to addons/crm_iap_mine/views/crm_lead_views.xml
index 9386b1979e0..516d3434f7e 100644
--- a/addons/crm_iap_lead/views/crm_lead_view.xml
+++ b/addons/crm_iap_mine/views/crm_lead_views.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <odoo>
-    <record id="crm_iap_opportunity_tree" model="ir.ui.view">
-        <field name="name">crm.opportunity.inherited.tree</field>
+    <record id="crm_lead_view_tree_opportunity" model="ir.ui.view">
+        <field name="name">crm.lead.view.tree.opportunity.inherit.iap.mine</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_tree_view_oppor" />
         <field name="arch" type="xml">
@@ -12,8 +12,8 @@
         </field>
     </record>
 
-    <record id="crm_iap_opportunity_kanban" model="ir.ui.view">
-        <field name="name">crm.opportunity.inherited.kanban</field>
+    <record id="crm_lead_view_kanban_opportunity" model="ir.ui.view">
+        <field name="name">crm.lead.view.kanban.inherit.iap.mine</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_kanban_view_leads" />
         <field name="arch" type="xml">
@@ -23,8 +23,8 @@
         </field>
     </record>
 
-    <record id="crm_iap_lead_tree" model="ir.ui.view">
-        <field name="name">crm.lead.inherited.tree</field>
+    <record id="crm_lead_view_tree_lead" model="ir.ui.view">
+        <field name="name">crm.lead.view.tree.lead.inherit.iap.mine</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.crm_case_tree_view_leads" />
         <field name="arch" type="xml">
@@ -34,8 +34,8 @@
         </field>
     </record>
 
-    <record id="crm_iap_lead_kanban" model="ir.ui.view">
-        <field name="name">crm.lead.inherited.kanban</field>
+    <record id="crm_lead_view_kanban_lead" model="ir.ui.view">
+        <field name="name">crm.lead.view.kanban.lead.inherit.iap.mine</field>
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.view_crm_lead_kanban" />
         <field name="arch" type="xml">
diff --git a/addons/crm_iap_mine/views/crm_menus.xml b/addons/crm_iap_mine/views/crm_menus.xml
new file mode 100644
index 00000000000..7d6f5b475f9
--- /dev/null
+++ b/addons/crm_iap_mine/views/crm_menus.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- This menu is display in CRM app when crm_iap_lead is installed-->
+    <menuitem
+        id="crm_menu_lead_generation"
+        name="Lead Generation"
+        parent="crm.crm_menu_config"
+        sequence="20"/>
+
+    <menuitem
+        id="crm_iap_lead_mining_request_menu_action"
+        action="crm_iap_lead_mining_request_action"
+        parent="crm_menu_lead_generation"
+        sequence="0"/>
+</odoo>
diff --git a/addons/crm_iap_lead/views/mail_templates.xml b/addons/crm_iap_mine/views/mail_templates.xml
similarity index 100%
rename from addons/crm_iap_lead/views/mail_templates.xml
rename to addons/crm_iap_mine/views/mail_templates.xml
diff --git a/addons/crm_iap_lead/views/res_config_settings_views.xml b/addons/crm_iap_mine/views/res_config_settings_views.xml
similarity index 88%
rename from addons/crm_iap_lead/views/res_config_settings_views.xml
rename to addons/crm_iap_mine/views/res_config_settings_views.xml
index 01888e3cf9e..2697dcac5ec 100644
--- a/addons/crm_iap_lead/views/res_config_settings_views.xml
+++ b/addons/crm_iap_mine/views/res_config_settings_views.xml
@@ -5,7 +5,7 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="crm.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <div id="crm_iap_lead_settings" position="inside">
+            <div id="crm_iap_mine_settings" position="inside">
                 <widget name="iap_buy_more_credits" service_name="reveal"/>
             </div>
         </field>
diff --git a/addons/iap/tests/common.py b/addons/iap/tests/common.py
index 1abed724698..fa91b1f7ad1 100644
--- a/addons/iap/tests/common.py
+++ b/addons/iap/tests/common.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from contextlib import contextmanager
-from functools import partial
 from unittest.mock import patch
 
 from odoo import exceptions
@@ -10,7 +9,12 @@ from odoo.addons.iap.models.iap_enrich_api import IapEnrichAPI
 from odoo.tests import common
 
 
-class MockIAPEnrich(common.BaseCase):
+class MockIAPEnrich(common.TransactionCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(MockIAPEnrich, cls).setUpClass()
+        cls._init_iap_mock()
 
     @contextmanager
     def mockIAPEnrichGateway(self, default_data=None, email_data=None, sim_error=None, failing_emails=None):
@@ -49,3 +53,99 @@ class MockIAPEnrich(common.BaseCase):
                 yield
         finally:
             pass
+
+    @classmethod
+    def _init_iap_mock(cls):
+        cls.base_de = cls.env.ref('base.de')
+        cls.de_state_st = cls.env['res.country.state'].create({
+            'name': 'DE ST State',
+            'code': 'st',
+            'country_id': cls.base_de.id
+        })
+        cls.base_be = cls.env.ref('base.be')
+        cls.be_state_bw = cls.env['res.country.state'].create({
+            'name': 'Béwééé dis',
+            'code': 'bw',
+            'country_id': cls.base_be.id
+        })
+
+    def _get_iap_company_data(self, base_name, service=None, add_values=None):
+        return {
+            'domain': '%s.de' % base_name,
+            'clearbit_id': '123_ClearbitID_%s' % base_name,
+
+            # Company Info
+            'name': '%s GmbH' % base_name,
+            'legal_name': '%s GmbH legal_name' % base_name,
+            'description': '%s GmbH description' % base_name,
+            'founded_year': '1930',
+            'logo': 'https://logo.clearbit.com/%slogo.com' % base_name,
+            'company_type': 'private',
+
+            # Contacts
+            'phone_numbers': ['+4930499193937', '+4930653376208'],
+            'email': [
+                'info@%s.example.com' % base_name,
+                'info2@%s.example.com' % base_name
+            ],
+
+            # Timezone
+            'timezone': 'Europe/Berlin',
+            'timezone_url': 'https://time.is/Berlin',
+
+            # Social
+            'facebook': "%s Facebook Handle" % base_name,
+            'linkedin': "%s Linkedin Handle" % base_name,
+            'crunchbase': "organization/%s" % base_name,
+
+            # Twitter
+            'twitter': '%s Twitter Handle' % base_name,
+            'twitter_bio': '%s Twitter Bio' % base_name,
+            'twitter_followers': 1250,
+            'twitter_location': 'Berlin',
+
+            # Metrics
+            'estimated_annual_revenue': '1000000',
+            'employees': 3.14,
+            'market_cap': 6.28,
+            'raised': 15000,
+            'annual_revenue': 1000000,
+
+            # Category
+            'sector': '%s sector' % base_name,
+            'sector_primary': '%s sector_primary' % base_name,
+            'industry': '%s industry' % base_name,
+            'industry_group': '%s industry_group' % base_name,
+            'sub_industry': '%s sub_industry' % base_name,
+            'tag': ['Automation', 'Construction'],
+            'tech': ['3d_cart', 'nginx'],
+
+            # Site
+            'website_title': '%s Website Title' % base_name,
+
+            # GEO Data
+            'location': 'Mennrather Str. 123456',
+            'street_number': '123456',
+            'street_name': 'Mennrather Str.',
+            'sub_premise': 'sub premise',
+            'postal_code': '41179',
+            'city': 'Mönchengladbach',
+            'state_code': self.de_state_st.code,
+            'state_name': self.de_state_st.name,
+            'country_code': self.base_de.code,
+            'country_name': self.base_de.name,
+        }
+
+    def _get_iap_contact_data(self, base_name, service=None, add_values=None):
+        people_data = []
+        for index in range(2):
+            payload = {
+                'full_name': 'Contact %s %s' % (base_name, index),
+                'email': 'test.contact.%s@%s.example.com' % (index, base_name),
+                'phone': '+49 30 548406496',
+                'seniority': 'manager',
+                'title': 'Doing stuff',
+                'role': 'health_professional',
+            }
+            people_data.append(payload)
+        return people_data
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index 76c003090af..a36e9ffc065 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 {
     'name': 'Contact Form',
     'category': 'Website/Website',
@@ -14,11 +15,12 @@ This module includes contact phone and mobile numbers validation.""",
     'depends': ['website', 'crm'],
     'data': [
         'security/ir.model.access.csv',
-        'data/website_crm_data.xml',
-        'views/website_crm_lead_views.xml',
-        'views/website_crm_templates.xml',
+        'data/ir_actions_data.xml',
+        'data/ir_model_data.xml',
+        'views/crm_lead_views.xml',
         'views/res_config_settings_views.xml',
         'views/website_visitor_views.xml',
+        'views/website_templates_contactus.xml',
     ],
     'installable': True,
     'auto_install': True,
diff --git a/addons/website_crm/controllers/__init__.py b/addons/website_crm/controllers/__init__.py
index 5d4b25db9c0..25803fb1887 100644
--- a/addons/website_crm/controllers/__init__.py
+++ b/addons/website_crm/controllers/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import main
+from . import website_form
diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/website_form.py
similarity index 100%
rename from addons/website_crm/controllers/main.py
rename to addons/website_crm/controllers/website_form.py
diff --git a/addons/website_crm/data/ir_actions_data.xml b/addons/website_crm/data/ir_actions_data.xml
new file mode 100644
index 00000000000..3422d0b46c8
--- /dev/null
+++ b/addons/website_crm/data/ir_actions_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="action_open_website" model="ir.actions.act_url">
+            <field name="name">Website Contact Form</field>
+            <field name="target">self</field>
+            <field name="url">/contactus</field>
+        </record>
+
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_open_website"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/ir_model_data.xml
similarity index 64%
rename from addons/website_crm/data/website_crm_data.xml
rename to addons/website_crm/data/ir_model_data.xml
index b1642f04c7f..673beabe8d7 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/ir_model_data.xml
@@ -7,6 +7,7 @@
             <field name="website_form_access">True</field>
             <field name="website_form_label">Create an Opportunity</field>
         </record>
+
         <function model="ir.model.fields" name="formbuilder_whitelist">
             <value>crm.lead</value>
             <value eval="[
@@ -21,16 +22,4 @@
             ]"/>
         </function>
     </data>
-    <data noupdate="1">
-        <record id="action_open_website" model="ir.actions.act_url">
-            <field name="name">Website Contact Form</field>
-            <field name="target">self</field>
-            <field name="url">/contactus</field>
-        </record>
-
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_open_website"/>
-            <field name="state">open</field>
-        </record>
-    </data>
 </odoo>
diff --git a/addons/website_crm/models/__init__.py b/addons/website_crm/models/__init__.py
index cfa52fe08d4..996526e1072 100644
--- a/addons/website_crm/models/__init__.py
+++ b/addons/website_crm/models/__init__.py
@@ -3,4 +3,5 @@
 
 from . import crm_lead
 from . import res_config_settings
+from . import website
 from . import website_visitor
diff --git a/addons/website_crm/models/crm_lead.py b/addons/website_crm/models/crm_lead.py
index c46da2d7de4..42ba502961b 100644
--- a/addons/website_crm/models/crm_lead.py
+++ b/addons/website_crm/models/crm_lead.py
@@ -53,21 +53,3 @@ class Lead(models.Model):
                             request.website.crm_default_user_id.id
         values['type'] = 'lead' if self.with_user(SUPERUSER_ID).env['res.users'].has_group('crm.group_use_lead') else 'opportunity'
         return values
-
-
-class Website(models.Model):
-    _inherit = 'website'
-
-    def _get_crm_default_team_domain(self):
-        if not self.env.user.has_group('crm.group_use_lead'):
-            return [('use_opportunities', '=', True)]
-        return [('use_leads', '=', True)]
-
-    crm_default_team_id = fields.Many2one(
-        'crm.team', string='Default Sales Teams',
-        default=lambda self: self.env['crm.team'].search([], limit=1),
-        domain=lambda self: self._get_crm_default_team_domain(),
-        help='Default Sales Team for new leads created through the Contact Us form.')
-    crm_default_user_id = fields.Many2one(
-        'res.users', string='Default Salesperson', domain=[('share', '=', False)],
-        help='Default salesperson for new leads created through the Contact Us form.')
diff --git a/addons/website_crm/models/website.py b/addons/website_crm/models/website.py
new file mode 100644
index 00000000000..389c523cdc8
--- /dev/null
+++ b/addons/website_crm/models/website.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Website(models.Model):
+    _inherit = 'website'
+
+    def _get_crm_default_team_domain(self):
+        if not self.env.user.has_group('crm.group_use_lead'):
+            return [('use_opportunities', '=', True)]
+        return [('use_leads', '=', True)]
+
+    crm_default_team_id = fields.Many2one(
+        'crm.team', string='Default Sales Teams',
+        default=lambda self: self.env['crm.team'].search([], limit=1),
+        domain=lambda self: self._get_crm_default_team_domain(),
+        help='Default Sales Team for new leads created through the Contact Us form.')
+    crm_default_user_id = fields.Many2one(
+        'res.users', string='Default Salesperson', domain=[('share', '=', False)],
+        help='Default salesperson for new leads created through the Contact Us form.')
diff --git a/addons/website_crm/views/website_crm_lead_views.xml b/addons/website_crm/views/crm_lead_views.xml
similarity index 60%
rename from addons/website_crm/views/website_crm_lead_views.xml
rename to addons/website_crm/views/crm_lead_views.xml
index c06b5eecaef..a373cfb1610 100644
--- a/addons/website_crm/views/website_crm_lead_views.xml
+++ b/addons/website_crm/views/crm_lead_views.xml
@@ -13,4 +13,17 @@
             </xpath>
         </field>
     </record>
+
+    <!--Website visitor actions-->
+    <record id="crm_lead_action_from_visitor" model="ir.actions.act_window">
+        <field name="name">Leads</field>
+        <field name="res_model">crm.lead</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('visitor_ids', 'in', [active_id])]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_empty_folder">
+              No lead linked for this visitor
+            </p>
+        </field>
+    </record>
 </data></odoo>
diff --git a/addons/website_crm/views/website_crm_templates.xml b/addons/website_crm/views/website_templates_contactus.xml
similarity index 96%
rename from addons/website_crm/views/website_crm_templates.xml
rename to addons/website_crm/views/website_templates_contactus.xml
index bb628afefaa..72da633c629 100644
--- a/addons/website_crm/views/website_crm_templates.xml
+++ b/addons/website_crm/views/website_templates_contactus.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <data>
         <template id="contactus_form" name="Contact Form (Opportunity)" inherit_id="website.contactus" customize_show="True">
             <xpath expr="//span[@data-for='contactus_form']" position="before">
                 <t t-set="contactus_form_values" t-value="dict(contactus_form_values, **{
@@ -12,5 +13,5 @@
                 })"/>
             </xpath>
 		</template>
-
-        </odoo>
+    </data>
+</odoo>
diff --git a/addons/website_crm/views/website_visitor_views.xml b/addons/website_crm/views/website_visitor_views.xml
index 56b0d5978d1..b4647d42b93 100644
--- a/addons/website_crm/views/website_visitor_views.xml
+++ b/addons/website_crm/views/website_visitor_views.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data>
-    <!--Website visitor actions-->
-    <record id="website_crm.website_visitor_crm_lead_action" model="ir.actions.act_window">
-        <field name="name">Leads</field>
-        <field name="res_model">crm.lead</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('visitor_ids', 'in', [active_id])]</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_empty_folder">
-              No lead linked for this visitor
-            </p>
-        </field>
-    </record>
-
-    <!-- website visitor views -->
     <record id="website_visitor_view_form" model="ir.ui.view">
         <field name="name">website.visitor.view.form.inherit.website.crm</field>
         <field name="model">website.visitor</field>
         <field name="inherit_id" ref="website.website_visitor_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//button[@id='w_visitor_visit_counter']" position="before">
-                <button name="%(website_crm.website_visitor_crm_lead_action)d" type="action" class="oe_stat_button" icon="fa-star"
+                <button name="%(website_crm.crm_lead_action_from_visitor)d" type="action" class="oe_stat_button" icon="fa-star"
                         attrs="{'invisible': [('lead_count', '=', 0)]}">
                     <field name="lead_count" widget="statinfo" string="Leads"/>
                 </button>
diff --git a/addons/crm_iap_lead_website/__init__.py b/addons/website_crm_iap_reveal/__init__.py
similarity index 100%
rename from addons/crm_iap_lead_website/__init__.py
rename to addons/website_crm_iap_reveal/__init__.py
diff --git a/addons/crm_iap_lead_website/__manifest__.py b/addons/website_crm_iap_reveal/__manifest__.py
similarity index 78%
rename from addons/crm_iap_lead_website/__manifest__.py
rename to addons/website_crm_iap_reveal/__manifest__.py
index 8523a4ed52e..e4dcd19674e 100644
--- a/addons/crm_iap_lead_website/__manifest__.py
+++ b/addons/website_crm_iap_reveal/__manifest__.py
@@ -9,16 +9,18 @@
     'depends': [
         'iap_crm',
         'iap_mail',
-        'crm_iap_lead',
+        'crm_iap_mine',
         'website'
     ],
     'data': [
-        'data/reveal_data.xml',
+        'data/ir_cron_data.xml',
+        'data/ir_model_data.xml',
         'security/ir_rules.xml',
         'security/ir.model.access.csv',
-        'views/crm_lead_view.xml',
+        'views/crm_lead_views.xml',
         'views/crm_reveal_views.xml',
         'views/res_config_settings_views.xml',
+        'views/crm_menus.xml',
     ],
     'license': 'LGPL-3',
 }
diff --git a/addons/crm_iap_lead_website/controllers/__init__.py b/addons/website_crm_iap_reveal/controllers/__init__.py
similarity index 78%
rename from addons/crm_iap_lead_website/controllers/__init__.py
rename to addons/website_crm_iap_reveal/controllers/__init__.py
index 5d4b25db9c0..25803fb1887 100644
--- a/addons/crm_iap_lead_website/controllers/__init__.py
+++ b/addons/website_crm_iap_reveal/controllers/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import main
+from . import website_form
diff --git a/addons/crm_iap_lead_website/controllers/main.py b/addons/website_crm_iap_reveal/controllers/website_form.py
similarity index 100%
rename from addons/crm_iap_lead_website/controllers/main.py
rename to addons/website_crm_iap_reveal/controllers/website_form.py
diff --git a/addons/crm_iap_lead_website/data/reveal_data.xml b/addons/website_crm_iap_reveal/data/ir_cron_data.xml
similarity index 82%
rename from addons/crm_iap_lead_website/data/reveal_data.xml
rename to addons/website_crm_iap_reveal/data/ir_cron_data.xml
index a90a76b5416..8da19b84fd2 100644
--- a/addons/crm_iap_lead_website/data/reveal_data.xml
+++ b/addons/website_crm_iap_reveal/data/ir_cron_data.xml
@@ -14,9 +14,4 @@
             <field name="doall" eval="False"/>
         </record>
     </data>
-
-    <function model="ir.model.fields" name="formbuilder_whitelist">
-        <value>crm.lead</value>
-        <value eval="['reveal_ip']"/>
-    </function>
 </odoo>
diff --git a/addons/website_crm_iap_reveal/data/ir_model_data.xml b/addons/website_crm_iap_reveal/data/ir_model_data.xml
new file mode 100644
index 00000000000..55ec9e87ebb
--- /dev/null
+++ b/addons/website_crm_iap_reveal/data/ir_model_data.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <function model="ir.model.fields" name="formbuilder_whitelist">
+        <value>crm.lead</value>
+        <value eval="['reveal_ip']"/>
+    </function>
+</odoo>
diff --git a/addons/crm_iap_lead_website/i18n/ar.po b/addons/website_crm_iap_reveal/i18n/ar.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/ar.po
rename to addons/website_crm_iap_reveal/i18n/ar.po
diff --git a/addons/crm_iap_lead_website/i18n/cs.po b/addons/website_crm_iap_reveal/i18n/cs.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/cs.po
rename to addons/website_crm_iap_reveal/i18n/cs.po
diff --git a/addons/crm_iap_lead_website/i18n/da.po b/addons/website_crm_iap_reveal/i18n/da.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/da.po
rename to addons/website_crm_iap_reveal/i18n/da.po
diff --git a/addons/crm_iap_lead_website/i18n/de.po b/addons/website_crm_iap_reveal/i18n/de.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/de.po
rename to addons/website_crm_iap_reveal/i18n/de.po
diff --git a/addons/crm_iap_lead_website/i18n/es.po b/addons/website_crm_iap_reveal/i18n/es.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/es.po
rename to addons/website_crm_iap_reveal/i18n/es.po
diff --git a/addons/crm_iap_lead_website/i18n/fr.po b/addons/website_crm_iap_reveal/i18n/fr.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/fr.po
rename to addons/website_crm_iap_reveal/i18n/fr.po
diff --git a/addons/crm_iap_lead_website/i18n/he.po b/addons/website_crm_iap_reveal/i18n/he.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/he.po
rename to addons/website_crm_iap_reveal/i18n/he.po
diff --git a/addons/crm_iap_lead_website/i18n/hr.po b/addons/website_crm_iap_reveal/i18n/hr.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/hr.po
rename to addons/website_crm_iap_reveal/i18n/hr.po
diff --git a/addons/crm_iap_lead_website/i18n/hu.po b/addons/website_crm_iap_reveal/i18n/hu.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/hu.po
rename to addons/website_crm_iap_reveal/i18n/hu.po
diff --git a/addons/crm_iap_lead_website/i18n/it.po b/addons/website_crm_iap_reveal/i18n/it.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/it.po
rename to addons/website_crm_iap_reveal/i18n/it.po
diff --git a/addons/crm_iap_lead_website/i18n/lb.po b/addons/website_crm_iap_reveal/i18n/lb.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/lb.po
rename to addons/website_crm_iap_reveal/i18n/lb.po
diff --git a/addons/crm_iap_lead_website/i18n/lt.po b/addons/website_crm_iap_reveal/i18n/lt.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/lt.po
rename to addons/website_crm_iap_reveal/i18n/lt.po
diff --git a/addons/crm_iap_lead_website/i18n/mn.po b/addons/website_crm_iap_reveal/i18n/mn.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/mn.po
rename to addons/website_crm_iap_reveal/i18n/mn.po
diff --git a/addons/crm_iap_lead_website/i18n/nb.po b/addons/website_crm_iap_reveal/i18n/nb.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/nb.po
rename to addons/website_crm_iap_reveal/i18n/nb.po
diff --git a/addons/crm_iap_lead_website/i18n/nl.po b/addons/website_crm_iap_reveal/i18n/nl.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/nl.po
rename to addons/website_crm_iap_reveal/i18n/nl.po
diff --git a/addons/crm_iap_lead_website/i18n/pl.po b/addons/website_crm_iap_reveal/i18n/pl.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/pl.po
rename to addons/website_crm_iap_reveal/i18n/pl.po
diff --git a/addons/crm_iap_lead_website/i18n/pt.po b/addons/website_crm_iap_reveal/i18n/pt.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/pt.po
rename to addons/website_crm_iap_reveal/i18n/pt.po
diff --git a/addons/crm_iap_lead_website/i18n/pt_BR.po b/addons/website_crm_iap_reveal/i18n/pt_BR.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/pt_BR.po
rename to addons/website_crm_iap_reveal/i18n/pt_BR.po
diff --git a/addons/crm_iap_lead_website/i18n/ro.po b/addons/website_crm_iap_reveal/i18n/ro.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/ro.po
rename to addons/website_crm_iap_reveal/i18n/ro.po
diff --git a/addons/crm_iap_lead_website/i18n/ru.po b/addons/website_crm_iap_reveal/i18n/ru.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/ru.po
rename to addons/website_crm_iap_reveal/i18n/ru.po
diff --git a/addons/crm_iap_lead_website/i18n/tr.po b/addons/website_crm_iap_reveal/i18n/tr.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/tr.po
rename to addons/website_crm_iap_reveal/i18n/tr.po
diff --git a/addons/crm_iap_lead_website/i18n/uk.po b/addons/website_crm_iap_reveal/i18n/uk.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/uk.po
rename to addons/website_crm_iap_reveal/i18n/uk.po
diff --git a/addons/crm_iap_lead_website/i18n/vi.po b/addons/website_crm_iap_reveal/i18n/vi.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/vi.po
rename to addons/website_crm_iap_reveal/i18n/vi.po
diff --git a/addons/crm_iap_lead_website/i18n/crm_iap_lead_website.pot b/addons/website_crm_iap_reveal/i18n/website_crm_iap_reveal.pot
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/crm_iap_lead_website.pot
rename to addons/website_crm_iap_reveal/i18n/website_crm_iap_reveal.pot
diff --git a/addons/crm_iap_lead_website/i18n/zh_CN.po b/addons/website_crm_iap_reveal/i18n/zh_CN.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/zh_CN.po
rename to addons/website_crm_iap_reveal/i18n/zh_CN.po
diff --git a/addons/crm_iap_lead_website/i18n/zh_TW.po b/addons/website_crm_iap_reveal/i18n/zh_TW.po
similarity index 100%
rename from addons/crm_iap_lead_website/i18n/zh_TW.po
rename to addons/website_crm_iap_reveal/i18n/zh_TW.po
diff --git a/addons/crm_iap_lead_website/models/__init__.py b/addons/website_crm_iap_reveal/models/__init__.py
similarity index 88%
rename from addons/crm_iap_lead_website/models/__init__.py
rename to addons/website_crm_iap_reveal/models/__init__.py
index 3af880a9468..adb2668c05c 100644
--- a/addons/crm_iap_lead_website/models/__init__.py
+++ b/addons/website_crm_iap_reveal/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 from . import crm_lead
 from . import crm_reveal_rule
 from . import crm_reveal_view
-from . import ir
+from . import ir_http
diff --git a/addons/crm_iap_lead_website/models/crm_lead.py b/addons/website_crm_iap_reveal/models/crm_lead.py
similarity index 100%
rename from addons/crm_iap_lead_website/models/crm_lead.py
rename to addons/website_crm_iap_reveal/models/crm_lead.py
diff --git a/addons/crm_iap_lead_website/models/crm_reveal_rule.py b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py
similarity index 95%
rename from addons/crm_iap_lead_website/models/crm_reveal_rule.py
rename to addons/website_crm_iap_reveal/models/crm_reveal_rule.py
index 34a8e3ac9fa..94fb99d025c 100644
--- a/addons/crm_iap_lead_website/models/crm_reveal_rule.py
+++ b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py
@@ -66,6 +66,15 @@ class CRMRevealRule(models.Model):
         ('limit_extra_contacts', 'check(extra_contacts >= 1 and extra_contacts <= 5)', 'Maximum 5 contacts are allowed!'),
     ]
 
+    def _compute_lead_count(self):
+        leads = self.env['crm.lead'].read_group([
+            ('reveal_rule_id', 'in', self.ids)
+        ], fields=['reveal_rule_id', 'type'], groupby=['reveal_rule_id', 'type'], lazy=False)
+        mapping = {(lead['reveal_rule_id'][0], lead['type']): lead['__count'] for lead in leads}
+        for rule in self:
+            rule.lead_count = mapping.get((rule.id, 'lead'), 0)
+            rule.opportunity_count = mapping.get((rule.id, 'opportunity'), 0)
+
     @api.constrains('regex_url')
     def _check_regex_url(self):
         try:
@@ -101,15 +110,6 @@ class CRMRevealRule(models.Model):
         self.clear_caches() # Clear the cache in order to recompute _get_active_rules
         return super(CRMRevealRule, self).unlink()
 
-    def _compute_lead_count(self):
-        leads = self.env['crm.lead'].read_group([
-            ('reveal_rule_id', 'in', self.ids)
-        ], fields=['reveal_rule_id', 'type'], groupby=['reveal_rule_id', 'type'], lazy=False)
-        mapping = {(lead['reveal_rule_id'][0], lead['type']): lead['__count'] for lead in leads}
-        for rule in self:
-            rule.lead_count = mapping.get((rule.id, 'lead'), 0)
-            rule.opportunity_count = mapping.get((rule.id, 'opportunity'), 0)
-
     def action_get_lead_tree_view(self):
         action = self.env["ir.actions.actions"]._for_xml_id("crm.crm_lead_all_leads")
         action['domain'] = [('id', 'in', self.lead_ids.ids), ('type', '=', 'lead')]
@@ -326,27 +326,41 @@ class CRMRevealRule(models.Model):
     def _perform_reveal_service(self, server_payload):
         result = False
         account_token = self.env['iap.account'].get('reveal')
-        endpoint = self.env['ir.config_parameter'].sudo().get_param('reveal.endpoint', DEFAULT_ENDPOINT) + '/iap/clearbit/1/reveal'
         params = {
             'account_token': account_token.account_token,
             'data': server_payload
         }
-        result = iap_tools.iap_jsonrpc(endpoint, params=params, timeout=300)
+        result = self._iap_contact_reveal(params, timeout=300)
+
+        all_ips, done_ips = list(server_payload['ips'].keys()), []
         for res in result.get('reveal_data', []):
+            done_ips.append(res['ip'])
             if not res.get('not_found'):
                 lead = self._create_lead_from_response(res)
                 self.env['crm.reveal.view'].search([('reveal_ip', '=', res['ip'])]).unlink()
             else:
-                self.env['crm.reveal.view'].search([('reveal_ip', '=', res['ip'])]).write({
-                    'reveal_state': 'not_found'
-                })
+                views = self.env['crm.reveal.view'].search([('reveal_ip', '=', res['ip'])])
+                views.write({'reveal_state': 'not_found'})
+                views.flush()
+
         if result.get('credit_error'):
             self.env['crm.iap.lead.helpers'].notify_no_more_credit('reveal', self._name, 'reveal.already_notified')
             return False
         else:
+            # avoid loops if IAP return result is broken: otherwise some IP may create loops
+            views = self.env['crm.reveal.view'].search([
+                ('reveal_ip', 'in', [ip for ip in all_ips if ip not in done_ips])
+            ])
+            views.write({'reveal_state': 'not_found'})
+            views.flush()
+            # reset notified parameter to re-send credit notice if appears again
             self.env['ir.config_parameter'].sudo().set_param('reveal.already_notified', False)
         return True
 
+    def _iap_contact_reveal(self, params, timeout=300):
+        endpoint = self.env['ir.config_parameter'].sudo().get_param('reveal.endpoint', DEFAULT_ENDPOINT) + '/iap/clearbit/1/reveal'
+        return iap_tools.iap_jsonrpc(endpoint, params=params, timeout=timeout)
+
     def _create_lead_from_response(self, result):
         """ This method will get response from service and create the lead accordingly """
         if result['rule_id']:
diff --git a/addons/crm_iap_lead_website/models/crm_reveal_view.py b/addons/website_crm_iap_reveal/models/crm_reveal_view.py
similarity index 100%
rename from addons/crm_iap_lead_website/models/crm_reveal_view.py
rename to addons/website_crm_iap_reveal/models/crm_reveal_view.py
diff --git a/addons/crm_iap_lead_website/models/ir.py b/addons/website_crm_iap_reveal/models/ir_http.py
similarity index 96%
rename from addons/crm_iap_lead_website/models/ir.py
rename to addons/website_crm_iap_reveal/models/ir_http.py
index dc6cd15d921..893a6557265 100644
--- a/addons/crm_iap_lead_website/models/ir.py
+++ b/addons/website_crm_iap_reveal/models/ir_http.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
 import logging
 import time
 
diff --git a/addons/crm_iap_lead_website/security/ir.model.access.csv b/addons/website_crm_iap_reveal/security/ir.model.access.csv
similarity index 100%
rename from addons/crm_iap_lead_website/security/ir.model.access.csv
rename to addons/website_crm_iap_reveal/security/ir.model.access.csv
diff --git a/addons/crm_iap_lead_website/security/ir_rules.xml b/addons/website_crm_iap_reveal/security/ir_rules.xml
similarity index 100%
rename from addons/crm_iap_lead_website/security/ir_rules.xml
rename to addons/website_crm_iap_reveal/security/ir_rules.xml
diff --git a/addons/website_crm_iap_reveal/tests/__init__.py b/addons/website_crm_iap_reveal/tests/__init__.py
new file mode 100644
index 00000000000..af852259937
--- /dev/null
+++ b/addons/website_crm_iap_reveal/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_lead_reveal
diff --git a/addons/website_crm_iap_reveal/tests/common.py b/addons/website_crm_iap_reveal/tests/common.py
new file mode 100644
index 00000000000..3da9497d3a1
--- /dev/null
+++ b/addons/website_crm_iap_reveal/tests/common.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+from contextlib import contextmanager
+from unittest.mock import patch
+
+from odoo import exceptions
+from odoo.addons.crm.models.crm_lead import Lead
+from odoo.addons.iap.tests.common import MockIAPEnrich
+from odoo.addons.website_crm_iap_reveal.models.crm_reveal_rule import CRMRevealRule
+
+
+class MockIAPReveal(MockIAPEnrich):
+
+    @classmethod
+    def setUpClass(cls):
+        super(MockIAPReveal, cls).setUpClass()
+        cls._new_leads = cls.env['crm.lead'].sudo()
+        cls.rules = False
+        cls.views = False
+
+    @contextmanager
+    def mock_IAP_reveal(self, ip_to_rules, name_list=None, default_data=None, sim_error=None):
+        self._new_leads = self.env['crm.lead'].sudo()
+        crm_lead_create_origin = Lead.create
+
+        def _crm_lead_create(model, *args, **kwargs):
+            res = crm_lead_create_origin(model, *args, **kwargs)
+            self._new_leads += res.sudo()
+            return res
+
+        def _iap_contact_reveal(params, timeout):
+            if sim_error and sim_error == 'credit':
+                return {'credit_error': True, 'reveal_data': []}
+            if sim_error and sim_error == 'jsonrpc_exception':
+                raise exceptions.AccessError(
+                    'The url that this service requested returned an error. Please contact the author of the app. The url it tried to contact was [STRIPPED]'
+                )
+            if sim_error and sim_error == 'no_result':
+                return {'credit_error': False, 'reveal_data': []}
+
+            response = []
+            for counter, ip_values in enumerate(ip_to_rules):
+                ip, rule = ip_values['ip'], ip_values['rules']
+                if name_list:
+                    base_name = name_list[counter % len(name_list)]
+                else:
+                    base_name = 'heinrich_%d' % counter
+
+                iap_payload = {
+                    'ip': ip,
+                    'ip_time_zone': 'Europe/Berlin',
+                    'not_found': False,
+                    'rule_id': rule.id,
+                }
+                company_data = self._get_iap_company_data(base_name, service='reveal', add_values={'ip': ip, 'rule': rule})
+                if default_data:
+                    company_data.update(default_data)
+                iap_payload['clearbit_id'] = company_data['clearbit_id']
+                iap_payload['reveal_data'] = company_data
+
+                if rule.lead_for == 'people':
+                    people_data = self._get_iap_contact_data(base_name, service='reveal')
+                    iap_payload['people_data'] = people_data
+
+                iap_payload['credit'] = 1 + (len(people_data) if rule.lead_for == 'people' else 0)
+
+                response.append(iap_payload)
+
+            return {
+                'reveal_data': response,
+                'credit_error': False
+            }
+
+        with patch.object(CRMRevealRule, '_iap_contact_reveal', side_effect=_iap_contact_reveal), \
+             patch.object(Lead, 'create', autospec=True, wraps=Lead, side_effect=_crm_lead_create):
+            yield
+
+    def _get_iap_company_data(self, base_name, service=None, add_values=None):
+        company_data = super(MockIAPReveal, self)._get_iap_company_data(base_name, service=service, add_values=add_values)
+        if service == 'reveal':
+            company_data['phone'] = company_data['phone_numbers'][0]
+            company_data['sector'] = 'Sector Info'
+        return company_data
diff --git a/addons/website_crm_iap_reveal/tests/test_lead_reveal.py b/addons/website_crm_iap_reveal/tests/test_lead_reveal.py
new file mode 100644
index 00000000000..4dba4e74572
--- /dev/null
+++ b/addons/website_crm_iap_reveal/tests/test_lead_reveal.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import exceptions
+from odoo.addons.crm.tests.common import TestCrmCommon
+from odoo.addons.website_crm_iap_reveal.tests.common import MockIAPReveal
+from odoo.tests.common import users
+
+
+class TestLeadMine(TestCrmCommon, MockIAPReveal):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestLeadMine, cls).setUpClass()
+        cls.registry.enter_test_mode(cls.cr)
+
+        cls.test_industry_tags = cls.env.ref('crm_iap_mine.crm_iap_mine_industry_33') + cls.env.ref('crm_iap_mine.crm_iap_mine_industry_148')
+        cls.test_roles = cls.env.ref('crm_iap_mine.crm_iap_mine_role_11') + cls.env.ref('crm_iap_mine.crm_iap_mine_role_19')
+        cls.test_seniority = cls.env.ref('crm_iap_mine.crm_iap_mine_seniority_2')
+
+        cls.test_crm_tags = cls.env['crm.tag'].create([
+            {'name': 'TestTag1'},
+            {'name': 'TestTag2'}
+        ])
+        cls.test_request_1 = cls.env['crm.reveal.rule'].create({
+            'contact_filter_type': 'role',
+            'extra_contacts': 3,
+            'industry_tag_ids': cls.test_industry_tags.ids,
+            'lead_for': 'people',
+            'lead_type': 'lead',
+            'name': 'Test Reveal People',
+            'other_role_ids': cls.test_roles.ids,
+            'preferred_role_id': cls.test_roles[0].id,
+            'priority': '2',
+            'seniority_id': cls.test_seniority.id,
+            'suffix': '-ts1',
+            'tag_ids': [(6, 0, cls.test_crm_tags.ids)],
+            'team_id':  cls.sales_team_1.id,
+            'user_id': cls.user_sales_leads.id,
+        })
+        cls.test_request_2 = cls.env['crm.reveal.rule'].create({
+            'contact_filter_type': 'role',
+            'industry_tag_ids': cls.test_industry_tags.ids,
+            'lead_for': 'companies',
+            'lead_type': 'opportunity',
+            'name': 'Test Reveal Companies',
+            'priority': '2',
+            'suffix': '-ts2',
+            'tag_ids': [(6, 0, cls.test_crm_tags.ids)],
+            'team_id':  cls.sales_team_1.id,
+            'user_id': cls.user_admin.id,
+        })
+        cls.env['crm.reveal.view'].search([]).unlink()
+        cls.test_views = cls.env['crm.reveal.view'].create([
+            {'reveal_ip': '90.80.70.60',
+             'reveal_rule_id': cls.test_request_1.id,
+             'reveal_state': 'to_process',
+            },
+            {'reveal_ip': '90.80.70.61',
+             'reveal_rule_id': cls.test_request_1.id,
+             'reveal_state': 'to_process',
+            },
+            {'reveal_ip': '90.80.70.70',
+             'reveal_rule_id': cls.test_request_2.id,
+             'reveal_state': 'to_process',
+            }
+        ])
+
+        cls.ip_to_rules = [
+            {'ip': '90.80.70.60', 'rules': cls.test_request_1},
+            {'ip': '90.80.70.61', 'rules': cls.test_request_1},
+            {'ip': '90.80.70.70', 'rules': cls.test_request_2},
+        ]
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.registry.leave_test_mode()
+        super().tearDownClass()
+
+    @users('user_sales_manager')
+    def test_reveal_error_credit(self):
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+
+        with self.mock_IAP_reveal(self.ip_to_rules, sim_error='credit'):
+            self.env['crm.reveal.rule']._process_lead_generation(autocommit=False)
+
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+        self.assertEqual(set(self.test_views.mapped('reveal_state')), set(['to_process']))
+
+    @users('user_sales_manager')
+    def test_reveal_error_jsonrpc_exception(self):
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+
+        with self.assertRaises(exceptions.UserError):
+            with self.mock_IAP_reveal(self.ip_to_rules, sim_error='jsonrpc_exception'):
+                self.env['crm.reveal.rule']._process_lead_generation(autocommit=False)
+
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+        self.assertEqual(set(self.test_views.mapped('reveal_state')), set(['to_process']))
+
+    @users('user_sales_manager')
+    def test_reveal_error_no_result(self):
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+
+        with self.mock_IAP_reveal(self.ip_to_rules, sim_error='no_result'):
+            self.env['crm.reveal.rule']._process_lead_generation(autocommit=False)
+
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+        self.assertEqual(set(self.test_views.mapped('reveal_state')), set(['not_found']))
+
+    @users('user_sales_manager')
+    def test_reveal(self):
+        country_de = self.base_de
+        state_de = self.de_state_st
+
+        # check initial state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.test_views
+        )
+
+        with self.mock_IAP_reveal(self.ip_to_rules, name_list=['Heinrich', 'Rivil', 'LidGen']):
+            self.env['crm.reveal.rule']._process_lead_generation(autocommit=False)
+
+        # check post state of views
+        self.assertEqual(
+            self.env['crm.reveal.view'].search([('reveal_ip', 'in', ['90.80.70.60', '90.80.70.61', '90.80.70.70'])]),
+            self.env['crm.reveal.view'], 'Views should have been unlinked after completion'
+        )
+
+        self.assertEqual(len(self._new_leads), 3, 'Number of leads should match IPs addresses')
+        for counter, base_name in enumerate(['Heinrich', 'Rivil', 'LidGen']):
+            if counter == 2:
+                rule = self.test_request_2
+            else:
+                rule = self.test_request_1
+
+            lead = self._new_leads.filtered(lambda lead: lead.name == '%s GmbH - %s' % (base_name, rule.suffix))
+            self.assertTrue(bool(lead))
+
+            # mine information
+            self.assertEqual(lead.type, 'lead' if rule == self.test_request_1 else 'opportunity')
+            self.assertEqual(lead.tag_ids, self.test_crm_tags)
+            self.assertEqual(lead.team_id, self.sales_team_1)
+            self.assertEqual(lead.user_id, self.user_sales_leads if rule == self.test_request_1 else self.user_admin)
+            # iap
+            self.assertEqual(lead.reveal_id, '123_ClearbitID_%s' % base_name, 'Ensure reveal_id is set to clearbit ID')
+            # clearbit information
+            if rule == self.test_request_1:  # people-based
+                self.assertEqual(lead.contact_name, 'Contact %s 0' % base_name)
+            else:
+                self.assertFalse(lead.contact_name)
+            self.assertEqual(lead.city, 'Mönchengladbach')
+            self.assertEqual(lead.country_id, country_de)
+            if rule == self.test_request_1:  # people-based
+                self.assertEqual(lead.email_from, 'test.contact.0@%s.example.com' % base_name,
+                                 'Lead email should be the one from first contact if search_type people is given')
+            else:
+                self.assertEqual(lead.email_from, 'info@%s.example.com' % base_name,
+                                 'Lead email should be the one from company data as there is no contact')
+            if rule == self.test_request_1:  # people-based
+                self.assertEqual(lead.function, 'Doing stuff')
+            else:
+                self.assertFalse(lead.function)
+            self.assertFalse(lead.partner_id)
+            self.assertEqual(lead.partner_name, '%s GmbH legal_name' % base_name)
+            self.assertEqual(lead.phone, '+4930499193937')
+            self.assertEqual(lead.state_id, state_de)
+            self.assertEqual(lead.street, 'Mennrather Str. 123456')
+            self.assertEqual(lead.website, 'https://www.%s.de' % base_name)
+            self.assertEqual(lead.zip, '41179')
diff --git a/addons/crm_iap_lead_website/views/crm_lead_view.xml b/addons/website_crm_iap_reveal/views/crm_lead_views.xml
similarity index 100%
rename from addons/crm_iap_lead_website/views/crm_lead_view.xml
rename to addons/website_crm_iap_reveal/views/crm_lead_views.xml
diff --git a/addons/website_crm_iap_reveal/views/crm_menus.xml b/addons/website_crm_iap_reveal/views/crm_menus.xml
new file mode 100644
index 00000000000..901e7b183a6
--- /dev/null
+++ b/addons/website_crm_iap_reveal/views/crm_menus.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem
+        id="crm_reveal_rule_menu_action"
+        action="crm_reveal_rule_action"
+        parent="crm_iap_mine.crm_menu_lead_generation"
+        sequence="5"/>
+
+    <menuitem
+        id="crm_reveal_view_menu_action"
+        parent="crm.crm_menu_report"
+        action="crm_reveal_view_action"
+        groups="base.group_no_one"/>
+</odoo>
diff --git a/addons/crm_iap_lead_website/views/crm_reveal_views.xml b/addons/website_crm_iap_reveal/views/crm_reveal_views.xml
similarity index 95%
rename from addons/crm_iap_lead_website/views/crm_reveal_views.xml
rename to addons/website_crm_iap_reveal/views/crm_reveal_views.xml
index 7e8cb81d6ca..974f566195f 100644
--- a/addons/crm_iap_lead_website/views/crm_reveal_views.xml
+++ b/addons/website_crm_iap_reveal/views/crm_reveal_views.xml
@@ -163,18 +163,4 @@
         <field name="res_model">crm.reveal.view</field>
         <field name="view_mode">tree,form</field>
     </record>
-
-    <!-- This menu is display in CRM app when crm_reveal is installed-->
-    <menuitem
-        id="crm_reveal_rule_menu_action"
-        action="crm_reveal_rule_action"
-        parent="crm_iap_lead.crm_menu_lead_generation"
-        sequence="5"/>
-
-    <menuitem
-        id="crm_reveal_view_menu_action"
-        parent="crm.crm_menu_report"
-        action="crm_reveal_view_action"
-        groups="base.group_no_one"/>
-
 </odoo>
diff --git a/addons/crm_iap_lead_website/views/res_config_settings_views.xml b/addons/website_crm_iap_reveal/views/res_config_settings_views.xml
similarity index 82%
rename from addons/crm_iap_lead_website/views/res_config_settings_views.xml
rename to addons/website_crm_iap_reveal/views/res_config_settings_views.xml
index 2d94f31c61c..9fbee9b4bf9 100644
--- a/addons/crm_iap_lead_website/views/res_config_settings_views.xml
+++ b/addons/website_crm_iap_reveal/views/res_config_settings_views.xml
@@ -1,11 +1,11 @@
 <?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.crm.iap.lead.website</field>
+        <field name="name">res.config.settings.view.form.inherit.website.crm.iap.reveal</field>
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="crm.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <div id="crm_iap_lead_website_settings" position="inside">
+            <div id="website_crm_iap_reveal_settings" position="inside">
                 <widget name="iap_buy_more_credits" service_name="reveal"/>
             </div>
         </field>