diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 26993452494..dab7e235671 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -7,47 +7,47 @@
             <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
         </record>
 
-        <record id="res_users_analyst" model="res.users">
-            <field name="name">Phuong</field>
+        <record id="base.user_niv" model="res.users">
+            <field name="name">Nicolas</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">phu</field>
-            <field name="password">phu</field>
+            <field name="login">niv</field>
+            <field name="password">niv</field>
         </record>
-        <record id="res_users_project_manager" model="res.users">
-            <field name="name">Anthony</field>
+        <record id="base.user_al" model="res.users">
+            <field name="name">Antony</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">ale</field>
-            <field name="password">ale</field>
+            <field name="login">al</field>
+            <field name="password">al</field>
         </record>
-        <record id="res_users_technical_leader" model="res.users">
+        <record id="base.user_qdp" model="res.users">
             <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">qdpa</field>
-            <field name="password">qdpa</field>
+            <field name="login">qdp</field>
+            <field name="password">qdp</field>
         </record>
-        <record id="res_users_developer" model="res.users">
+        <record id="base.user_fpi" model="res.users">
             <field name="name">Francois</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">fpie</field>
-            <field name="password">fpie</field>
+            <field name="login">fpi</field>
+            <field name="password">fpi</field>
         </record>
-        <record id="res_users_designer" model="res.users">
+        <record id="base.user_jth" model="res.users">
             <field name="name">Julien</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">jthe</field>
-            <field name="password">jthe</field>
+            <field name="login">jth</field>
+            <field name="password">jth</field>
         </record>
-        <record id="res_users_tester" model="res.users">
-            <field name="name">Aline</field>
+        <record id="base.user_mit" model="res.users">
+            <field name="name">Minh</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">apre</field>
-            <field name="password">apre</field>
+            <field name="login">mit</field>
+            <field name="password">mit</field>
         </record>
-        <record id="res_users_finacial_manager" model="res.users">
-            <field name="name">Fabian</field>
+        <record id="base.user_vad" model="res.users">
+            <field name="name">Valérie</field>
             <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="login">fbs</field>
-            <field name="password">fbs</field>
+            <field name="login">vad</field>
+            <field name="password">vad</field>
         </record>
 
         <!-- Projects -->
@@ -57,14 +57,14 @@
             <field name="type">normal</field>
             <field name="description">Integrate a Sale and Warehouse Management.</field>
             <field eval="[(6, 0, [
-                    ref('project.res_users_analyst'),
-                    ref('project.res_users_project_manager'),
-                    ref('project.res_users_technical_leader'),
-                    ref('project.res_users_developer'),
-                    ref('project.res_users_designer'),
-                    ref('project.res_users_tester'),
-                    ref('project.res_users_finacial_manager')])]" name="members"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+                    ref('base.user_niv'),
+                    ref('base.user_al'),
+                    ref('base.user_qdp'),
+                    ref('base.user_fpi'),
+                    ref('base.user_jth'),
+                    ref('base.user_mit'),
+                    ref('base.user_vad')])]" name="members"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="name">Integrate a Sale and Warehouse Management.</field>
         </record>
 
@@ -72,7 +72,7 @@
 
         <record id="project_task_1" model="project.task">
             <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Prepare Requirements Document</field>
@@ -82,7 +82,7 @@
 
         <record id="project_task_2" model="project.task">
             <field eval="80.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Make SRS</field>
@@ -91,7 +91,7 @@
 
         <record id="project_task_3" model="project.task">
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Design Use Cases</field>
@@ -101,7 +101,7 @@
 
         <record id="project_task_4" model="project.task">
             <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Budget Planning</field>
@@ -113,7 +113,7 @@
 
         <record id="project_task_5" model="project.task">
             <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Quality Planning</field>
@@ -125,7 +125,7 @@
 
         <record id="project_task_6" model="project.task">
             <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Risk Management Planning</field>
@@ -134,7 +134,7 @@
 
         <record id="project_task_7" model="project.task">
             <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Create Project Schedules</field>
@@ -143,7 +143,7 @@
 
         <record id="project_task_8" model="project.task">
             <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Dataflow Design</field>
@@ -153,7 +153,7 @@
 
         <record id="project_task_9" model="project.task">
             <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">User Interface Design</field>
@@ -162,7 +162,7 @@
 
         <record id="project_task_10" model="project.task">
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop Module in Sale Management</field>
@@ -172,7 +172,7 @@
 
         <record id="project_task_11" model="project.task">
             <field eval="90.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Develop module in Warehouse</field>
@@ -183,7 +183,7 @@
         
         <record id="project_task_12" model="project.task">
             <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
@@ -194,7 +194,7 @@
         
         <record id="project_task_13" model="project.task">
             <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Unit Testing</field>
@@ -205,7 +205,7 @@
 
         <record id="project_task_14" model="project.task">
             <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Regression Test</field>
@@ -215,7 +215,7 @@
 
         <record id="project_task_15" model="project.task">
             <field eval="15.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Documentation</field>
@@ -226,7 +226,7 @@
         <record id="project_task_16" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="user_id" ref="base.user_mit"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Performance Tuning</field>
@@ -237,7 +237,7 @@
 
         <record id="project_task_17" model="project.task">
             <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Deploy and Review on Customer System</field>
@@ -247,7 +247,7 @@
 
         <record id="project_task_18" model="project.task">
             <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="user_id" ref="base.user_niv"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_integrate_openerp"/>
             <field name="name">Training and Presentation</field>
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 73250de2963..c4d17f783f6 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -11,7 +11,7 @@
     - state == "pending"
 -
   !record {model: project.task.delegate, id: delegate_id}:
