diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 556ca74d2ad..61892315609 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -18,7 +18,7 @@ Contains the installer for marketing-related modules.
         'marketing_view.xml',
         'res_config_view.xml',
     ],
-    'demo': ['marketing_demo.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/marketing/marketing_demo.xml b/addons/marketing/marketing_demo.xml
deleted file mode 100644
index 904736ac5ec..00000000000
--- a/addons/marketing/marketing_demo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data> 
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 2afc0ab3a8b..9a862c8f5cb 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <record id="marketing.group_marketing_user" model="res.groups">
+    <record id="marketing.group_lead_automation_user" model="res.groups">
         <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
+        <field name="category_id" ref="base.module_category_lead_automation"/>
     </record>
 
-    <record id="marketing.group_marketing_manager" model="res.groups">
+    <record id="marketing.group_lead_automation_manager" model="res.groups">
         <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
+        <field name="category_id" ref="base.module_category_lead_automation"/>
+        <field name="implied_ids" eval="[(4, ref('marketing.group_lead_automation_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 3f788d4d448..e270401fb62 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -187,7 +187,7 @@
         </field>
     </record>
 
-    <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_marketing_user,marketing.group_marketing_manager" web_icon="marketing_campaign,static/description/icon.png"
+    <menuitem name="Lead Automation" id="menu_marketing_campaign_root" groups="marketing.group_lead_automation_user,marketing.group_lead_automation_manager" web_icon="marketing_campaign,static/description/icon.png"
     sequence="10"/>
     <menuitem id="menu_marketing_campaign_campaigns" sequence="1" name="Campaigns" parent="menu_marketing_campaign_root" web_icon="marketing_campaign,static/description/icon.png"/>
     <menuitem id="menu_marketing_campaign_form" parent="menu_marketing_campaign_campaigns" action="action_marketing_campaign_form" sequence="1"/>
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index 6e2a939ffec..e46f9c50145 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,21 +1,21 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_marketing_campaign_admin,marketing.campaign,model_marketing_campaign,marketing.group_marketing_user,1,1,0,0
-access_marketing_campaign_segment_campaignadmin,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_user,1,1,0,0
-access_marketing_campaign_activity_campaignadmin,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_user,1,1,0,0
-access_marketing_campaign_workitem_campaignadmin,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_user,1,1,0,0
-access_marketing_campaign_transition_campaignadmin,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_user,1,1,0,0
-access_marketing_campaign_analysis_campaignadmin,campaign.analysis,model_campaign_analysis,marketing.group_marketing_user,1,1,0,0
+access_marketing_campaign_admin,marketing.campaign,model_marketing_campaign,marketing.group_lead_automation_user,1,1,0,0
+access_marketing_campaign_segment_campaignadmin,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_lead_automation_user,1,1,0,0
+access_marketing_campaign_activity_campaignadmin,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_lead_automation_user,1,1,0,0
+access_marketing_campaign_workitem_campaignadmin,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_lead_automation_user,1,1,0,0
+access_marketing_campaign_transition_campaignadmin,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_lead_automation_user,1,1,0,0
+access_marketing_campaign_analysis_campaignadmin,campaign.analysis,model_campaign_analysis,marketing.group_lead_automation_user,1,1,0,0
 access_marketing_campaign_workitem_all,marketing.campaign.workitem,model_marketing_campaign_workitem,base.group_user,1,0,0,0
-access_email_template_user,mail.template,model_mail_template,marketing.group_marketing_user,1,1,0,0
-access_email_template_account_user,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_user,1,1,0,0
+access_email_template_user,mail.template,model_mail_template,marketing.group_lead_automation_user,1,1,0,0
+access_email_template_account_user,ir.mail_server,base.model_ir_mail_server,marketing.group_lead_automation_user,1,1,0,0
 access_marketing_campaign_system,marketing.campaign system,model_marketing_campaign,base.group_system,1,0,0,0
 access_marketing_campaign_segment_system,marketing.campaign.segment system,model_marketing_campaign_segment,base.group_system,1,0,0,0
 access_marketing_campaign_workitem_system,marketing.campaign.workitem system,model_marketing_campaign_workitem,base.group_system,1,0,0,0
-access_marketing_campaign_manager,marketing.campaign,model_marketing_campaign,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_segment_campaign_manager,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_activity_campaign_manager,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_workitem_campaign_manager,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_transition_campaign_manager,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_marketing_manager,1,1,1,1
-access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_marketing_manager,1,1,1,1
-access_email_template_manager,mail.template,model_mail_template,marketing.group_marketing_manager,1,1,1,1
-access_email_template_account_manager,ir.mail_server,base.model_ir_mail_server,marketing.group_marketing_manager,1,1,1,1
+access_marketing_campaign_manager,marketing.campaign,model_marketing_campaign,marketing.group_lead_automation_manager,1,1,1,1
+access_marketing_campaign_segment_campaign_manager,marketing.campaign.segment,model_marketing_campaign_segment,marketing.group_lead_automation_manager,1,1,1,1
+access_marketing_campaign_activity_campaign_manager,marketing.campaign.activity,model_marketing_campaign_activity,marketing.group_lead_automation_manager,1,1,1,1
+access_marketing_campaign_workitem_campaign_manager,marketing.campaign.workitem,model_marketing_campaign_workitem,marketing.group_lead_automation_manager,1,1,1,1
+access_marketing_campaign_transition_campaign_manager,marketing.campaign.transition,model_marketing_campaign_transition,marketing.group_lead_automation_manager,1,1,1,1
+access_marketing_campaign_analysis_campaign_manager,campaign.analysis,model_campaign_analysis,marketing.group_lead_automation_manager,1,1,1,1
+access_email_template_manager,mail.template,model_mail_template,marketing.group_lead_automation_manager,1,1,1,1
+access_email_template_account_manager,ir.mail_server,base.model_ir_mail_server,marketing.group_lead_automation_manager,1,1,1,1
diff --git a/addons/website_crm_score/security/ir.model.access.csv b/addons/website_crm_score/security/ir.model.access.csv
index 2fa1a339a33..2a2e86eef56 100644
--- a/addons/website_crm_score/security/ir.model.access.csv
+++ b/addons/website_crm_score/security/ir.model.access.csv
@@ -2,6 +2,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_website_crm_score,access_website_crm_score,model_website_crm_score,,1,0,0,0
 access_website_crm_score_manager,access_website_crm_score_manager,model_website_crm_score,base.group_website_designer,1,1,1,1
 access_team_user,access_team_user,model_team_user,,1,0,0,0
-access_team_user_manager,access_team_user_manager,model_team_user,marketing.group_marketing_manager,1,1,1,1
+access_team_user_manager,access_team_user_manager,model_team_user,marketing.group_lead_automation_manager,1,1,1,1
 access_website_crm_pageview,access_website_crm_pageview,model_website_crm_pageview,,1,0,0,0
-access_website_crm_pageview_manager,access_website_crm_pageview_manager,model_website_crm_pageview,marketing.group_marketing_manager,1,1,1,1
\ No newline at end of file
+access_website_crm_pageview_manager,access_website_crm_pageview_manager,model_website_crm_pageview,marketing.group_lead_automation_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/website_crm_score/views/marketing.xml b/addons/website_crm_score/views/marketing.xml
index 0a34c2d8dca..74723a28bbf 100644
--- a/addons/website_crm_score/views/marketing.xml
+++ b/addons/website_crm_score/views/marketing.xml
@@ -47,7 +47,7 @@
         </record>
 
         <!-- Score Menu Item -->
-        <menuitem id="leads_menu" name="Leads Management" parent="base.menu_base_partner" groups="marketing.group_marketing_user" sequence="4"/>
+        <menuitem id="leads_menu" name="Leads Management" parent="base.menu_base_partner" groups="marketing.group_lead_automation_manager" sequence="4"/>
 
         <!-- Action to display the leads that have a particular score -->
         <record model="ir.actions.act_window" id="score_leads">
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index 6b43b89df3a..cd37307946b 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -24,6 +24,12 @@
             <field name="sequence">2</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_lead_automation">
+            <field name="name">Lead Automation</field>
+            <field name="sequence">3</field>
+            <field name="description">Helps you manage lead of your marketing campaigns step by step.</field>
+        </record>
+
         <record model="ir.module.category" id="module_category_project_management">
             <field name="name">Project</field>
             <field name="description">Helps you manage your projects and tasks by tracking them, generating plannings, etc...</field>
@@ -66,12 +72,6 @@
             <field name="sequence">10</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_marketing">
-            <field name="name">Marketing</field>
-            <field name="description">Helps you manage your marketing campaigns step by step.</field>
-            <field name="sequence">12</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_event_management">
             <field name="name">Events</field>
             <field name="description">Helps you manage your Events.</field>