diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py
index ff825f2ba87..25fd0535454 100644
--- a/addons/utm/__manifest__.py
+++ b/addons/utm/__manifest__.py
@@ -10,7 +10,10 @@ Enable management of UTM trackers: campaign, medium, source.
     'version': '1.1',
     'depends': ['base', 'web'],
     'data': [
-        'data/utm_data.xml',
+        'data/utm_medium_data.xml',
+        'data/utm_source_data.xml',
+        'data/utm_stage_data.xml',
+        'data/utm_tag_data.xml',
         'views/utm_campaign_views.xml',
         'views/utm_medium_views.xml',
         'views/utm_source_views.xml',
@@ -20,7 +23,8 @@ Enable management of UTM trackers: campaign, medium, source.
         'security/ir.model.access.csv',
     ],
     'demo': [
-        'data/utm_demo.xml',
+        'data/utm_campaign_demo.xml',
+        'data/utm_stage_demo.xml',
     ],
     'auto_install': False,
     'assets': {
diff --git a/addons/utm/data/utm_demo.xml b/addons/utm/data/utm_campaign_demo.xml
similarity index 67%
rename from addons/utm/data/utm_demo.xml
rename to addons/utm/data/utm_campaign_demo.xml
index 3ea8b30b0d1..32c0e3d64d8 100644
--- a/addons/utm/data/utm_demo.xml
+++ b/addons/utm/data/utm_campaign_demo.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data>
-        <!-- UTM Stage -->
-        <record id="campaign_stage_1" model="utm.stage">
-            <field name="name">Schedule</field>
-            <field name="sequence">10</field>
-        </record>
-        <record id="campaign_stage_2" model="utm.stage">
-            <field name="name">Design</field>
-            <field name="sequence">20</field>
-        </record>
-        <record id="campaign_stage_3" model="utm.stage">
-            <field name="name">Sent</field>
-            <field name="sequence">30</field>
-        </record>
-
-        <!-- UTM Campaigns -->
         <record model="utm.campaign" id="utm_campaign_fall_drive">
             <field name="name">Sale</field>
             <field name="stage_id" ref="utm.default_utm_stage" />
diff --git a/addons/utm/data/utm_data.xml b/addons/utm/data/utm_data.xml
deleted file mode 100644
index b9fb8274a31..00000000000
--- a/addons/utm/data/utm_data.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-        <!-- UTM Stage -->
-        <!-- This one is kept in data instead of demo to avoid crashing if the user starts creating campaigns
-        before stages have been created, as they are mandatory -->
-        <record id="default_utm_stage" model="utm.stage">
-            <field name="name">New</field>
-            <field name="sequence">10</field>
-        </record>
-
-        <!-- UTM Source -->
-        <record model="utm.source" id="utm_source_search_engine">
-            <field name="name">Search engine</field>
-        </record>
-        <record model="utm.source" id="utm_source_mailing">
-            <field name="name">Lead Recall</field>
-        </record>
-        <record model="utm.source" id="utm_source_newsletter">
-            <field name="name">Newsletter</field>
-        </record>
-        <record model="utm.source" id="utm_source_facebook">
-            <field name="name">Facebook</field>
-        </record>
-        <record model="utm.source" id="utm_source_twitter">
-            <field name="name">Twitter</field>
-        </record>
-        <record model="utm.source" id="utm_source_linkedin">
-            <field name="name">LinkedIn</field>
-        </record>
-        <record model="utm.source" id="utm_source_monster">
-            <field name="name">Monster</field>
-        </record>
-        <record model="utm.source" id="utm_source_glassdoor">
-            <field name="name">Glassdoor</field>
-        </record>
-        <record model="utm.source" id="utm_source_craigslist">
-            <field name="name">Craigslist</field>
-        </record>
-
-        <!-- UTM Medium -->
-        <record model="utm.medium" id="utm_medium_website">
-            <field name="name">Website</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_phone">
-            <field name="name">Phone</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_direct">
-            <field name="name">Direct</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_email">
-            <field name="name">Email</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_banner">
-            <field name="name">Banner</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_twitter">
-            <field name="name">Twitter</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_facebook">
-            <field name="name">Facebook</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_linkedin">
-            <field name="name">LinkedIn</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_television">
-            <field name="name">Television</field>
-        </record>
-        <record model="utm.medium" id="utm_medium_google_adwords">
-            <field name="name">Google Adwords</field>
-        </record>
-
-        <!-- UTM Tag -->
-        <record id="utm_tag_1" model="utm.tag">
-            <field name="name">Marketing</field>
-            <field name="color" eval="1"/>
-        </record>
-</odoo>
diff --git a/addons/utm/data/utm_medium_data.xml b/addons/utm/data/utm_medium_data.xml
new file mode 100644
index 00000000000..432ea9dcd4c
--- /dev/null
+++ b/addons/utm/data/utm_medium_data.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="utm.medium" id="utm_medium_website">
+        <field name="name">Website</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_phone">
+        <field name="name">Phone</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_direct">
+        <field name="name">Direct</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_email">
+        <field name="name">Email</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_banner">
+        <field name="name">Banner</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_twitter">
+        <field name="name">Twitter</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_facebook">
+        <field name="name">Facebook</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_linkedin">
+        <field name="name">LinkedIn</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_television">
+        <field name="name">Television</field>
+    </record>
+    <record model="utm.medium" id="utm_medium_google_adwords">
+        <field name="name">Google Adwords</field>
+    </record>
+</odoo>
diff --git a/addons/utm/data/utm_source_data.xml b/addons/utm/data/utm_source_data.xml
new file mode 100644
index 00000000000..b8dcd7cb9ce
--- /dev/null
+++ b/addons/utm/data/utm_source_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="utm.source" id="utm_source_search_engine">
+        <field name="name">Search engine</field>
+    </record>
+    <record model="utm.source" id="utm_source_mailing">
+        <field name="name">Lead Recall</field>
+    </record>
+    <record model="utm.source" id="utm_source_newsletter">
+        <field name="name">Newsletter</field>
+    </record>
+    <record model="utm.source" id="utm_source_facebook">
+        <field name="name">Facebook</field>
+    </record>
+    <record model="utm.source" id="utm_source_twitter">
+        <field name="name">Twitter</field>
+    </record>
+    <record model="utm.source" id="utm_source_linkedin">
+        <field name="name">LinkedIn</field>
+    </record>
+    <record model="utm.source" id="utm_source_monster">
+        <field name="name">Monster</field>
+    </record>
+    <record model="utm.source" id="utm_source_glassdoor">
+        <field name="name">Glassdoor</field>
+    </record>
+    <record model="utm.source" id="utm_source_craigslist">
+        <field name="name">Craigslist</field>
+    </record>
+</odoo>
diff --git a/addons/utm/data/utm_stage_data.xml b/addons/utm/data/utm_stage_data.xml
new file mode 100644
index 00000000000..87e7e7c0874
--- /dev/null
+++ b/addons/utm/data/utm_stage_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- This one is kept in data instead of demo to avoid crashing if the user starts creating campaigns
+    before stages have been created, as they are mandatory -->
+    <record id="default_utm_stage" model="utm.stage">
+        <field name="name">New</field>
+        <field name="sequence">10</field>
+    </record>
+</odoo>
diff --git a/addons/utm/data/utm_stage_demo.xml b/addons/utm/data/utm_stage_demo.xml
new file mode 100644
index 00000000000..979511e60b7
--- /dev/null
+++ b/addons/utm/data/utm_stage_demo.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="campaign_stage_1" model="utm.stage">
+            <field name="name">Schedule</field>
+            <field name="sequence">10</field>
+        </record>
+        <record id="campaign_stage_2" model="utm.stage">
+            <field name="name">Design</field>
+            <field name="sequence">20</field>
+        </record>
+        <record id="campaign_stage_3" model="utm.stage">
+            <field name="name">Sent</field>
+            <field name="sequence">30</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/utm/data/utm_tag_data.xml b/addons/utm/data/utm_tag_data.xml
new file mode 100644
index 00000000000..30775283505
--- /dev/null
+++ b/addons/utm/data/utm_tag_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- UTM Tag -->
+    <record id="utm_tag_1" model="utm.tag">
+        <field name="name">Marketing</field>
+        <field name="color" eval="1"/>
+    </record>
+</odoo>
diff --git a/addons/utm/security/ir.model.access.csv b/addons/utm/security/ir.model.access.csv
index a4e493e0edb..2cc52c0dd1d 100644
--- a/addons/utm/security/ir.model.access.csv
+++ b/addons/utm/security/ir.model.access.csv
@@ -1,14 +1,14 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_utm_campaign,access_utm_campaign,model_utm_campaign,,1,0,1,0
 access_utm_campaign_user,access_utm_campaign_user,model_utm_campaign,base.group_user,1,1,1,0
 access_utm_campaign_system,utm.campaign.system,model_utm_campaign,base.group_system,1,1,1,1
+access_utm_medium,access_utm_medium,model_utm_medium,,1,0,1,0
 access_utm_medium_user,access_utm_medium_user,model_utm_medium,base.group_user,1,1,1,0
 access_utm_medium_system,utm.medium.system,model_utm_medium,base.group_system,1,1,1,1
+access_utm_source,access_utm_source,model_utm_source,,1,0,1,0
 access_utm_source_user,access_utm_source_user,model_utm_source,base.group_user,1,1,1,0
 access_utm_source_system,utm.source.system,model_utm_source,base.group_system,1,1,1,1
 access_utm_stage_user,mail.utm.stage,model_utm_stage,base.group_user,1,0,0,0
 access_utm_stage_system,mail.utm.stage,model_utm_stage,base.group_system,1,1,1,1
-access_utm_campaign,access_utm_campaign,model_utm_campaign,,1,0,1,0
-access_utm_medium,access_utm_medium,model_utm_medium,,1,0,1,0
-access_utm_source,access_utm_source,model_utm_source,,1,0,1,0
 access_utm_tag_user,utm.tag,model_utm_tag,base.group_user,1,0,0,0
 access_utm_tag_system,utm.tag,model_utm_tag,base.group_system,1,1,1,1