diff --git a/addons/crm_hr/__terp__.py b/addons/crm_hr/__terp__.py
index 2dce90e2b66..48142785b31 100644
--- a/addons/crm_hr/__terp__.py
+++ b/addons/crm_hr/__terp__.py
@@ -32,16 +32,16 @@
     'website': 'http://www.openerp.com',
     'depends': ['crm','hr'],
     'init_xml': [
-        'crm_jobs_data.xml'
+        'crm_hr_data.xml'
     ],
     'update_xml': [
-        'crm_job_wizard.xml',                   
-        'crm_jobs_view.xml',
-        'crm_jobs_menu.xml',
-        'security/crm_job_security.xml', 
+        'crm_hr_wizard.xml',                   
+        'crm_hr_view.xml',
+        'crm_hr_menu.xml',
+        'security/crm_hr_security.xml', 
      ],
     'demo_xml': [
-        'crm_jobs_demo.xml'
+        'crm_hr_demo.xml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/crm_hr/crm_hr_demo.xml b/addons/crm_hr/crm_hr_demo.xml
index 3ab57a9f26c..fee80a6c761 100644
--- a/addons/crm_hr/crm_hr_demo.xml
+++ b/addons/crm_hr/crm_hr_demo.xml
@@ -9,7 +9,7 @@
 	<record id="crm_case_salesman0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
 		<field eval="time.strftime('%Y-%m-03')" name="date_deadline"/>
-		<field name="type_id" ref="crm_job.type_job1"/>
+		<field name="type_id" ref="crm_hr.type_job1"/>
 		<field name="partner_id" ref="base.res_partner_asus"/>
 		<field eval="&quot;2&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -20,8 +20,8 @@
 		<field eval="&quot;9963214587&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
 		<field eval="9.0" name="duration"/>
-		<field name="categ_id" ref="crm_job.categ_job1"/>
-		<field name="stage_id" ref="crm_job.stage_job1"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job1"/>
 		<field eval="&quot;Salesman&quot;" name="name"/>
 		<field eval="&quot;1236547890&quot;" name="partner_phone"/>
 	</record>
@@ -30,7 +30,7 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
-		<field name="type_id" ref="crm_job.type_job3"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -41,8 +41,8 @@
 		<field eval="&quot;marie@gmail.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9988774455&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_job.categ_job2"/>
-		<field name="stage_id" ref="crm_job.stage_job4"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="stage_id" ref="crm_hr.stage_job4"/>
 		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
 		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
 		<field eval="&quot;6633225&quot;" name="partner_phone"/>
@@ -52,7 +52,7 @@
 		<field name="som" ref="base.som_happy"/>
 		<field eval="time.strftime('%Y-%m-15 16:10:00')" name="date"/>
 		<field eval="time.strftime('%Y-%m-18')" name="date_deadline"/>
-		<field name="type_id" ref="crm_job.type_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_5"/>
 		<field eval="&quot;1&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -62,16 +62,16 @@
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="&quot;jose@timesgroup.com&quot;" name="partner_name2"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_job.categ_job1"/>
-		<field name="stage_id" ref="crm_job.stage_job3"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job3"/>
 		<field eval="&quot;Fresher&quot;" name="name"/>
 		<field eval="&quot;999666735&quot;" name="partner_phone"/>
 	</record>
 	<record id="crm_case_yrsexperienceinphp0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="categ_id" ref="crm_job.categ_job2"/>
-		<field name="type_id" ref="crm_job.type_job3"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_10"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -81,13 +81,13 @@
 		<field eval="&quot;cancel&quot;" name="state"/>
 		<field name="section_id" ref="crm.section_sales_department"/>
 		<field eval="1" name="active"/>
-		<field name="stage_id" ref="crm_job.stage_job6"/>
+		<field name="stage_id" ref="crm_hr.stage_job6"/>
 		<field eval="&quot;More than 5 yrs Experience in PHP&quot;" name="name"/>
 	</record>
 	<record id="crm_case_marketingjob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="type_id" ref="crm_job.type_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_demo"/>
@@ -98,15 +98,15 @@
 		<field eval="&quot;john@market.edu&quot;" name="partner_name2"/>
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_job.categ_job1"/>
-		<field name="stage_id" ref="crm_job.stage_job5"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job5"/>
 		<field eval="&quot;Marketing Job&quot;" name="name"/>
 		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>
 	<record id="crm_case_financejob0" model="crm.job">
 		<field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
 		<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
-		<field name="type_id" ref="crm_job.type_job2"/>
+		<field name="type_id" ref="crm_hr.type_job2"/>
 		<field name="partner_id" ref="base.res_partner_11"/>
 		<field eval="&quot;4&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -117,8 +117,8 @@
 		<field eval="&quot;9966332214&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
 		<field eval="2.20" name="duration"/>
-		<field name="categ_id" ref="crm_job.categ_job1"/>
-		<field name="stage_id" ref="crm_job.stage_job5"/>
+		<field name="categ_id" ref="crm_hr.categ_job1"/>
+		<field name="stage_id" ref="crm_hr.stage_job5"/>
 		<field eval="&quot;Finance Job&quot;" name="name"/>
 		<field eval="&quot;33968745&quot;" name="partner_phone"/>
 	</record>	
@@ -127,7 +127,7 @@
 		<field name="partner_address_id" ref="base.res_partner_address_14"/>
 		<field name="som" ref="base.som_fury"/>
 		<field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
-		<field name="type_id" ref="crm_job.type_job3"/>
+		<field name="type_id" ref="crm_hr.type_job3"/>
 		<field name="partner_id" ref="base.res_partner_15"/>
 		<field eval="&quot;3&quot;" name="priority"/>
 		<field name="user_id" ref="base.user_root"/>
@@ -138,8 +138,8 @@
 		<field eval="&quot;tina_augustie@example.com&quot;" name="partner_name2"/>
 		<field eval="&quot;9898745745&quot;" name="partner_mobile"/>
 		<field eval="1" name="active"/>
-		<field name="categ_id" ref="crm_job.categ_job2"/>
-		<field name="stage_id" ref="crm_job.stage_job4"/>
+		<field name="categ_id" ref="crm_hr.categ_job2"/>
+		<field name="stage_id" ref="crm_hr.stage_job4"/>
 		<field eval="&quot;Trainee - MCA&quot;" name="name"/>
 		<field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
 		<field eval="&quot;6630125&quot;" name="partner_phone"/>
diff --git a/addons/crm_hr/security/crm_job_security.xml b/addons/crm_hr/security/crm_hr_security.xml
similarity index 100%
rename from addons/crm_hr/security/crm_job_security.xml
rename to addons/crm_hr/security/crm_hr_security.xml