diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index 82752d1dc7d..d1cffddc403 100644
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -13,7 +13,15 @@
         </record>
 
         <record model="crm.meeting.type" id="categ_meet3">
-            <field name="name">Phone Call</field>
+            <field name="name">Off-site Meeting</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet4">
+            <field name="name">Open Discussion</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet5">
+            <field name="name">Feedback Meeting</field>
         </record>
 
          <record model="res.request.link" id="request_link_meeting">
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 58699da94ce..80a29a34417 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -2,16 +2,16 @@
 <openerp>
     <data noupdate="1">
         <record model="crm.case.channel" id="crm_case_channel_website">
-            <field name="name">website</field>
+            <field name="name">Website</field>
         </record>
         <record model="crm.case.channel" id="crm_case_channel_phone">
-            <field name="name">phone</field>
+            <field name="name">Phone</field>
         </record>
         <record model="crm.case.channel" id="crm_case_channel_direct">
-            <field name="name">direct</field>
+            <field name="name">Direct</field>
         </record>
         <record model="crm.case.channel" id="crm_case_channel_email">
-            <field name="name">email</field>
+            <field name="name">Email</field>
         </record>
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 89da8d357f7..551e4e93fb8 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -12,12 +12,30 @@
         <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
     </record>
 
-    <record model="crm.case.section" id="section_sales_marketing_department">
+    <record model="crm.case.section" id="crm_case_section_1">
             <field name="name">Sales Marketing Department</field>
-            <field name="code">Sales Marketing</field>
+            <field name="code">SMD</field>
             <field name="parent_id" ref="crm.section_sales_department"></field>
     </record>
 
+    <record model="crm.case.section" id="crm_case_section_2">
+            <field name="name">Support Department</field>
+            <field name="code">SPD</field>
+            <field name="parent_id" ref="crm.section_sales_department"></field>
+    </record>
+
+    <record model="crm.case.section" id="crm_case_section_3">
+            <field name="name">Direct Marketing</field>
+            <field name="code">DM</field>
+            <field name="parent_id" ref="crm.section_sales_department"></field>
+    </record>
+
+    <record model="crm.case.section" id="crm_case_section_4">
+            <field name="name">Online Support</field>
+            <field name="code">OS</field>
+            <field name="parent_id" ref="crm.crm_case_section_2"></field>
+    </record>
+
     <record model="crm.segmentation" id="crm_segmentation0">
         <field name="name">OpenERP partners</field>
         <field name="exclusif">True</field>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 306a35924a9..ec88ca8131a 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -86,11 +86,11 @@
             <field name="section_id" ref="section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead2">
-            <field name="name">Mail Campaign 1</field>
+            <field name="name">Email Campaign - Services</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead3">
-            <field name="name">Mail Campaign 2</field>
+            <field name="name">Email Campaign - Products</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead4">
@@ -102,7 +102,7 @@
             <field name="section_id" ref="section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead6">
-            <field name="name">Google Adwords 2</field>
+            <field name="name">Banner Ads</field>
             <field name="section_id" ref="section_sales_department"/>
         </record>
         <record model="crm.case.resource.type" id="type_lead7">
@@ -116,12 +116,12 @@
 
         <!--  crm categories -->
         <record model="crm.case.categ" id="categ_oppor1">
-            <field name="name">Interest in Computer</field>
+            <field name="name">Interested in Product</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor2">
-            <field name="name">Interest in Accessories</field>
+            <field name="name">Inquiry about Software</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
@@ -141,7 +141,7 @@
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
         <record model="crm.case.categ" id="categ_oppor6">
-            <field name="name">Potential Reseller</field>
+            <field name="name">Interested in Training</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>
         </record>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index e49391e6124..64283744ec5 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -11,7 +11,7 @@
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'The Oil Company'" name="partner_name"/>
-            <field name="section_id" ref="crm.section_sales_marketing_department"/>
+            <field name="section_id" ref="crm.crm_case_section_1"/>
             <field eval="'Luc Latour'" name="contact_name"/>
             <field name="title" ref="base.res_partner_title_sir"/>
             <field eval="'Training Manager'" name="function"/>
@@ -88,7 +88,7 @@
             <field eval="'Purchase Manager'" name="function"/>
             <field eval="'Bruxelles'" name="city"/>
             <field name="country_id" ref="base.be"/>
-            <field name="section_id" ref="crm.section_sales_marketing_department"/>
+            <field name="section_id" ref="crm.crm_case_section_1"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>