[REF] test_mail: rename test models to ease understanding

PURPOSE

Have a cleaner test_mail addons

SPECIFICATIONS

Keep only mail-related tests, move odoobot in test mail full, send "update
notification" tests in mail (specific to mail). Merge some test files to
lessen number of files, perform light file renaming.

Split test mail models file to prepare some cleaning in those models and tests.

LINKS

Prepares Task ID 2238597 (clean notification models)
Prepares Task ID 2083854 (improve mass mailing technical flows)
PR #49891

12 files changed, 131 insertions, 131 deletions

diff --git a/addons/test_mail/data/subtype_data.xml b/addons/test_mail/data/subtype_data.xml
index f97e60e72f7..2033fb2d127 100644
--- a/addons/test_mail/data/subtype_data.xml
+++ b/addons/test_mail/data/subtype_data.xml
@@ -9,25 +9,25 @@
         <field name="internal" eval="False"/>
     </record>
 
-    <record id="st_mail_test_full_umbrella_upd" model="mail.message.subtype">
-        <field name="name">Umbrella Changed Subtype</field>
-        <field name="description">Umbrella Changed</field>
-        <field name="res_model">mail.test.full</field>
+    <record id="st_mail_test_ticket_container_upd" model="mail.message.subtype">
+        <field name="name">Container Changed Subtype</field>
+        <field name="description">Container Changed</field>
+        <field name="res_model">mail.test.ticket</field>
         <field name="default" eval="True"/>
         <field name="internal" eval="False"/>
     </record>
 
-    <record id="st_mail_test_default" model="mail.message.subtype">
-        <field name="name">Umbrella Default Subtype</field>
-        <field name="res_model">mail.test</field>
+    <record id="st_mail_test_container_default" model="mail.message.subtype">
+        <field name="name">Container Default Subtype</field>
+        <field name="res_model">mail.test.container</field>
         <field name="default" eval="True"/>
         <field name="internal" eval="False"/>
     </record>
-    <!-- when subscribing to mail.test umbrella, delegate to mail.test.full child -->
-    <record id="st_mail_test_child_full" model="mail.message.subtype">
-        <field name="name">Umbrella Child Full Subtype</field>
-        <field name="res_model">mail.test</field>
-        <field name="parent_id" ref="test_mail.st_mail_test_full_umbrella_upd"/>
+    <!-- when subscribing to mail.test.container, delegate to mail.test.ticket child -->
+    <record id="st_mail_test_container_child_full" model="mail.message.subtype">
+        <field name="name">Container Child Full Subtype</field>
+        <field name="res_model">mail.test.container</field>
+        <field name="parent_id" ref="test_mail.st_mail_test_ticket_container_upd"/>
         <field name="relation_field">umbrella_id</field>
         <field name="default" eval="False"/>
         <field name="internal" eval="False"/>
diff --git a/addons/test_mail/data/template_data.xml b/addons/test_mail/data/template_data.xml
index 35bdbedd7a2..4716060d444 100644
--- a/addons/test_mail/data/template_data.xml
+++ b/addons/test_mail/data/template_data.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <record id="mail_test_full_tracking_tpl" model="mail.template">
+    <record id="mail_test_ticket_tracking_tpl" model="mail.template">
         <field name="name">Mail Test Full: Tracking Template</field>
         <field name="subject">Test Template</field>
         <field name="partner_to">${object.customer_id.id | safe}</field>
         <field name="body_html" type="xml"><p>Hello ${object.name}</p></field>
-        <field name="model_id" ref="test_mail.model_mail_test_full"/>
+        <field name="model_id" ref="test_mail.model_mail_test_ticket"/>
         <field name="auto_delete" eval="True"/>
     </record>
 
-    <record id="mail_test_tpl" model="mail.template">
+    <record id="mail_test_container_tpl" model="mail.template">
         <field name="name">Mail Test: Template</field>
         <field name="subject">Post on ${object.name}</field>
         <field name="partner_to">${object.customer_id.id}</field>
         <field name="body_html" type="xml"><p>Adding stuff on ${object.name}</p></field>
-        <field name="model_id" ref="test_mail.model_mail_test"/>
+        <field name="model_id" ref="test_mail.model_mail_test_container"/>
         <field name="auto_delete" eval="True"/>
     </record>
 
-    <template id="mail_test_full_tracking_view">
+    <template id="mail_test_ticket_tracking_view">
     	<p><span t-esc="object.name"/> datetime has been updated to <span t-esc="object.datetime"/></p>
     </template>
 </odoo>
diff --git a/addons/test_mail/models/test_mail_corner_case_models.py b/addons/test_mail/models/test_mail_corner_case_models.py
index 7f65194cd8e..6ede8e2f735 100644
--- a/addons/test_mail/models/test_mail_corner_case_models.py
+++ b/addons/test_mail/models/test_mail_corner_case_models.py
@@ -4,10 +4,10 @@
 from odoo import api, fields, models
 
 
-class MailModel(models.Model):
-    _name = 'test_performance.mail'
-    _description = 'Test Performance Mail'
-    _inherit = 'mail.thread'
+class MailPerformanceThread(models.Model):
+    _name = 'mail.performance.thread'
+    _description = 'Performance: mail.thread'
+    _inherit = ['mail.thread']
 
     name = fields.Char()
     value = fields.Integer()
@@ -21,9 +21,9 @@ class MailModel(models.Model):
             record.value_pc = float(record.value) / 100
 
 
-class MailTrackingModel(models.Model):
-    _description = 'Test Tracking Model'
-    _name = 'mail.test.tracking'
+class MailPerformanceTracking(models.Model):
+    _name = 'mail.performance.tracking'
+    _description = 'Performance: multi tracking'
     _inherit = ['mail.thread']
 
     name = fields.Char(required=True, tracking=True)