-    user_id: res_users_analyst
+    user_id: base.user_niv
     planned_hours: 12.0
     planned_hours_me: 2.0
 -
diff --git a/addons/project_planning/project_planning_demo.xml b/addons/project_planning/project_planning_demo.xml
index f1b7e288734..4abf8786378 100644
--- a/addons/project_planning/project_planning_demo.xml
+++ b/addons/project_planning/project_planning_demo.xml
@@ -10,7 +10,7 @@
             <field name="date_from" eval="time.strftime('%Y-%m-01')"/>
             <field name="date_to" eval="time.strftime('%Y-%m-28')"/>
             <field name="state">open</field>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
         </record>
         
         
@@ -19,7 +19,7 @@
             <field name="amount">16.0</field>
             <field name="amount_unit" ref="product.uom_hour"/>
             <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="task_ids" eval="[(6,0,[ref('project.project_task_188')])]"/>
         </record>        
 
@@ -29,7 +29,7 @@
             <field name="amount">24.0</field>
             <field name="amount_unit" ref="product.uom_hour"/>
             <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="project.res_users_technical_leader"/>
+            <field name="user_id" ref="base.user_qdp"/>
             <field name="task_ids" eval="[(6,0,[ref('project.project_task_190')])]"/>
         </record>     
         
@@ -39,7 +39,7 @@
             <field name="amount">90.0</field>
             <field name="amount_unit" ref="product.uom_hour"/>
             <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="task_ids" eval="[(6,0,[ref('project.project_task_11')])]"/>
         </record>     
         
@@ -49,7 +49,7 @@
             <field name="amount">50.0</field>
             <field name="amount_unit" ref="product.uom_hour"/>
             <field name="planning_id" ref="project_plannning_1"/>
-            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="user_id" ref="base.user_mit"/>
             <field name="task_ids" eval="[(6,0,[ref('project.project_task_13')])]"/>
         </record>     
 
diff --git a/addons/project_scrum/test/sprint_process.yml b/addons/project_scrum/test/sprint_process.yml
index 8c8f70b1188..c731daf4ad5 100644
--- a/addons/project_scrum/test/sprint_process.yml
+++ b/addons/project_scrum/test/sprint_process.yml
@@ -34,7 +34,7 @@
   I create tasks from backlog "Automatic migration system" for sprint
 -
   !python {model: project.scrum.backlog.create.task}: |
-    new_id = self.create(cr, uid, {'user_id': ref("project.res_users_project_manager")})
+    new_id = self.create(cr, uid, {'user_id': ref("base.user_al")})
     task_obj = self.pool.get('project.task')
     backlog_obj = self.pool.get('project.scrum.product.backlog')
 
@@ -44,7 +44,7 @@
     assert len(task_ids), "Task not created"
     task = task_obj.browse(cr, uid, task_ids[0], context)
 
-    assert task.name == backlog_data.name and task.total_hours == backlog_data.expected_hours and  task.user_id and task.user_id.id == ref("project.res_users_project_manager"), 'Task not has been created'
+    assert task.name == backlog_data.name and task.total_hours == backlog_data.expected_hours and  task.user_id and task.user_id.id == ref("base.user_al"), 'Task not has been created'
 -
   I send email to scrum master with scrum meeting details.
 -
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 1b9c2e5897b..8b965f5229c 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -3,13 +3,13 @@
     <data noupdate="1">
         <!-- Example employee -->
         <record id="hr.employee_qdp" model="hr.employee">
-            <field name="user_id" ref="project.res_users_technical_leader"/>
+            <field name="user_id" ref="base.user_qdp"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
         <record id="hr.employee_al" model="hr.employee">
-            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="user_id" ref="base.user_al"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
@@ -17,7 +17,7 @@
         <record id="hr.employee_mit" model="hr.employee">
             <field name="name">Phuong</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="user_id" ref="base.user_niv"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -26,7 +26,7 @@
         <record id="hr.employee_fpi" model="hr.employee">
             <field name="name">Francois</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="user_id" ref="base.user_fpi"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -34,7 +34,7 @@
         <record id="hr.employee_jth" model="hr.employee">
             <field name="name">Julien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="project.res_users_designer"/>
+            <field name="user_id" ref="base.user_jth"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -42,7 +42,7 @@
         <record id="hr.employee7" model="hr.employee">
             <field name="name">Alien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="user_id" ref="base.user_mit"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -50,7 +50,7 @@
         <record id="hr.employee8" model="hr.employee">
             <field name="name">Fabian</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="project.res_users_finacial_manager"/>
+            <field name="user_id" ref="base.user_vad"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
             <field name="product_id" ref="product.product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index d9c1212c022..fe487729f81 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -6,7 +6,7 @@
     name: Test Timesheet records
     task_id: project.project_task_1
     hours: 20.0
-    user_id: project.res_users_analyst
+    user_id: base.user_niv
     company_id: base.main_company
 -
   I check Timesheet line for employee in current Timesheet
@@ -16,6 +16,6 @@
     start = (datetime.date.today().strftime('%Y-%m-%d'))
     task_work = self.search(cr, uid, [("name","=","Prepare Requirements Document: Test Timesheet records")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.user_id.id == ref("project.res_users_analyst"), 'Error, The User in Timesheet is not Correct'
+    assert task_ids.user_id.id == ref("base.user_niv"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
     assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'