diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3c52f2583e6..8a93a47143b 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -3147,355 +3147,355 @@
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_0" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="response_line_id" ref="survey_response_line_0"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_answer_saas_services"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_1" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="response_line_id" ref="survey_response_line_0"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_answer_specific_devlopments"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_2" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="response_line_id" ref="survey_response_line_0"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_answer_with_specific_devlopments"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_3" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="response_line_id" ref="survey_response_line_1"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_company_size_Europ"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_4" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="response_line_id" ref="survey_response_line_1"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_company_size_Asia"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_5" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_2"/>
+            <field name="response_line_id" ref="survey_response_line_2"/>
             <field name="answer_id" ref="survey.survey_question_company_size_51"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_6" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_3"/>
+            <field name="response_line_id" ref="survey_response_line_3"/>
             <field name="answer_id" ref="survey.survey_question_company_size_before_2006"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_7" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_5"/>
+            <field name="response_line_id" ref="survey_response_line_5"/>
             <field name="answer_id" ref="survey.survey_answer_Clear"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_8" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_6"/>
+            <field name="response_line_id" ref="survey_response_line_6"/>
             <field name="answer_id" ref="survey.survey_answer_sometimes"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_9" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_7"/>
+            <field name="response_line_id" ref="survey_response_line_7"/>
             <field name="answer_id" ref="survey.survey_answer_maintenance_contract"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_10" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Good"/>
-            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="response_line_id" ref="survey_response_line_8"/>
             <field name="answer_id" ref="survey.survey_answer_Maintenance_contracts"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_11" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Very_Good"/>
-            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="response_line_id" ref="survey_response_line_8"/>
             <field name="answer_id" ref="survey.survey_answer_partner_Leads"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_12" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Very_Good"/>
-            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="response_line_id" ref="survey_response_line_8"/>
             <field name="answer_id" ref="survey.survey_answer_Training_sessions"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_13" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="response_line_id" ref="survey_response_line_9"/>
             <field name="answer_id" ref="survey.survey_answer_modify_a_translation"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_14" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_No"/>
-            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="response_line_id" ref="survey_response_line_9"/>
             <field name="answer_id" ref="survey.survey_answer_bug_or_blueprint"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_15" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="response_line_id" ref="survey_response_line_9"/>
             <field name="answer_id" ref="survey.survey_answer_find_openobject_website1"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_16" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Easy"/>
-            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="response_line_id" ref="survey_response_line_11"/>
             <field name="answer_id" ref="survey.survey_answer_converted_in_customers"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_17" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Very_Easy"/>
-            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="response_line_id" ref="survey_response_line_11"/>
             <field name="answer_id" ref="survey.survey_answer_find_openobject_website"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_18" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_12"/>
+            <field name="response_line_id" ref="survey_response_line_12"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_OpenERP_website"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_19" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="response_line_id" ref="survey_response_line_13"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Other_sector"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_20" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="response_line_id" ref="survey_response_line_13"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Services"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_21" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="response_line_id" ref="survey_response_line_13"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_HR"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_22" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="response_line_id" ref="survey_response_line_13"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Engineering"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_23" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Customer_Accounting_Finance"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_24" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Customer_Relationship_Management"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_25" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Sales_Purchases"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_26" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Customer_Human_Resources"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_27" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Other_odoo_mange_with_odoo"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_28" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Project_Management"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_29" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="response_line_id" ref="survey_response_line_15"/>
             <field name="answer">1</field>
             <field name="answer_id" ref="survey.survey_question_Customer_inventory_Management"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_30" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_16"/>
+            <field name="response_line_id" ref="survey_response_line_16"/>
             <field name="answer_id" ref="survey.survey_answer_yes"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_31" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_17"/>
+            <field name="response_line_id" ref="survey_response_line_17"/>
             <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer1"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_32" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="response_line_id" ref="survey_response_line_18"/>
             <field name="answer_id" ref="survey.survey_answer_importing_my_data"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_33" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="response_line_id" ref="survey_response_line_18"/>
             <field name="answer_id" ref="survey.survey_answer_initial_data"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_34" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="response_line_id" ref="survey_response_line_18"/>
             <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_35" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="response_line_id" ref="survey_response_line_18"/>
             <field name="answer_id" ref="survey.survey_answer_configuring_the_modules"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_36" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="response_line_id" ref="survey_response_line_18"/>
             <field name="answer_id" ref="survey.survey_answer_adding_modules_need"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_37" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_19"/>
+            <field name="response_line_id" ref="survey_response_line_19"/>
             <field name="answer_id" ref="survey.survey_answer_both_interface"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_38" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_yes_but_be_better"/>
-            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="response_line_id" ref="survey_response_line_21"/>
             <field name="answer_id" ref="survey.survey_answer_faq_clear_and_choicese"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_39" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_no_opinion"/>
-            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="response_line_id" ref="survey_response_line_21"/>
             <field name="answer_id" ref="survey.survey_answer_webclient_simple_and_useful"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_40" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_Absolutely"/>
-            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="response_line_id" ref="survey_response_line_21"/>
             <field name="answer_id" ref="survey.survey_answer_control_center_user_friendly"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_41" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_no_opinion"/>
-            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="response_line_id" ref="survey_response_line_21"/>
             <field name="answer_id" ref="survey.survey_answer_appropriately_structured"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_42" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_think_Easy"/>
-            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="response_line_id" ref="survey_response_line_22"/>
             <field name="answer_id" ref="survey.survey_answer_downloadin_your_backups"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_43" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_think_Difficult"/>
-            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="response_line_id" ref="survey_response_line_22"/>
             <field name="answer_id" ref="survey.survey_answer_duplicating_database"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_44" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_think_Easy"/>
-            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="response_line_id" ref="survey_response_line_22"/>
             <field name="answer_id" ref="survey.survey_answer_database_new_version"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_45" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_23"/>
+            <field name="response_line_id" ref="survey_response_line_23"/>
             <field name="answer_id" ref="survey.survey_answer_No"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_46" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_pricing_No_Opinion"/>
-            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="response_line_id" ref="survey_response_line_24"/>
             <field name="answer_id" ref="survey.survey_answer_pricing_understanding"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_47" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_pricing_Very_Good"/>
-            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="response_line_id" ref="survey_response_line_24"/>
             <field name="answer_id" ref="survey.survey_answer_pricing_available_modules"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_48" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_pricing_Good"/>
-            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="response_line_id" ref="survey_response_line_24"/>
             <field name="answer_id" ref="survey.survey_answer_pricing_criteria"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_49" model="survey.response.answer">
-            <field name="response_id" ref="survey_response_line_26"/>
+            <field name="response_line_id" ref="survey_response_line_26"/>
             <field name="answer_id" ref="survey.survey_answer_Monthly"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_50" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_offer_Very_Good"/>
-            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="response_line_id" ref="survey_response_line_27"/>
             <field name="answer_id" ref="survey.survey_answer_pertinence_our_answer"/>
         </record>
     </data>
     <data noupdate="1">
         <record id="survey_response_answer_51" model="survey.response.answer">
             <field name="column_id" ref="survey.survey_column_offer_Good"/>
-            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="response_line_id" ref="survey_response_line_27"/>
             <field name="answer_id" ref="survey.survey_answer_our_answer_is"/>
         </record>
     </data>