diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml
index 5cf24ae5d9d..757e98eebb5 100644
--- a/addons/mass_mailing/data/mass_mailing_data.xml
+++ b/addons/mass_mailing/data/mass_mailing_data.xml
@@ -3,15 +3,15 @@
     <data noupdate="1">
 
         <!-- Default stages of mass mailing campaigns -->
-        <record id="campaign_stage_1" model="mail.mass_mailing.stage">
+        <record id="campaign_stage_1" model="mailing.stage">
             <field name="name">Schedule</field>
             <field name="sequence">10</field>
         </record>
-        <record id="campaign_stage_2" model="mail.mass_mailing.stage">
+        <record id="campaign_stage_2" model="mailing.stage">
             <field name="name">Design</field>
             <field name="sequence">20</field>
         </record>
-        <record id="campaign_stage_3" model="mail.mass_mailing.stage">
+        <record id="campaign_stage_3" model="mailing.stage">
             <field name="name">Sent</field>
             <field name="sequence">30</field>
         </record>
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 825340f1618..6aebf35a814 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -51,7 +51,7 @@
         </record>
 
         <!-- Create campaign and mailings -->
-        <record id="mass_mail_tag_1" model="mail.mass_mailing.tag">
+        <record id="mass_mail_tag_1" model="mailing.tag">
             <field name="name">Marketing</field>
             <field name="color" eval="1"/>
         </record>
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 29493baa4e8..ed09533b69d 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -33,9 +33,9 @@ MASS_MAILING_BUSINESS_MODELS = [
 image_re = re.compile(r"data:(image/[A-Za-z]+);base64,(.*)")
 
 
-class MassMailingTag(models.Model):
+class MailingTag(models.Model):
     """Model of categories of mass mailing, i.e. marketing, newsletter, ... """
-    _name = 'mail.mass_mailing.tag'
+    _name = 'mailing.tag'
     _description = 'Mass Mailing Tag'
     _order = 'name'
 
@@ -47,10 +47,10 @@ class MassMailingTag(models.Model):
     ]
 
 
-class MassMailingStage(models.Model):
+class MailingStage(models.Model):
 
     """Stage for mass mailing campaigns. """
-    _name = 'mail.mass_mailing.stage'
+    _name = 'mailing.stage'
     _description = 'Mass Mailing Campaign Stage'
     _order = 'sequence'
 
@@ -65,8 +65,8 @@ class MassMailingCampaign(models.Model):
     _rec_name = "campaign_id"
     _inherits = {'utm.campaign': 'campaign_id'}
 
-    stage_id = fields.Many2one('mail.mass_mailing.stage', string='Stage', ondelete='restrict', required=True, 
-        default=lambda self: self.env['mail.mass_mailing.stage'].search([], limit=1),
+    stage_id = fields.Many2one('mailing.stage', string='Stage', ondelete='restrict', required=True, 
+        default=lambda self: self.env['mailing.stage'].search([], limit=1),
         group_expand='_group_expand_stage_ids')
     user_id = fields.Many2one(
         'res.users', string='Responsible',
@@ -78,7 +78,7 @@ class MassMailingCampaign(models.Model):
     medium_id = fields.Many2one('utm.medium', string='Medium',
             help="This is the delivery method, e.g. Postcard, Email, or Banner Ad", default=lambda self: self.env.ref('utm.utm_medium_email', False))
     tag_ids = fields.Many2many(
-        'mail.mass_mailing.tag', 'mail_mass_mailing_tag_rel',
+        'mailing.tag', 'mail_mass_mailing_tag_rel',
         'tag_id', 'campaign_id', string='Tags')
     mass_mailing_ids = fields.One2many(
         'mail.mass_mailing', 'mass_mailing_campaign_id',
diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv
index 1bf09f0486a..835060615c5 100644
--- a/addons/mass_mailing/security/ir.model.access.csv
+++ b/addons/mass_mailing/security/ir.model.access.csv
@@ -1,9 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mass_mailing_tag,mail.mass_mailing.tag,model_mail_mass_mailing_tag,mass_mailing.group_mass_mailing_campaign,1,1,1,1
+access_mailing_tag,access.mailing.tag,model_mailing_tag,mass_mailing.group_mass_mailing_campaign,1,1,1,1
 access_mailing_contact_mm_user,access.mailing.contact.mm.user,model_mailing_contact,mass_mailing.group_mass_mailing_user,1,1,1,1
 access_mailing_contact_subscription_mm_user,access.mailing.contact.subscription.mm.user,model_mailing_contact_subscription,mass_mailing.group_mass_mailing_user,1,1,1,1
 access_mailing_list_mm_user,access.mailing.list.mm.user,model_mailing_list,mass_mailing.group_mass_mailing_user,1,1,1,1
-access_mass_mailing_stage,mail.mass_mailing.stage,model_mail_mass_mailing_stage,mass_mailing.group_mass_mailing_user,1,1,1,1
+access_mailing_stage,access.mailing.stage.mm.user,model_mailing_stage,mass_mailing.group_mass_mailing_user,1,1,1,1
 access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,mass_mailing.group_mass_mailing_user,1,1,1,1
 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1
 access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,mass_mailing.group_mass_mailing_user,1,1,1,1
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 7643974d42b..6eebdad73b9 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -411,8 +411,8 @@
 
         <!--  MAILING CAMPAIGN STAGE !-->
         <record model="ir.ui.view" id="view_mail_mass_mailing_stage_search">
-            <field name="name">mail.mass_mailing.stage.search</field>
-            <field name="model">mail.mass_mailing.stage</field>
+            <field name="name">mailing.stage.search</field>
+            <field name="model">mailing.stage</field>
             <field name="arch" type="xml">
                <search string="Mailings">
                     <field name="name"/>
@@ -421,8 +421,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_mail_mass_mailing_stage_tree">
-            <field name="name">mail.mass_mailing.stage.tree</field>
-            <field name="model">mail.mass_mailing.stage</field>
+            <field name="name">mailing.stage.tree</field>
+            <field name="model">mailing.stage</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Mailings" editable="top">
@@ -433,7 +433,7 @@
         </record>
         <record id="action_view_mass_mailing_stages" model="ir.actions.act_window">
             <field name="name">Mailing Stages</field>
-            <field name="res_model">mail.mass_mailing.stage</field>
+            <field name="res_model">mailing.stage</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
@@ -449,8 +449,8 @@
 
         <!--  MAILING CAMPAIGN TAGS !-->
         <record id="mail_mass_mailing_tag_view_form" model="ir.ui.view">
-            <field name="name">mail.mass_mailing.tag.form</field>
-            <field name="model">mail.mass_mailing.tag</field>
+            <field name="name">mailing.tag.form</field>
+            <field name="model">mailing.tag</field>
             <field name="arch" type="xml">
                 <form string="Campaign Tags">
                     <sheet>
@@ -463,7 +463,7 @@
         </record>
         <record id="mass_mailing_tag_action" model="ir.actions.act_window">
             <field name="name">Campaign Tags</field>
-            <field name="res_model">mail.mass_mailing.tag</field>
+            <field name="res_model">mailing.tag</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 Add a new tag