diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm_configuration/__terp__.py
index c97fc82c7ac..aaae1ec50af 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm_configuration/__terp__.py
@@ -34,7 +34,7 @@ This module implements a dashboard for CRM that includes:
     * Jobs Tracking (graph)
     """,
     'author': 'Tiny',
-    'depends': ['board', 'crm_configuration'],
+    'depends': ['board', 'crm', 'report_crm'],
     'update_xml': ['board_crm_statistical_view.xml', 'board_crm_view.xml'],
     'demo_xml': ['board_crm_demo.xml'],
     'installable': True,
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index d5600eff893..505f939de40 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -21,7 +21,7 @@
 			<field name="res_model">crm.case</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm_configuration.crm_case_tree_view_leads"/>
+			<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
             <field name="domain">[('section_id.name', '=', 'Prospects'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 
@@ -29,7 +29,7 @@
 			<field name="res_model">crm.case</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm_configuration.crm_case_tree_view_meet"/>
+			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
 			<field name="domain">[('section_id.name', '=', 'Meetings'),('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
 			
diff --git a/addons/crm_vertical/__terp__.py b/addons/crm_vertical/__terp__.py
index ba78533f552..e1ec9b1e8e8 100644
--- a/addons/crm_vertical/__terp__.py
+++ b/addons/crm_vertical/__terp__.py
@@ -27,7 +27,7 @@
     'description': """Simplification of the interface for CRM.""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['crm_configuration'],
+    'depends': ['crm'],
     'init_xml': [],
     'update_xml': [],
     'demo_xml': [],
diff --git a/addons/crm_vertical/crm_bugs_vertical_view.xml b/addons/crm_vertical/crm_bugs_vertical_view.xml
index 75dbffc9559..3fad8390df4 100644
--- a/addons/crm_vertical/crm_bugs_vertical_view.xml
+++ b/addons/crm_vertical/crm_bugs_vertical_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>		
-		<record id="crm_configuration.menu_crm_case_bug_track" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_bug_track" model="ir.ui.menu">
 			<field eval="&quot;terp-sale&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
diff --git a/addons/crm_vertical/crm_fund_vertical_view.xml b/addons/crm_vertical/crm_fund_vertical_view.xml
index 0a611753ec2..762211f91a9 100644
--- a/addons/crm_vertical/crm_fund_vertical_view.xml
+++ b/addons/crm_vertical/crm_fund_vertical_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-		<record id="crm_configuration.menu_crm_case_fund_raise" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_fund_raise" model="ir.ui.menu">
 			<field eval="&quot;terp-sale&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
diff --git a/addons/crm_vertical/crm_jobs_vertical_view.xml b/addons/crm_vertical/crm_jobs_vertical_view.xml
index 2a3abb7fe42..12e480d6e6d 100644
--- a/addons/crm_vertical/crm_jobs_vertical_view.xml
+++ b/addons/crm_vertical/crm_jobs_vertical_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>		
-		<record id="crm_configuration.menu_crm_case_job_req_main" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_job_req_main" model="ir.ui.menu">
 			<field eval="Jobs Requests" name="name"/>
 			<field eval="&quot;terp-hr&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
 		<!-- short cut -->
 		<record id="ir_ui_view_sc_myjobsrequests0" model="ir.ui.view_sc">
-				<field ref="crm_configuration.menu_crm_case_categ0_act11" name="res_id"/>
+				<field ref="crm.menu_crm_case_categ0_act11" name="res_id"/>
 				<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
 				<field eval="&quot;My Jobs Requests&quot;" name="name"/>
 				<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_vertical/crm_lead_vertical_view.xml b/addons/crm_vertical/crm_lead_vertical_view.xml
index 7fd0be28988..cadad1cfe93 100644
--- a/addons/crm_vertical/crm_lead_vertical_view.xml
+++ b/addons/crm_vertical/crm_lead_vertical_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>		
-		<record id="crm_configuration.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_categ0_act_leads" model="ir.ui.menu">
 			<field eval="&quot;Prospects Tracking&quot;" name="name"/>
 			<field eval="&quot;terp-account&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
 		<!-- short cut -->
 	<record id="ir_ui_view_sc_myleads0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ0_act_leads_my" name="res_id"/>