@@ -32,9 +32,9 @@ class MailTrackingModel(models.Model):
     field_2 = fields.Char(tracking=True)
 
 
-class MailCompute(models.Model):
-    _name = 'mail.test.compute'
-    _description = "Test model with several tracked computed fields"
+class MailTestTrackCompute(models.Model):
+    _name = 'mail.test.track.compute'
+    _description = "Test tracking with computed fields"
     _inherit = ['mail.thread']
 
     partner_id = fields.Many2one('res.partner', tracking=True)
@@ -43,7 +43,7 @@ class MailCompute(models.Model):
     partner_phone = fields.Char(related='partner_id.phone', tracking=True)
 
 
-class MailMultiCompany(models.Model):
+class MailTestMultiCompany(models.Model):
     """ This model can be used in multi company tests"""
     _name = 'mail.test.multi.company'
     _description = "Test Multi Company Mail"
diff --git a/addons/test_mail/models/test_mail_models.py b/addons/test_mail/models/test_mail_models.py
index 55549133a3d..9a78f76a347 100644
--- a/addons/test_mail/models/test_mail_models.py
+++ b/addons/test_mail/models/test_mail_models.py
@@ -38,7 +38,7 @@ class MailTestStandard(models.Model):
     name = fields.Char()
     email_from = fields.Char()
     user_id = fields.Many2one('res.users', 'Responsible', tracking=True)
-    umbrella_id = fields.Many2one('mail.test', tracking=True)
+    umbrella_id = fields.Many2one('mail.test.container', tracking=True)
     company_id = fields.Many2one('res.company')
 
 
@@ -63,11 +63,11 @@ class MailTestActivity(models.Model):
         self.activity_feedback(['test_mail.mail_act_test_todo'], feedback=action_feedback)
 
 
-class MailTestFull(models.Model):
+class MailTestTicket(models.Model):
     """ This model can be used in tests when complex chatter features are
     required like modeling tasks or tickets. """
-    _description = 'Full Chatter Model'
-    _name = 'mail.test.full'
+    _description = 'Ticket-like model'
+    _name = 'mail.test.ticket'
     _inherit = ['mail.thread']
 
     name = fields.Char()
@@ -77,34 +77,34 @@ class MailTestFull(models.Model):
     mail_template = fields.Many2one('mail.template', 'Template')
     customer_id = fields.Many2one('res.partner', 'Customer', tracking=2)
     user_id = fields.Many2one('res.users', 'Responsible', tracking=1)
-    umbrella_id = fields.Many2one('mail.test', tracking=True)
+    umbrella_id = fields.Many2one('mail.test.container', tracking=True)
 
     def _track_template(self, changes):
-        res = super(MailTestFull, self)._track_template(changes)
+        res = super(MailTestTicket, self)._track_template(changes)
         record = self[0]
         if 'customer_id' in changes and record.mail_template:
             res['customer_id'] = (record.mail_template, {'composition_mode': 'mass_mail'})
         elif 'datetime' in changes:
-            res['datetime'] = ('test_mail.mail_test_full_tracking_view', {'composition_mode': 'mass_mail'})
+            res['datetime'] = ('test_mail.mail_test_ticket_tracking_view', {'composition_mode': 'mass_mail'})
         return res
 
     def _creation_subtype(self):
         if self.umbrella_id:
-            return self.env.ref('test_mail.st_mail_test_full_umbrella_upd')
-        return super(MailTestFull, self)._creation_subtype()
+            return self.env.ref('test_mail.st_mail_test_ticket_container_upd')
+        return super(MailTestTicket, self)._creation_subtype()
 
     def _track_subtype(self, init_values):
         self.ensure_one()
         if 'umbrella_id' in init_values and self.umbrella_id:
-            return self.env.ref('test_mail.st_mail_test_full_umbrella_upd')
-        return super(MailTestFull, self)._track_subtype(init_values)
+            return self.env.ref('test_mail.st_mail_test_ticket_container_upd')
+        return super(MailTestTicket, self)._track_subtype(init_values)
 
 
-class MailTestAlias(models.Model):
+class MailTestContainer(models.Model):
     """ This model can be used in tests when umbrella records like projects
     or teams are required. """
-    _description = 'Alias Chatter Model'
-    _name = 'mail.test'
+    _description = 'Project-like model with alias'
+    _name = 'mail.test.container'
     _mail_post_access = 'read'
     _inherit = ['mail.thread', 'mail.alias.mixin']
 
@@ -116,8 +116,8 @@ class MailTestAlias(models.Model):
         delegate=True)
 
     def _alias_get_creation_values(self):
-        values = super(MailTestAlias, self)._alias_get_creation_values()
-        values['alias_model_id'] = self.env['ir.model']._get('mail.test').id
+        values = super(MailTestContainer, self)._alias_get_creation_values()
+        values['alias_model_id'] = self.env['ir.model']._get('mail.test.container').id
         if self.id:
             values['alias_force_thread_id'] = self.id
             values['alias_parent_thread_id'] = self.id
diff --git a/addons/test_mail/models/test_mail_thread_models.py b/addons/test_mail/models/test_mail_thread_models.py
index 685b5c2afd1..29bbe7252f1 100644
--- a/addons/test_mail/models/test_mail_thread_models.py
+++ b/addons/test_mail/models/test_mail_thread_models.py
@@ -4,7 +4,7 @@
 from odoo import api, fields, models
 
 
-class MailCC(models.Model):
+class MailTestCC(models.Model):
     _name = 'mail.test.cc'
     _description = "Test Email CC Thread"
     _inherit = ['mail.thread.cc']
