diff --git a/addons/hr_recruitment_survey/__manifest__.py b/addons/hr_recruitment_survey/__manifest__.py
index ea19245c6ab..6dcce9a459c 100644
--- a/addons/hr_recruitment_survey/__manifest__.py
+++ b/addons/hr_recruitment_survey/__manifest__.py
@@ -13,7 +13,6 @@
     'data': [
         'security/hr_recruitment_survey_security.xml',
         'security/ir.model.access.csv',
-        'data/survey_survey_data.xml',
         'views/hr_job_views.xml',
         'views/hr_applicant_views.xml',
         'views/res_config_setting_views.xml',
diff --git a/addons/hr_recruitment_survey/data/hr_job_demo.xml b/addons/hr_recruitment_survey/data/hr_job_demo.xml
index 6d63e9faabc..d485df9000a 100644
--- a/addons/hr_recruitment_survey/data/hr_job_demo.xml
+++ b/addons/hr_recruitment_survey/data/hr_job_demo.xml
@@ -4,25 +4,25 @@
 
         <!--Manage the job_id to get in hr.applicant-->
         <record id="hr.job_developer" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_ceo" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_cto" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_consultant" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_hrm" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_marketing" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
         <record id="hr.job_trainee" model="hr.job">
-            <field name="survey_id" ref="recruitment_form"/>
+            <field name="survey_id" ref="survey_recruitment_form"/>
         </record>
 
     </data>
diff --git a/addons/hr_recruitment_survey/data/survey_demo.xml b/addons/hr_recruitment_survey/data/survey_demo.xml
index c12284cd20b..089b5df481b 100644
--- a/addons/hr_recruitment_survey/data/survey_demo.xml
+++ b/addons/hr_recruitment_survey/data/survey_demo.xml
@@ -1,227 +1,140 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <!-- Recruitment Form -->
-    <record id="recruitment_form" model="survey.survey">
+<odoo><data noupdate="1">
+    <record id="survey_recruitment_form" model="survey.survey">
         <field name="title">Recruitment Form</field>
-        <field name="stage_id" ref="survey.stage_permanent" />
-        <field name="auth_required" eval="True" />
-        <field name="users_can_go_back" eval="True" />
-        <field name="description">&lt;p&gt;This form is intended to help the responsible of a recruitment interview.&lt;/p&gt;</field>
-        <field name="thank_you_message">&lt;p&gt;&lt;/p&gt;</field>
-    </record>
-    <!-- Page 1 -->
-    <record id="recruitment_1" model="survey.page">
-        <field name="title">Basic information</field>
-        <field name="survey_id" ref="recruitment_form" />
-        <field name="sequence">1</field>
-        <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-    </record>
-    <record id="recruitment_1_1" model="survey.question">
-        <field name="page_id" ref="recruitment_1" />
-        <field name="sequence">1</field>
-        <field name="question">From which university will you graduate?</field>
-        <field name="question_type">textbox</field>
-    </record>
-    <record id="recruitment_1_2" model="survey.question">
-        <field name="page_id" ref="recruitment_1" />
-        <field name="sequence">2</field>
-        <field name="question">What is your gender?</field>
-        <field name="question_type">simple_choice</field>
-        <field name="display_mode">dropdown</field>
-    </record>
-    <record id="recruitment_1_2_1" model="survey.label">
-        <field name="question_id" ref="recruitment_1_2"/>
-        <field name="sequence">1</field>
-        <field name="value">Male</field>
-    </record>
-    <record id="recruitment_1_2_2" model="survey.label">
-        <field name="question_id" ref="recruitment_1_2"/>
-        <field name="sequence">2</field>
-        <field name="value">Female</field>
-    </record>
-    <record id="recruitment_1_3" model="survey.question">
-        <field name="page_id" ref="recruitment_1" />
-        <field name="sequence">3</field>
-        <field name="question">What age group do you belong to?</field>
-        <field name="question_type">simple_choice</field>
-        <field name="display_mode">columns</field>
-        <field name="column_nb">4</field>
-    </record>
-    <record id="recruitment_1_3_1" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">1</field>
-        <field name="value">0-15</field>
-    </record>
-    <record id="recruitment_1_3_2" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">2</field>
-        <field name="value">16-20</field>
-    </record>
-    <record id="recruitment_1_3_3" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">3</field>
-        <field name="value">21-30</field>
+        <field name="stage_id" ref="survey.stage_permanent"/>
+        <field name="auth_required" eval="True"/>
+        <field name="users_can_go_back" eval="True"/>
+        <field name="description" type="html">
+<p>
+    Please answer those questions to help recruitment officers to preprocess your application.
+</p></field>
+        <field name="thank_you_message" type="html">
+<p>
+    Thanks you for answering this survey. We will come back to you soon.
+</p></field>
     </record>
 
-    <record id="recruitment_1_3_4" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">4</field>
-        <field name="value">31-40</field>
-    </record>
-    <record id="recruitment_1_3_5" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">5</field>
-        <field name="value">41-50</field>
-    </record>
-    <record id="recruitment_1_3_6" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">6</field>
-        <field name="value">51-60</field>
-    </record>
-    <record id="recruitment_1_3_7" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">7</field>
-        <field name="value">61-70</field>
-    </record>
-    <record id="recruitment_1_3_8" model="survey.label">
-        <field name="question_id" ref="recruitment_1_3"/>
-        <field name="sequence">8</field>
-        <field name="value">71+</field>
-    </record>
-    <!-- Page 2 -->
-    <record id="recruitment_2" model="survey.page">
-        <field name="title">Education and Activities</field>
-        <field name="survey_id" ref="recruitment_form" />
-        <field name="sequence">2</field>
-        <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-    </record>
-    <record id="recruitment_2_1" model="survey.question">
-        <field name="page_id" ref="recruitment_2" />
+    <record id="survey_recruitment_form_p1" model="survey.page">
+        <field name="title">About you</field>
+        <field name="survey_id" ref="survey_recruitment_form"/>
         <field name="sequence">1</field>
-        <field name="question">Knowledge</field>
-        <field name="question_type">free_text</field>
+        <field name="description" type="html">
+<p>Please fill information about you: who you are, what are your education, experience, and activities.
+    It will help us managing your application.</p></field>
     </record>
-    <record id="recruitment_2_2" model="survey.question">
-        <field name="page_id" ref="recruitment_2" />
+    <record id="survey_recruitment_form_p1_q1" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
+        <field name="sequence">1</field>
+        <field name="question">Which country are you from ?</field>
+        <field name="question_type">textbox</field>
+    </record>
+    <record id="survey_recruitment_form_p1_q2" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
         <field name="sequence">2</field>
-        <field name="question">Education</field>
-        <field name="question_type">free_text</field>
+        <field name="question">From which university did or will you graduate ?</field>
+        <field name="question_type">textbox</field>
     </record>
-    <record id="recruitment_2_3" model="survey.question">
-        <field name="page_id" ref="recruitment_2" />
+    <record id="survey_recruitment_form_p1_q3" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
         <field name="sequence">3</field>
-        <field name="question">Experience</field>
+        <field name="question">Did you apply from an employee ?</field>
+        <field name="question_type">textbox</field>
+    </record>
+
+    <record id="survey_recruitment_form_p1_q4" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
+        <field name="sequence">1</field>
+        <field name="question">Education</field>
+        <field name="description" type="html">
+<p>Please summarize your education history: schools, location, diplomas, ...</p></field>
         <field name="question_type">free_text</field>
     </record>
-    <record id="recruitment_2_4" model="survey.question">
-        <field name="page_id" ref="recruitment_2" />
+    <record id="survey_recruitment_form_p1_q5" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
+        <field name="sequence">2</field>
+        <field name="question">Past work experiences</field>
+        <field name="description" type="html">
+<p>Please summarize your education history: schools, location, diplomas, ...</p></field>
+        <field name="question_type">free_text</field>
+    </record>
+    <record id="survey_recruitment_form_p1_q6" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
+        <field name="sequence">3</field>
+        <field name="question">Knowledge</field>
+        <field name="description" type="html">
+<p>What are your main knowledge regarding the job you are applying to ?</p></field>
+        <field name="question_type">free_text</field>
+    </record>
+    <record id="survey_recruitment_form_p1_q7" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
         <field name="sequence">4</field>
         <field name="question">Activities</field>
+        <field name="description" type="html">
+<p>Please tell us a bit more about yourself: what are your main activities, ...</p></field>
         <field name="question_type">free_text</field>
     </record>
-    <!-- Page 3 -->
-    <record id="recruitment_3" model="survey.page">
-        <field name="title">Importance</field>
-        <field name="survey_id" ref="recruitment_form" />
-        <field name="sequence">3</field>
-        <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-    </record>
-    <record id="recruitment_3_1" model="survey.question">
-        <field name="page_id" ref="recruitment_3" />
+
+    <record id="survey_recruitment_form_p1_q8" model="survey.question">
+        <field name="page_id" ref="survey_recruitment_form_p1"/>
         <field name="sequence">1</field>
-        <field name="question">Rate the Importance</field>
+        <field name="question">What is important for you ?</field>
         <field name="question_type">matrix</field>
         <field name="matrix_subtype">simple</field>
     </record>
-    <record id="rcol_3_1_1" model="survey.label">
-        <field name="question_id" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_col1" model="survey.label">
+        <field name="question_id" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">1</field>
         <field name="value">Not important</field>
     </record>
-    <record id="rcol_3_1_2" model="survey.label">
-        <field name="question_id" ref="recruitment_3_1"/>
-        <field name="sequence">2</field>
-        <field name="value">Somewhat important</field>
-    </record>
-    <record id="rcol_3_1_3" model="survey.label">
-        <field name="question_id" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_col2" model="survey.label">
+        <field name="question_id" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">3</field>
         <field name="value">Important</field>
     </record>
-    <record id="rcol_3_1_4" model="survey.label">
-        <field name="question_id" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_col3" model="survey.label">
+        <field name="question_id" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">4</field>
         <field name="value">Very important</field>
     </record>
-    <record id="rcol_3_1_5" model="survey.label">
-        <field name="question_id" ref="recruitment_3_1"/>
-        <field name="sequence">5</field>
-        <field name="value">Most important</field>
-    </record>
-
-    <record id="rrow_2_1_1" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row1" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">1</field>
-        <field name="value">Good pay</field>
+        <field name="value">Having a good pay</field>
     </record>
-    <record id="rrow_2_1_2" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row2" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">2</field>
         <field name="value">Getting on with colleagues</field>
     </record>
-    <record id="rrow_2_1_3" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row3" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">3</field>
-        <field name="value">Office environment</field>
+        <field name="value">Having a nice office environment</field>
     </record>
-    <record id="rrow_2_1_4" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
-        <field name="sequence">4</field>
-        <field name="value">Desk space</field>
-    </record>
-    <record id="rrow_2_1_5" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row4" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">5</field>
-        <field name="value">State of the art technology</field>
+        <field name="value">Working with state of the art technology</field>
     </record>
-    <record id="rrow_2_1_6" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row5" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">6</field>
         <field name="value">Office location</field>
     </record>
-    <record id="rrow_2_1_7" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row6" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">7</field>
-        <field name="value">Good management</field>
+        <field name="value">Management quality</field>
     </record>
-    <record id="rrow_2_1_8" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row7" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">8</field>
-        <field name="value">Freebies such as tea, coffee and stationery</field>
+        <field name="value">Having freebies such as tea, coffee and stationery</field>
     </record>
-    <record id="rrow_2_1_9" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
+    <record id="survey_recruitment_form_p1_q8_row8" model="survey.label">
+        <field name="question_id_2" ref="survey_recruitment_form_p1_q8"/>
         <field name="sequence">9</field>
-        <field name="value">Perks such as free parking, gym passes</field>
+        <field name="value">Getting perks such as free parking, gym passes</field>
     </record>
-    <record id="rrow_2_1_10" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
-        <field name="sequence">10</field>
-        <field name="value">No out of hours working</field>
-    </record>
-    <record id="rrow_2_1_11" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
-        <field name="sequence">11</field>
-        <field name="value">Dress code</field>
-    </record>
-    <record id="rrow_2_1_12" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
-        <field name="sequence">12</field>
-        <field name="value">Regular meetings</field>
-    </record>
-    <record id="rrow_2_1_13" model="survey.label">
-        <field name="question_id_2" ref="recruitment_3_1"/>
-        <field name="sequence">13</field>
-        <field name="value">Good social life</field>
-    </record>
-</odoo>
+</data></odoo>