+			<field ref="crm.menu_crm_case_categ0_act_leads_my" name="res_id"/>
 			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
 			<field eval="&quot;My Prospects&quot;" name="name"/>
 			<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_vertical/crm_meeting_vertical_view.xml b/addons/crm_vertical/crm_meeting_vertical_view.xml
index fe638b8abab..798cf067bcb 100644
--- a/addons/crm_vertical/crm_meeting_vertical_view.xml
+++ b/addons/crm_vertical/crm_meeting_vertical_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_category_act_meetings" model="ir.ui.menu">
 			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
 			<field eval="&quot;terp-calendar&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
 		<!-- short cut -->
 	<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
-			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
+			<field ref="crm.menu_crm_case_categ_meet_my" name="res_id"/>
 			<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
 			<field eval="&quot;My Meetings&quot;" name="name"/>
 			<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_vertical/crm_opportunity_vertical_view.xml b/addons/crm_vertical/crm_opportunity_vertical_view.xml
index f7c4dd5f8d6..9ceb9de5840 100644
--- a/addons/crm_vertical/crm_opportunity_vertical_view.xml
+++ b/addons/crm_vertical/crm_opportunity_vertical_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>		
-		<record id="crm_configuration.menu_crm_case_opp" model="ir.ui.menu">
+		<record id="crm.menu_crm_case_opp" model="ir.ui.menu">
 			<field eval="&quot;terp-sale&quot;" name="icon"/>
 			<field eval="Opportunities" name="name"/>
 			<field eval="False" name="parent_id"/>
 		</record>
 		<!-- short cut -->
 		<record id="ir_ui_view_sc_openopportunities0" model="ir.ui.view_sc">
-				<field ref="crm_configuration.menu_crm_case_categ0_act_oppor1" name="res_id"/>
+				<field ref="crm.menu_crm_case_categ0_act_oppor1" name="res_id"/>
 				<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
 				<field eval="&quot;Open Opportunities&quot;" name="name"/>
 				<field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_vertical/crm_vertical.py b/addons/crm_vertical/crm_vertical.py
index 68fb7bf8342..d22909c1883 100644
--- a/addons/crm_vertical/crm_vertical.py
+++ b/addons/crm_vertical/crm_vertical.py
@@ -38,7 +38,7 @@ class crm_menu_config_wizard(osv.osv_memory):
                 if res[section]:
                     file_name = 'crm_'+section+'_vertical_view.xml'
                     try:
-                        tools.convert_xml_import(cr, 'crm_configuration', tools.file_open(os.path.join('crm_vertical',file_name )),  {}, 'init', *args)
+                        tools.convert_xml_import(cr, 'crm', tools.file_open(os.path.join('crm_vertical',file_name )),  {}, 'init', *args)
                     except Exception, e:
                         raise osv.except_osv(_('Error !'), str(e))
         return res
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 852ca6477f9..2aaec93c781 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm_configuration', 'process'],
+    'depends': ['hr', 'crm', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 635cb9ddb80..7f18b7edd86 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -372,83 +372,83 @@
 
 <!--        CRM     -->
 <!--
-        <record id="crm_configuration.crm_case_claim01" model="crm.case">
+        <record id="crm.crm_case_claim01" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_claim02" model="crm.case">
+        <record id="crm.crm_case_claim02" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="crm_configuration.crm_case_claim03" model="crm.case">
+        <record id="crm.crm_case_claim03" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_claim04" model="crm.case">
+        <record id="crm.crm_case_claim04" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
-        <record id="crm_configuration.crm_case_claim05" model="crm.case">
+        <record id="crm.crm_case_claim05" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_claim06" model="crm.case">
+        <record id="crm.crm_case_claim06" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 
-        <record id="crm_configuration.crm_case_construstazunits0" model="crm.case">
+        <record id="crm.crm_case_construstazunits0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_rdroundfundingunits0" model="crm.case">
+        <record id="crm.crm_case_rdroundfundingunits0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_mediapoleunits0" model="crm.case">
+        <record id="crm.crm_case_mediapoleunits0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="crm_configuration.crm_case_abcfuelcounits0" model="crm.case">
+        <record id="crm.crm_case_abcfuelcounits0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
-        <record id="crm_configuration.crm_case_dirtminingltdunits0" model="crm.case">
+        <record id="crm.crm_case_dirtminingltdunits0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
 -->
 <!--For Bug Tracking-->
 <!--
-        <record id="crm_configuration.crm_case_buginaccountsmodule0" model="crm.case">
+        <record id="crm.crm_case_buginaccountsmodule0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_programnotgivingproperoutput0" model="crm.case">
+        <record id="crm.crm_case_programnotgivingproperoutput0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="crm_configuration.crm_case_outputincorrect0" model="crm.case">
+        <record id="crm.crm_case_outputincorrect0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="crm_configuration.crm_case_problemloadingpage0" model="crm.case">
+        <record id="crm.crm_case_problemloadingpage0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_pagenotfound0" model="crm.case">
+        <record id="crm.crm_case_pagenotfound0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
-        <record id="crm_configuration.crm_case_programmingerror0" model="crm.case">
+        <record id="crm.crm_case_programmingerror0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_logicalerrorinprogram0" model="crm.case">
+        <record id="crm.crm_case_logicalerrorinprogram0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_constrainterror0" model="crm.case">
+        <record id="crm.crm_case_constrainterror0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_us"/>
         </record>
-        <record id="crm_configuration.crm_case_errorinprogram0" model="crm.case">
+        <record id="crm.crm_case_errorinprogram0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_newfeaturestobeadded0" model="crm.case">
+        <record id="crm.crm_case_newfeaturestobeadded0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_addmenustothemodule0" model="crm.case">
+        <record id="crm.crm_case_addmenustothemodule0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_includeattendancesheetinproject0" model="crm.case">
+        <record id="crm.crm_case_includeattendancesheetinproject0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_createnewobject0" model="crm.case">
+        <record id="crm.crm_case_createnewobject0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_be"/>
         </record>
-        <record id="crm_configuration.crm_case_improvereportsinhrms0" model="crm.case">
+        <record id="crm.crm_case_improvereportsinhrms0" model="crm.case">
          	    <field name="company_id" ref="res_company_oerp_in"/>
         </record>
 -->
diff --git a/addons/sale_crm/__terp__.py b/addons/sale_crm/__terp__.py
index ad189c6a91c..fd4aa3e89de 100644
--- a/addons/sale_crm/__terp__.py
+++ b/addons/sale_crm/__terp__.py
@@ -39,7 +39,7 @@ crm_configuration modules.
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['sale', 'crm_configuration'],
+    'depends': ['sale', 'crm'],
     'init_xml': [],
     'update_xml': ['sale_crm_wizard.xml', 'sale_crm_view.xml', 'process/sale_crm_process.xml'],
     'demo_xml': [],
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 17c6f49d9b2..e3a81b3cd7e 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Convert opportunity to quotation&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field name="process_id" ref="crm.process_process_contractprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -22,7 +22,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field name="subflow_id" ref="crm.process_process_contractprocess0"/>
             <field name="process_id" ref="sale.process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -34,7 +34,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field name="process_id" ref="crm.process_process_contractprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
 
@@ -44,7 +44,7 @@
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Contract Pricelist&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Contract Volume (pricelist)&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="crm_configuration.process_process_contractprocess0"/>
+            <field name="process_id" ref="crm.process_process_contractprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
 
@@ -69,7 +69,7 @@
             <field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/>
-            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunitypricelist0" model="process.transition">
@@ -78,7 +78,7 @@
             <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
-            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunityanalytic0" model="process.transition">
@@ -87,7 +87,7 @@
             <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
-            <field model="process.node" name="source_node_id" ref="crm_configuration.process_node_opportunities0"/>
+            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
     </data>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 03f82f23cc9..2ff1daf2a6d 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -6,7 +6,7 @@
         <field name="name">CRM - Opportunities - Quote Inherit</field>
         <field name="model">crm.case</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="crm_configuration.crm_case_form_view_oppor"/>
+        <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
                 <button string="Convert to Quote" icon="terp-sale" name="%(sale_crm_wizard)d" type="action"/>