diff --git a/addons/test_mail/security/ir.model.access.csv b/addons/test_mail/security/ir.model.access.csv
index 95a4e84e98e..46aa2a2f50e 100644
--- a/addons/test_mail/security/ir.model.access.csv
+++ b/addons/test_mail/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_test_performance_mail,access_test_performance_mail,model_test_performance_mail,,1,1,1,1
+access_mail_performance_thread,access_mail_performance_thread,model_mail_performance_thread,,1,1,1,1
+access_mail_performance_tracking_user,mail.performance.tracking,model_mail_performance_tracking,base.group_user,1,1,1,1
 access_mail_test_simple_portal,mail.test.simple.portal,model_mail_test_simple,base.group_portal,1,0,0,0
 access_mail_test_simple_user,mail.test.simple.user,model_mail_test_simple,base.group_user,1,1,1,1
 access_mail_test_gateway_portal,mail.test.gateway.portal,model_mail_test_gateway,base.group_portal,1,0,0,0
@@ -8,13 +9,12 @@ access_mail_test_track_portal,mail.test.track.portal,model_mail_test_track,base.
 access_mail_test_track_user,mail.test.track.user.employee,model_mail_test_track,base.group_user,1,1,1,1
 access_mail_test_activity_portal,mail.test.activity.portal,model_mail_test_activity,base.group_portal,1,0,0,0
 access_mail_test_activity_user,mail.test.activity.user,model_mail_test_activity,base.group_user,1,1,1,1
-access_mail_test_full_portal,mail.test.full.portal,model_mail_test_full,base.group_portal,0,0,0,0
-access_mail_test_full_user,mail.test.full.user,model_mail_test_full,base.group_user,1,1,1,1
-access_mail_test_portal,mail.test.portal,model_mail_test,base.group_portal,1,1,0,0
-access_mail_test_user,mail.test.user,model_mail_test,base.group_user,1,1,1,1
+access_mail_test_ticket_portal,mail.test.ticket.portal,model_mail_test_ticket,base.group_portal,0,0,0,0
+access_mail_test_ticket_user,mail.test.ticket.user,model_mail_test_ticket,base.group_user,1,1,1,1
+access_mail_test_container_portal,mail.test.container_portal,model_mail_test_container,base.group_portal,1,1,0,0
+access_mail_test_container_user,mail.test.container.user,model_mail_test_container,base.group_user,1,1,1,1
 access_mail_test_cc_portal,mail.test.cc.portal,model_mail_test_cc,base.group_portal,1,0,0,0
 access_mail_test_cc_user,mail.test.cc.user,model_mail_test_cc,base.group_user,1,1,1,1
 access_mail_test_multi_company_user,mail.test.multi.company.user,model_mail_test_multi_company,base.group_user,1,1,1,1
 access_mail_test_multi_company_portal,mail.test.multi.company.portal,model_mail_test_multi_company,base.group_portal,1,0,0,0
-access_mail_test_tracking_user,mail.test.tracking,model_mail_test_tracking,base.group_user,1,1,1,1
-access_mail_test_compute,mail.test.compute,model_mail_test_compute,base.group_user,1,1,1,1
+access_mail_test_track_compute,mail.test.track.compute,model_mail_test_track_compute,base.group_user,1,1,1,1
diff --git a/addons/test_mail/tests/test_mail_followers.py b/addons/test_mail/tests/test_mail_followers.py
index 9b9682d3b13..6d1a3a8ed75 100644
--- a/addons/test_mail/tests/test_mail_followers.py
+++ b/addons/test_mail/tests/test_mail_followers.py
@@ -19,7 +19,7 @@ class BaseFollowersTest(TestMailCommon):
 
         Subtype = cls.env['mail.message.subtype']
         cls.mt_mg_def = Subtype.create({'name': 'mt_mg_def', 'default': True, 'res_model': 'mail.test.simple'})
-        cls.mt_cl_def = Subtype.create({'name': 'mt_cl_def', 'default': True, 'res_model': 'mail.test'})
+        cls.mt_cl_def = Subtype.create({'name': 'mt_cl_def', 'default': True, 'res_model': 'mail.test.container'})
         cls.mt_al_def = Subtype.create({'name': 'mt_al_def', 'default': True, 'res_model': False})
         cls.mt_mg_nodef = Subtype.create({'name': 'mt_mg_nodef', 'default': False, 'res_model': 'mail.test.simple'})
         cls.mt_al_nodef = Subtype.create({'name': 'mt_al_nodef', 'default': False, 'res_model': False})
@@ -141,18 +141,18 @@ class AdvancedFollowersTest(TestMailCommon):
         Subtype = cls.env['mail.message.subtype']
 
         # clean demo data to avoid interferences
-        Subtype.search([('res_model', 'in', ['mail.test', 'mail.test.track'])]).unlink()
+        Subtype.search([('res_model', 'in', ['mail.test.container', 'mail.test.track'])]).unlink()
 
-        cls.sub_nodef = Subtype.create({'name': 'Sub NoDefault', 'default': False, 'res_model': 'mail.test'})
+        cls.sub_nodef = Subtype.create({'name': 'Sub NoDefault', 'default': False, 'res_model': 'mail.test.container'})
         cls.sub_umb1 = Subtype.create({'name': 'Sub Umbrella1', 'default': False, 'res_model': 'mail.test.track'})
         cls.sub_umb2 = Subtype.create({'name': 'Sub Umbrella2', 'default': False, 'res_model': 'mail.test.track'})
