diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py
index 947c6b43142..7fbc5d32426 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm/crm_claim.py
@@ -82,7 +82,7 @@ class crm_claim(osv.osv):
                                                                        "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
         'categ_id': fields.many2one('crm.claim.categ','Category', domain="[('section_id','=',section_id)]"),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
-        'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
+        'category2_id': fields.many2one('crm.claim.type', 'Claim Type', domain="[('section_id','=',section_id)]"),
         
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
diff --git a/addons/crm/crm_fund_data.xml b/addons/crm/crm_fund_data.xml
index d5149f59f52..f76ca888123 100644
--- a/addons/crm/crm_fund_data.xml
+++ b/addons/crm/crm_fund_data.xml
@@ -41,7 +41,7 @@
         <field name="section_id" ref="section_sales_department"/>
     </record>
     
-    <record model="crm.case.category2" id="categ2_fund4">
+    <record model="crm.fundraising.type" id="categ2_fund4">
         <field name="name">Demand Draft</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>    
diff --git a/addons/crm/crm_fundraising.py b/addons/crm/crm_fundraising.py
index 290620d6154..712586b2186 100644
--- a/addons/crm/crm_fundraising.py
+++ b/addons/crm/crm_fundraising.py
@@ -87,7 +87,7 @@ class crm_fundraising(osv.osv):
             'partner_phone': fields.char('Phone', size=32),
             'partner_mobile': fields.char('Mobile', size=32), 
             'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
-            'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
+            'category2_id': fields.many2one('crm.fundraising.type', 'Fundraising Type', domain="[('section_id','=',section_id)]"),
             'duration': fields.float('Duration'),
             'case_id': fields.many2one('crm.case', 'Related fundraising'),
             'ref' : fields.reference('Reference', selection=_links_get, size=128),
diff --git a/addons/crm/crm_helpdesk.py b/addons/crm/crm_helpdesk.py
index 03e110844e5..8bb62c17884 100644
--- a/addons/crm/crm_helpdesk.py
+++ b/addons/crm/crm_helpdesk.py
@@ -59,15 +59,6 @@ class crm_helpdesk_categ(osv.osv):
     }
 crm_helpdesk_categ()
 
-class crm_helpdesk_type(osv.osv):
-    _name = "crm.helpdesk.type"
-    _description = "Helpdesk Type"
-    _rec_name = "name"
-    _columns = {
-        'name': fields.char('Helpdesk Type Name', size=64, required=True, translate=True),
-        'section_id': fields.many2one('crm.case.section', 'Case Section'),
-    }
-crm_helpdesk_type()
 class crm_helpdesk(osv.osv):
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bb3ed628fbf..62f2f9ea26e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -80,7 +80,7 @@ class crm_lead(osv.osv):
     _inherit = 'crm.case'    
     _columns = {
             'categ_id': fields.many2one('crm.lead.categ', 'Category', domain="[('section_id','=',section_id)]"),
-            'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
+            'category2_id': fields.many2one('crm.lead.type', 'Lead Type Name', domain="[('section_id','=',section_id)]"),
             'partner_name': fields.char("Employee's Name", size=64),
             'partner_name2': fields.char('Employee Email', size=64),
             'partner_phone': fields.char('Phone', size=32),
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 6ceb41beb5f..3c329d22a39 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -74,7 +74,7 @@
         <field name="name">Print</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="ccrm.lead.type" id="category_lead5">
+    <record model="crm.lead.type" id="category_lead5">
         <field name="name">Web</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
@@ -82,7 +82,7 @@
         <field name="name">Radio</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
-    <record model="ccrm.lead.type" id="category_lead7">
+    <record model="crm.lead.type" id="category_lead7">
         <field name="name">Television</field>
         <field name="section_id" ref="section_sales_department"/>
     </record>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 861b59a6635..4d646cc93af 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -77,7 +77,7 @@ class crm_opportunity(osv.osv):
     _columns = {        
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id)]"),
         'categ_id': fields.many2one('crm.opportunity.categ', 'Category', domain="[('section_id','=',section_id)]"),
-        'category2_id': fields.many2one('crm.case.category2', 'Category Name', domain="[('section_id','=',section_id)]"),
+        'category2_id': fields.many2one('crm.opportunity.type', 'Opportunity Type', domain="[('section_id','=',section_id)]"),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Planned Revenue'),