-        cls.umb_def = Subtype.create({'name': 'Umbrella Default', 'default': True, 'res_model': 'mail.test'})
+        cls.umb_def = Subtype.create({'name': 'Umbrella Default', 'default': True, 'res_model': 'mail.test.container'})
         # create subtypes for auto subscription from umbrella to sub records
         cls.umb_sub_def = Subtype.create({
-            'name': 'Umbrella Sub1', 'default': True, 'res_model': 'mail.test',
+            'name': 'Umbrella Sub1', 'default': True, 'res_model': 'mail.test.container',
             'parent_id': cls.sub_umb1.id, 'relation_field': 'umbrella_id'})
         cls.umb_sub_nodef = Subtype.create({
-            'name': 'Umbrella Sub2', 'default': False, 'res_model': 'mail.test',
+            'name': 'Umbrella Sub2', 'default': False, 'res_model': 'mail.test.container',
             'parent_id': cls.sub_umb2.id, 'relation_field': 'umbrella_id'})
 
     def test_auto_subscribe_create(self):
@@ -194,7 +194,7 @@ class AdvancedFollowersTest(TestMailCommon):
          * subscribing to a sub-record as creator applies default subtype values
          * portal user should not have access to internal subtypes
         """
-        umbrella = self.env['mail.test'].with_context(self._test_context).create({
+        umbrella = self.env['mail.test.container'].with_context(self._test_context).create({
             'name': 'Project-Like',
         })
 
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py
index 2a585118d59..b615ceb5ff5 100644
--- a/addons/test_mail/tests/test_mail_gateway.py
+++ b/addons/test_mail/tests/test_mail_gateway.py
@@ -76,14 +76,14 @@ class TestMailAlias(TestMailCommon):
 
     @users('employee')
     def test_alias_creation(self):
-        record = self.env['mail.test'].create({
+        record = self.env['mail.test.container'].create({
             'name': 'Test Record',
             'alias_name': 'alias.test',
             'alias_contact': 'followers',
         })
-        self.assertEqual(record.alias_id.alias_model_id, self.env['ir.model']._get('mail.test'))
+        self.assertEqual(record.alias_id.alias_model_id, self.env['ir.model']._get('mail.test.container'))
         self.assertEqual(record.alias_id.alias_force_thread_id, record.id)
-        self.assertEqual(record.alias_id.alias_parent_model_id, self.env['ir.model']._get('mail.test'))
+        self.assertEqual(record.alias_id.alias_parent_model_id, self.env['ir.model']._get('mail.test.container'))
         self.assertEqual(record.alias_id.alias_parent_thread_id, record.id)
         self.assertEqual(record.alias_id.alias_name, 'alias.test')
         self.assertEqual(record.alias_id.alias_contact, 'followers')
@@ -108,7 +108,7 @@ class TestMailAlias(TestMailCommon):
 
     def test_alias_setup(self):
         alias = self.env['mail.alias'].create({
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_name': 'b4r+_#_R3wl$$',
         })
         self.assertEqual(alias.alias_name, 'b4r+_-_r3wl-', 'Disallowed chars should be replaced by hyphens')
@@ -234,7 +234,7 @@ class TestMailgateway(TestMailCommon):
         # Test: author (and not recipient) added as follower
         # self.assertEqual(self.test_public.message_partner_ids, self.partner_1 | self.partner_2,
         #                  'message_process: after reply, group should have 2 followers')
-        # self.assertEqual(self.test_public.message_channel_ids, self.env['mail.test'],
+        # self.assertEqual(self.test_public.message_channel_ids, self.env['mail.test.container'],
         #                  'message_process: after reply, group should have 2 followers (0 channels)')
 
     # --------------------------------------------------
@@ -516,7 +516,7 @@ class TestMailgateway(TestMailCommon):
         new_alias_2 = self.env['mail.alias'].create({
             'alias_name': 'test',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         new_rec = self.format_and_process(
@@ -543,7 +543,7 @@ class TestMailgateway(TestMailCommon):
         new_alias_2 = self.env['mail.alias'].create({
             'alias_name': 'test',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         new_rec = self.format_and_process(
@@ -573,7 +573,7 @@ class TestMailgateway(TestMailCommon):
         new_alias_2 = self.env['mail.alias'].create({
             'alias_name': 'test',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         new_rec = self.format_and_process(
@@ -599,7 +599,7 @@ class TestMailgateway(TestMailCommon):
         new_alias_2 = self.env['mail.alias'].create({
             'alias_name': 'test',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         new_rec = self.format_and_process(
@@ -852,14 +852,14 @@ class TestMailgateway(TestMailCommon):
         self.env['mail.alias'].create({
             'alias_name': 'test.alias',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         init_msg_count = len(self.test_record.message_ids)
         res_test = self.format_and_process(
             MAIL_TEMPLATE, self.email_from, 'test.alias@test.com',
             subject='My Dear Forward', extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % self.fake_email.message_id,
-            target_model='mail.test')
+            target_model='mail.test.container')
 
         self.assertEqual(len(self.test_record.message_ids), init_msg_count)
         self.assertEqual(len(self.fake_email.child_ids), 0)
@@ -879,7 +879,7 @@ class TestMailgateway(TestMailCommon):
         res_test = self.format_and_process(
             MAIL_TEMPLATE, self.email_from, 'test.alias@test.com',
             subject='My Dear Forward', extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % self.fake_email.message_id,
-            target_model='mail.test')
+            target_model='mail.test.container')
 
         self.assertEqual(len(self.test_record.message_ids), init_msg_count + 1)
         self.assertEqual(len(self.fake_email.child_ids), 1)
@@ -891,14 +891,14 @@ class TestMailgateway(TestMailCommon):
         self.env['mail.alias'].create({
             'alias_name': 'test.alias',
             'alias_user_id': False,
-            'alias_model_id': self.env['ir.model']._get('mail.test').id,
+            'alias_model_id': self.env['ir.model']._get('mail.test.container').id,
             'alias_contact': 'everyone',
         })
         init_msg_count = len(self.test_record.message_ids)
         res_test = self.format_and_process(
             MAIL_TEMPLATE, self.email_from, 'catchall.test@test.com', cc='test.alias@test.com',
             subject='My Dear Forward', extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % self.fake_email.message_id,
-            target_model='mail.test')
+            target_model='mail.test.container')
 
         self.assertEqual(len(self.test_record.message_ids), init_msg_count + 1)
         self.assertEqual(len(self.fake_email.child_ids), 1)
diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py
index 42c48aa960f..256921dd244 100644
--- a/addons/test_mail/tests/test_mail_message.py
+++ b/addons/test_mail/tests/test_mail_message.py
@@ -19,7 +19,7 @@ class TestMessageValues(TestMailCommon):
         super(TestMessageValues, cls).setUpClass()
 
         cls._init_mail_gateway()
-        cls.alias_record = cls.env['mail.test'].with_context(cls._test_context).create({
+        cls.alias_record = cls.env['mail.test.container'].with_context(cls._test_context).create({
             'name': 'Pigs',
             'alias_name': 'pigs',
             'alias_contact': 'followers',
@@ -65,7 +65,7 @@ class TestMessageValues(TestMailCommon):
     @mute_logger('odoo.models.unlink')
     def test_mail_message_values_document_alias(self):
         msg = self.Message.create({
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.alias_record.id
         })
         self.assertIn('-openerp-%d-mail.test' % self.alias_record.id, msg.message_id.split('@')[0])
@@ -78,7 +78,7 @@ class TestMessageValues(TestMailCommon):
         self.env['ir.config_parameter'].search([('key', '=', 'mail.catchall.domain')]).unlink()
 
         msg = self.Message.create({
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.alias_record.id
         })
         self.assertIn('-openerp-%d-mail.test' % self.alias_record.id, msg.message_id.split('@')[0])
@@ -90,7 +90,7 @@ class TestMessageValues(TestMailCommon):
         self.env['ir.config_parameter'].search([('key', '=', 'mail.catchall.alias')]).unlink()
 
         msg = self.Message.create({
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.alias_record.id
         })
         self.assertIn('-openerp-%d-mail.test' % self.alias_record.id, msg.message_id.split('@')[0])
@@ -137,12 +137,12 @@ class TestMessageValues(TestMailCommon):
 
     def test_mail_message_values_no_auto_thread(self):
         msg = self.Message.create({
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.alias_record.id,
             'no_auto_thread': True,
         })
         self.assertIn('reply_to', msg.message_id.split('@')[0])
-        self.assertNotIn('mail.test', msg.message_id.split('@')[0])
+        self.assertNotIn('mail.test.container', msg.message_id.split('@')[0])
         self.assertNotIn('-%d-' % self.alias_record.id, msg.message_id.split('@')[0])
 
     def test_mail_message_base64_image(self):
diff --git a/addons/test_mail/tests/test_message_track.py b/addons/test_mail/tests/test_message_track.py
index 45ae711d32b..e095f7e6003 100644
--- a/addons/test_mail/tests/test_message_track.py
+++ b/addons/test_mail/tests/test_message_track.py
@@ -13,7 +13,7 @@ class TestTracking(TestMailCommon):
     def setUp(self):
         super(TestTracking, self).setUp()
 
-        record = self.env['mail.test.full'].with_user(self.user_employee).with_context(self._test_context).create({
+        record = self.env['mail.test.ticket'].with_user(self.user_employee).with_context(self._test_context).create({
             'name': 'Test',
         })
         self.flush_tracking()
@@ -57,10 +57,10 @@ class TestTracking(TestMailCommon):
         """ Update some tracked fields linked to some subtype -> message with onchange """
         self.record.message_subscribe(
             partner_ids=[self.user_admin.partner_id.id],
-            subtype_ids=[self.env.ref('test_mail.st_mail_test_full_umbrella_upd').id]
+            subtype_ids=[self.env.ref('test_mail.st_mail_test_ticket_container_upd').id]
         )
 
-        umbrella = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'})
+        umbrella = self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'})
         self.record.write({
             'name': 'Test2',
             'email_from': 'noone@example.com',
@@ -69,7 +69,7 @@ class TestTracking(TestMailCommon):
         self.flush_tracking()
         # one new message containing tracking; subtype linked to tracking
         self.assertEqual(len(self.record.message_ids), 1)
-        self.assertEqual(self.record.message_ids.subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(self.record.message_ids.subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
 
         # no specific recipients except those following umbrella
         self.assertEqual(self.record.message_ids.partner_ids, self.env['res.partner'])
@@ -83,7 +83,7 @@ class TestTracking(TestMailCommon):
 
     def test_message_track_template(self):
         """ Update some tracked fields linked to some template -> message with onchange """
-        self.record.write({'mail_template': self.env.ref('test_mail.mail_test_full_tracking_tpl').id})
+        self.record.write({'mail_template': self.env.ref('test_mail.mail_test_ticket_tracking_tpl').id})
         self.assertEqual(self.record.message_ids, self.env['mail.message'])
 
         with self.mock_mail_gateway():
@@ -112,13 +112,13 @@ class TestTracking(TestMailCommon):
     def test_message_track_template_at_create(self):
         """ Create a record with tracking template on create, template should be sent."""
 
-        Model = self.env['mail.test.full'].with_user(self.user_employee).with_context(self._test_context)
+        Model = self.env['mail.test.ticket'].with_user(self.user_employee).with_context(self._test_context)
         Model = Model.with_context(mail_notrack=False)
         with self.mock_mail_gateway():
             record = Model.create({
                 'name': 'Test',
                 'customer_id': self.user_admin.partner_id.id,
-                'mail_template': self.env.ref('test_mail.mail_test_full_tracking_tpl').id,
+                'mail_template': self.env.ref('test_mail.mail_test_ticket_tracking_tpl').id,
             })
             self.flush_tracking()
 
@@ -181,7 +181,7 @@ class TestTracking(TestMailCommon):
         mail_template = self.env['mail.template'].create({
             'name': 'SPECIAL CONTENT UNLOCKED',
             'subject': 'SPECIAL CONTENT UNLOCKED',
-            'model_id': self.env.ref('test_mail.model_mail_test').id,
+            'model_id': self.env.ref('test_mail.model_mail_test_container').id,
             'auto_delete': True,
             'body_html': '''<div>WOOP WOOP</div>''',
         })
@@ -190,16 +190,16 @@ class TestTracking(TestMailCommon):
             if 'name' in init_values and init_values['name'] == magic_code:
                 return 'mail.mt_name_changed'
             return False
-        self.registry('mail.test')._patch_method('_track_subtype', _track_subtype)
+        self.registry('mail.test.container')._patch_method('_track_subtype', _track_subtype)
 
         def _track_template(self, changes):
             res = {}
             if 'name' in changes:
                 res['name'] = (mail_template, {'composition_mode': 'mass_mail'})
             return res
-        self.registry('mail.test')._patch_method('_track_template', _track_template)
+        self.registry('mail.test.container')._patch_method('_track_template', _track_template)
 
-        cls = type(self.env['mail.test'])
+        cls = type(self.env['mail.test.container'])
         self.assertFalse(hasattr(getattr(cls, 'name'), 'track_visibility'))
         getattr(cls, 'name').track_visibility = 'always'
 
@@ -207,7 +207,7 @@ class TestTracking(TestMailCommon):
         def cleanup():
             del getattr(cls, 'name').track_visibility
 
-        test_mail_record = self.env['mail.test'].create({
+        test_mail_record = self.env['mail.test.container'].create({
             'name': 'Zizizatestmailname',
             'description': 'Zizizatestmaildescription',
         })
@@ -215,7 +215,7 @@ class TestTracking(TestMailCommon):
 
     def test_message_track_multiple(self):
         """ check that multiple updates generate a single tracking message """
-        umbrella = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'})
+        umbrella = self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'})
         self.record.name = 'Zboub'
         self.record.customer_id = self.user_admin.partner_id
         self.record.user_id = self.user_admin
@@ -232,7 +232,7 @@ class TestTracking(TestMailCommon):
 
     def test_tracked_compute(self):
         # no tracking at creation
-        record = self.env['mail.test.compute'].create({})
+        record = self.env['mail.test.track.compute'].create({})
         self.flush_tracking()
         self.assertEqual(len(record.message_ids), 1)
         self.assertEqual(len(record.message_ids[0].tracking_value_ids), 0)
@@ -289,7 +289,7 @@ class TestTrackingInternals(TestMailCommon):
     def setUp(self):
         super(TestTrackingInternals, self).setUp()
 
-        record = self.env['mail.test.full'].with_user(self.user_employee).with_context(self._test_context).create({
+        record = self.env['mail.test.ticket'].with_user(self.user_employee).with_context(self._test_context).create({
             'name': 'Test',
         })
         self.flush_tracking()
@@ -319,7 +319,7 @@ class TestTrackingInternals(TestMailCommon):
             'name': 'Zboub',
             'customer_id': self.user_admin.partner_id.id,
             'user_id': self.user_admin.id,
-            'umbrella_id': self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'}).id
+            'umbrella_id': self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({'name': 'Umbrella'}).id
         })
         self.flush_tracking()
         self.assertEqual(len(self.record.message_ids), 1, 'should have 1 tracking message')
@@ -335,7 +335,7 @@ class TestTrackingInternals(TestMailCommon):
         self.flush_tracking()
         self.assertEqual(len(record_sudo.message_ids.tracking_value_ids), 1)
         ir_model_field = self.env['ir.model.fields'].search([
-            ('model', '=', 'mail.test.full'),
+            ('model', '=', 'mail.test.ticket'),
             ('name', '=', 'email_from')])
         ir_model_field.with_context(_force_unlink=True).unlink()
         self.assertEqual(len(record_sudo.message_ids.tracking_value_ids), 0)
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index 1d8ab7729c9..c6c4d8b0527 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -54,7 +54,7 @@ class TestMailPerformance(BaseMailPerformance):
             'name': 'Azure Interior',
             'email': 'azure.Interior24@example.com',
         })
-        self.env['test_performance.mail'].create([
+        self.env['mail.performance.thread'].create([
             {
                 'name': 'Object 0',
                 'value': 0,
@@ -82,7 +82,7 @@ class TestMailPerformance(BaseMailPerformance):
     @warmup
     def test_read_mail(self):
         """ Read records inheriting from 'mail.thread'. """
-        records = self.env['test_performance.mail'].search([])
+        records = self.env['mail.performance.thread'].search([])
         self.assertEqual(len(records), 5)
 
         with self.assertQueryCount(__system__=2, demo=2):
@@ -104,7 +104,7 @@ class TestMailPerformance(BaseMailPerformance):
     @warmup
     def test_write_mail(self):
         """ Write records inheriting from 'mail.thread' (no recomputation). """
-        records = self.env['test_performance.mail'].search([])
+        records = self.env['mail.performance.thread'].search([])
         self.assertEqual(len(records), 5)
 
         with self.assertQueryCount(__system__=2, demo=2):
@@ -114,7 +114,7 @@ class TestMailPerformance(BaseMailPerformance):
     @warmup
     def test_write_mail_with_recomputation(self):
         """ Write records inheriting from 'mail.thread' (with recomputation). """
-        records = self.env['test_performance.mail'].search([])
+        records = self.env['mail.performance.thread'].search([])
         self.assertEqual(len(records), 5)
 
         with self.assertQueryCount(__system__=2, demo=2):
@@ -124,7 +124,7 @@ class TestMailPerformance(BaseMailPerformance):
     @warmup
     def test_write_mail_with_tracking(self):
         """ Write records inheriting from 'mail.thread' (with field tracking). """
-        record = self.env['test_performance.mail'].create({
+        record = self.env['mail.performance.thread'].create({
             'name': 'Test',
             'track': 'Y',
             'value': 40,
@@ -138,7 +138,7 @@ class TestMailPerformance(BaseMailPerformance):
     @warmup
     def test_create_mail(self):
         """ Create records inheriting from 'mail.thread' (without field tracking). """
-        model = self.env['test_performance.mail']
+        model = self.env['mail.performance.thread']
 
         with self.assertQueryCount(__system__=2, demo=2):
             model.with_context(tracking_disable=True).create({'name': 'X'})
@@ -148,7 +148,7 @@ class TestMailPerformance(BaseMailPerformance):
     def test_create_mail_with_tracking(self):
         """ Create records inheriting from 'mail.thread' (with field tracking). """
         with self.assertQueryCount(__system__=7, demo=7):
-            self.env['test_performance.mail'].create({'name': 'X'})
+            self.env['mail.performance.thread'].create({'name': 'X'})
 
     @users('__system__', 'emp')
     @warmup
@@ -188,7 +188,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
         self.env.ref('mail.mt_activities').write({'default': True})
 
     def _create_test_records(self):
-        self.test_record_full = self.env['mail.test.full'].with_context(self._quick_create_ctx).create({
+        self.test_record_full = self.env['mail.test.ticket'].with_context(self._quick_create_ctx).create({
             'name': 'TestRecord',
             'customer_id': self.customer.id,
             'user_id': self.user_test.id,
@@ -196,7 +196,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
         })
         self.test_template_full = self.env['mail.template'].create({
             'name': 'TestTemplate',
-            'model_id': self.env['ir.model']._get('mail.test.full').id,
+            'model_id': self.env['ir.model']._get('mail.test.ticket').id,
             'subject': 'About ${object.name}',
             'body_html': '<p>Hello ${object.name}</p>',
             'email_from': '${object.user_id.email_formatted | safe}',
@@ -258,7 +258,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
     @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail')
     def test_mail_composer(self):
         self._create_test_records()
-        test_record = self.env['mail.test.full'].browse(self.test_record_full.id)
+        test_record = self.env['mail.test.ticket'].browse(self.test_record_full.id)
         customer_id = self.customer.id
         with self.assertQueryCount(__system__=4, emp=4):
             composer = self.env['mail.compose.message'].with_context({
@@ -278,7 +278,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
     @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink')
     def test_mail_composer_w_template(self):
         self._create_test_records()
-        test_record = self.env['mail.test.full'].browse(self.test_record_full.id)
+        test_record = self.env['mail.test.ticket'].browse(self.test_record_full.id)
         test_template = self.env['mail.template'].browse(self.test_template_full.id)
         # TODO FIXME non deterministic, last check 25 Mar 2020. Runbot at most +7 compared to local.
         with self.assertQueryCount(__system__=28, emp=29):
@@ -403,7 +403,7 @@ class TestMailAPIPerformance(BaseMailPerformance):
     @users('__system__', 'emp')
     @warmup
     def test_message_track(self):
-        record = self.env['mail.test.tracking'].create({'name': 'Zizizatestname'})
+        record = self.env['mail.performance.tracking'].create({'name': 'Zizizatestname'})
         with self.assertQueryCount(__system__=3, emp=3):
             record.write({'name': 'Zizizanewtestname'})
             record.flush()
@@ -447,7 +447,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
             'name': 'Test Customer',
             'email': 'test@example.com'
         })
-        self.umbrella = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({
+        self.umbrella = self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({
             'name': 'Test Umbrella',
             'customer_id': self.customer.id,
             'alias_name': 'test-alias',
@@ -458,7 +458,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
             self.partners |= Partners.create({'name': 'Test %s' % x, 'email': 'test%s@example.com' % x})
         self.umbrella.message_subscribe(self.partners.ids, subtype_ids=[
             self.env.ref('mail.mt_comment').id,
-            self.env.ref('test_mail.st_mail_test_child_full').id]
+            self.env.ref('test_mail.st_mail_test_container_child_full').id]
         )
         # `test_complex_mail_mail_send`
         self.umbrella.flush()
@@ -472,7 +472,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
             'body': '<p>Test</p>',
             'author_id': self.env.user.partner_id.id,
             'email_from': self.env.user.partner_id.email,
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.umbrella.id,
         })
         mail = self.env['mail.mail'].sudo().create({
@@ -509,7 +509,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
     def test_complex_message_post_template(self):
         self.umbrella.message_subscribe(self.user_portal.partner_id.ids)
         record = self.umbrella.with_user(self.env.user)
-        template_id = self.env.ref('test_mail.mail_test_tpl').id
+        template_id = self.env.ref('test_mail.mail_test_container_tpl').id
 
         with self.assertQueryCount(__system__=78, emp=80):
             record.message_post_with_template(template_id, message_type='comment', composition_mode='comment')
@@ -523,9 +523,9 @@ class TestMailComplexPerformance(BaseMailPerformance):
     def test_complex_message_subscribe(self):
         pids = self.partners.ids
         cids = self.channel.ids
-        subtypes = self.env.ref('mail.mt_comment') | self.env.ref('test_mail.st_mail_test_full_umbrella_upd')
+        subtypes = self.env.ref('mail.mt_comment') | self.env.ref('test_mail.st_mail_test_ticket_container_upd')
         subtype_ids = subtypes.ids
-        rec = self.env['mail.test.full'].create({
+        rec = self.env['mail.test.ticket'].create({
             'name': 'Test',
             'umbrella_id': False,
             'customer_id': False,
@@ -574,7 +574,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
     @warmup
     def test_complex_tracking_assignation(self):
         """ Assignation performance test on already-created record """
-        rec = self.env['mail.test.full'].create({
+        rec = self.env['mail.test.ticket'].create({
             'name': 'Test',
             'umbrella_id': self.umbrella.id,
             'customer_id': self.customer.id,
@@ -589,7 +589,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
         self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('mail.mt_note'))
         self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.env['res.partner'])
         # creation message
-        self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.partners)
         self.assertEqual(len(rec1.message_ids), 2)
 
@@ -603,7 +603,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
         user_id = self.user_portal.id
 
         with self.assertQueryCount(__system__=116, emp=117):
-            rec = self.env['mail.test.full'].create({
+            rec = self.env['mail.test.ticket'].create({
                 'name': 'Test',
                 'umbrella_id': umbrella_id,
                 'customer_id': customer_id,
@@ -613,7 +613,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
         rec1 = rec.with_context(active_test=False)      # to see inactive records
         self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
         # creation message
-        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id)
         self.assertEqual(len(rec1.message_ids), 1)
 
@@ -622,7 +622,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
     @warmup
     def test_complex_tracking_subscription_subtype(self):
         """ Write performance test involving auto subscription, tracking with subtype """
-        rec = self.env['mail.test.full'].create({
+        rec = self.env['mail.test.ticket'].create({
             'name': 'Test',
             'umbrella_id': False,
             'customer_id': False,
@@ -639,7 +639,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
 
         self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
         # write tracking message
-        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id)
         # creation message
         self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('mail.mt_note'))
@@ -653,13 +653,13 @@ class TestMailComplexPerformance(BaseMailPerformance):
         """ Write performance test involving auto subscription, tracking with subtype and template send """
         umbrella_id = self.umbrella.id
         customer_id = self.customer.id
-        umbrella2 = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({
+        umbrella2 = self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({
             'name': 'Test Umbrella 2',
             'customer_id': False,
             'alias_name': False,
         })
 
-        rec = self.env['mail.test.full'].create({
+        rec = self.env['mail.test.ticket'].create({
             'name': 'Test',
             'umbrella_id': umbrella2.id,
             'customer_id': False,
@@ -677,10 +677,10 @@ class TestMailComplexPerformance(BaseMailPerformance):
 
         self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
         # write tracking message
-        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[0].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[0].notified_partner_ids, self.partners | self.user_portal.partner_id)
         # creation message
-        self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.user_portal.partner_id)
         self.assertEqual(len(rec1.message_ids), 2)
 
@@ -691,12 +691,12 @@ class TestMailComplexPerformance(BaseMailPerformance):
         """ Write performance test involving assignation, tracking with template """
         customer_id = self.customer.id
         self.assertTrue(self.env.registry.ready, "We need to simulate that registery is ready")
-        rec = self.env['mail.test.full'].create({
+        rec = self.env['mail.test.ticket'].create({
             'name': 'Test',
             'umbrella_id': self.umbrella.id,
             'customer_id': False,
             'user_id': self.user_portal.id,
-            'mail_template': self.env.ref('test_mail.mail_test_full_tracking_tpl').id,
+            'mail_template': self.env.ref('test_mail.mail_test_ticket_tracking_tpl').id,
         })
         rec1 = rec.with_context(active_test=False)      # to see inactive records
         self.assertEqual(rec1.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
@@ -715,7 +715,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
         self.assertEqual(rec1.message_ids[1].subtype_id, self.env.ref('mail.mt_note'))
         self.assertEqual(rec1.message_ids[1].notified_partner_ids, self.env['res.partner'])
         # creation message
-        self.assertEqual(rec1.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
+        self.assertEqual(rec1.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_ticket_container_upd'))
         self.assertEqual(rec1.message_ids[2].notified_partner_ids, self.partners | self.user_portal.partner_id)
         self.assertEqual(len(rec1.message_ids), 3)
 
@@ -737,7 +737,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
             'body': '<p>Test 0</p>',
             'author_id': self.partners[0].id,
             'email_from': self.partners[0].email,
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.umbrella.id,
             'subtype_id': self.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment'),
             'attachment_ids': [
@@ -781,7 +781,7 @@ class TestMailComplexPerformance(BaseMailPerformance):
             'body': '<p>Test 1</p>',
             'author_id': self.partners[1].id,
             'email_from': self.partners[1].email,
-            'model': 'mail.test',
+            'model': 'mail.test.container',
             'res_id': self.umbrella.id,
             'subtype_id': self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note'),
             'attachment_ids': [
@@ -844,7 +844,7 @@ class TestMailHeavyPerformancePost(BaseMailPerformance):
             'name': 'customer',
             'email': 'customer@example.com',
         })
-        self.record = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({
+        self.record = self.env['mail.test.container'].with_context(mail_create_nosubscribe=True).create({
             'name': 'Test record',
             'customer_id': self.customer.id,
             'alias_name': 'test-alias',
diff --git a/addons/test_mass_mailing/models/mass_mail_test.py b/addons/test_mass_mailing/models/mass_mail_test.py
index d4772433748..ad6803e8321 100644
--- a/addons/test_mass_mailing/models/mass_mail_test.py
+++ b/addons/test_mass_mailing/models/mass_mail_test.py
@@ -30,5 +30,5 @@ class MassMailTestBlacklist(models.Model):
         'res.users', 'Responsible',
         tracking=True)
     umbrella_id = fields.Many2one(
-        'mail.test', 'Meta Umbrella Record',
+        'mail.test.container', 'Meta Umbrella Record',
         tracking=True)