diff --git a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
index 59cb779375e..1a52f68f1fc 100644
--- a/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
+++ b/addons/gamification_sale_crm/data/gamification_sale_crm_data.xml
@@ -9,8 +9,8 @@
             <field name="computation_mode">sum</field>
             <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report_date')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report__price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report__date')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
@@ -32,8 +32,8 @@
             <field name="condition">lower</field>
             <field name="suffix">days</field>
             <field name="model_id" eval="ref('crm.model_crm_opportunity_report')" />
-            <field name="field_id" eval="ref('crm.field_crm_opportunity_report_delay_close')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report_date_closed')" />
+            <field name="field_id" eval="ref('crm.field_crm_opportunity_report__delay_close')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report__date_closed')" />
             <field name="domain">[('user_id','=',user.id),('type', '=', 'lead')]</field>
         </record> 
 
@@ -44,8 +44,8 @@
             <field name="condition">lower</field>
             <field name="suffix">days</field>
             <field name="model_id" eval="ref('crm.model_crm_opportunity_report')" />
-            <field name="field_id" eval="ref('crm.field_crm_opportunity_report_delay_open')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report_opening_date')" />
+            <field name="field_id" eval="ref('crm.field_crm_opportunity_report__delay_open')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_opportunity_report__opening_date')" />
             <field name="domain">[('user_id','=',user.id)]</field>
         </record> 
 
@@ -56,7 +56,7 @@
             <field name="computation_mode">count</field>
             <field name="suffix">opportunities</field>
             <field name="model_id" eval="ref('crm.model_crm_lead')" />
-            <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead__date_open')" />
             <field name="domain">[('user_id','=',user.id),('type','=','opportunity')]</field>
         </record>
 
@@ -66,7 +66,7 @@
             <field name="computation_mode">count</field>
             <field name="suffix">orders</field>
             <field name="model_id" eval="ref('sale.model_sale_order')" />
-            <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order__date_order')" />
             <field name="domain">[('user_id','=',user.id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
@@ -76,7 +76,7 @@
             <field name="computation_mode">count</field>
             <field name="suffix">orders</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report_date')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report__date')" />
             <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
         <record model="gamification.goal.definition" id="definition_crm_tot_paid_sale_order">
@@ -85,8 +85,8 @@
             <field name="computation_mode">count</field>
             <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report_date')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report__price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report__date')" />
             <field name="domain">[('state','=','paid'),('user_id','=',user.id),('type','=','out_invoice')]</field>
         </record>
 
@@ -98,7 +98,7 @@
             <field name="condition">lower</field>
             <field name="suffix">invoices</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report_date')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report__date')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
         <record model="gamification.goal.definition" id="definition_crm_tot_customer_refunds">
@@ -108,8 +108,8 @@
             <field name="condition">higher</field>
             <field name="monetary">True</field>
             <field name="model_id" eval="ref('account.model_account_invoice_report')" />
-            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
-            <field name="field_date_id" eval="ref('account.field_account_invoice_report_date')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report__price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report__date')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user.id),('type','=','out_refund')]</field>
         </record>
 
diff --git a/addons/stock_account/data/stock_account_data.xml b/addons/stock_account/data/stock_account_data.xml
index d5f55811def..1a4a386eed6 100644
--- a/addons/stock_account/data/stock_account_data.xml
+++ b/addons/stock_account/data/stock_account_data.xml
@@ -3,26 +3,26 @@
     <data noupdate="1">
         <record forcecreate="True" id="default_cost_method" model="ir.property">
             <field name="name">Cost Method Property</field>
-            <field name="fields_id" ref="field_product_template_property_cost_method"/>
+            <field name="fields_id" ref="field_product_template__property_cost_method"/>
             <field name="value" eval="False" />
             <field name="type">selection</field>
         </record>
         <record forcecreate="True" id="default_valuation" model="ir.property">
             <field name="name">Valuation Property</field>
-            <field name="fields_id" ref="field_product_template_property_valuation"/>
+            <field name="fields_id" ref="field_product_template__property_valuation"/>
             <field name="value" eval="False" />
             <field name="type">selection</field>
         </record>
 
         <record forcecreate="True" id="default_category_cost_method" model="ir.property">
             <field name="name">Cost Method Property</field>
-            <field name="fields_id" ref="field_product_category_property_cost_method"/>
+            <field name="fields_id" ref="field_product_category__property_cost_method"/>
             <field name="value">standard</field>
             <field name="type">selection</field>
         </record>
         <record forcecreate="True" id="default_category_valuation" model="ir.property">
             <field name="name">Valuation Property</field>
-            <field name="fields_id" ref="field_product_category_property_valuation"/>
+            <field name="fields_id" ref="field_product_category__property_valuation"/>
             <field name="value">manual_periodic</field>
             <field name="type">selection</field>
         </record>
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index c4672a1a267..8467d40225b 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data>
         <record id="crm.model_crm_lead" model="ir.model">
-            <field name="website_form_default_field_id" ref="crm.field_crm_lead_description" />
+            <field name="website_form_default_field_id" ref="crm.field_crm_lead__description" />
             <field name="website_form_access">True</field>
             <field name="website_form_label">Create a lead</field>
         </record>
diff --git a/addons/website_form_project/data/website_form_project_data.xml b/addons/website_form_project/data/website_form_project_data.xml
index 1a9323e4ce3..0a8c45c9725 100644
--- a/addons/website_form_project/data/website_form_project_data.xml
+++ b/addons/website_form_project/data/website_form_project_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
         <record id="project.model_project_task" model="ir.model">
-            <field name="website_form_default_field_id" ref="project.field_project_task_description" />
+            <field name="website_form_default_field_id" ref="project.field_project_task__description" />
             <field name="website_form_access">True</field>
             <field name="website_form_label">Create a task</field>
         </record>
diff --git a/addons/website_forum/data/badges_answer.xml b/addons/website_forum/data/badges_answer.xml
index 9619d3af0fc..fcacd1820bb 100644
--- a/addons/website_forum/data/badges_answer.xml
+++ b/addons/website_forum/data/badges_answer.xml
@@ -19,7 +19,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 3)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_teacher">
@@ -54,7 +54,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 4)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_nice_answer">
@@ -89,7 +89,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 6)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_good_answer">
@@ -124,7 +124,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 15)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_great_answer">
@@ -161,7 +161,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 3), ('is_correct', '=', True)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_enlightened">
@@ -196,7 +196,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('parent_id', '!=', False), ('vote_count', '>=', 15), ('is_correct', '=', True)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_guru">
@@ -232,7 +232,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('self_reply', '=', True), ('vote_count', '>=', 4)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>            
         </record>
         <record model="gamification.challenge" id="challenge_self_learner">
diff --git a/addons/website_forum/data/badges_moderation.xml b/addons/website_forum/data/badges_moderation.xml
index 5b49701cb19..9901875305d 100644
--- a/addons/website_forum/data/badges_moderation.xml
+++ b/addons/website_forum/data/badges_moderation.xml
@@ -26,7 +26,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('vote', '=', '-1')]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote_user_id')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote__user_id')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_critic">
@@ -62,7 +62,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('vote_count', '>=', 3), ('active', '=', False)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_disciplined">
@@ -98,7 +98,7 @@
             <field name="condition">higher</field>
             <field name="domain" eval="[('model', '=', 'forum.post'), ('subtype_id', 'in', [ref('website_forum.mt_answer_edit'), ref('website_forum.mt_question_edit')])]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message_author_id')" />
+            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message__author_id')" />
             <field name="batch_user_expression">user.partner_id.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_editor">
@@ -133,7 +133,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('vote', '=', '1')]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote_user_id')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_vote__user_id')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_supporter">
@@ -169,7 +169,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('vote_count', '&lt;=', -3), ('active', '=', False)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_peer_pressure">
diff --git a/addons/website_forum/data/badges_participation.xml b/addons/website_forum/data/badges_participation.xml
index 132b592b94e..5544d5163f3 100644
--- a/addons/website_forum/data/badges_participation.xml
+++ b/addons/website_forum/data/badges_participation.xml
@@ -22,7 +22,7 @@
                 ('partner_id.email', '!=', False)
             ]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('base.field_res_users_id')" />
+            <field name="batch_distinctive_field" eval="ref('base.field_res_users__id')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_configure_profile">
@@ -58,7 +58,7 @@
             <field name="condition">higher</field>
             <field name="domain" eval="[('message_type', '=', 'comment'), ('subtype_id', '=', ref('mail.mt_comment')), ('model', '=', 'forum.post')]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message_author_id')" />
+            <field name="batch_distinctive_field" eval="ref('mail.field_mail_message__author_id')" />
             <field name="batch_user_expression">user.partner_id.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_commentator">
@@ -93,7 +93,7 @@
             <field name="model_id" eval="ref('website_forum.model_forum_post')"/>
             <field name="domain" eval="[('parent', '!=', False), ('vote_count' '>=', 10)]"/>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_pundit">
@@ -152,7 +152,7 @@
             <field name="condition">higher</field>
             <field name="domain">[('posts_count', '>=', 15)]</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_tag_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_tag__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_taxonomist">
diff --git a/addons/website_forum/data/badges_question.xml b/addons/website_forum/data/badges_question.xml
index d9b67e92cb6..de95e53d12c 100644
--- a/addons/website_forum/data/badges_question.xml
+++ b/addons/website_forum/data/badges_question.xml
@@ -19,7 +19,7 @@
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 150)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_popular_question">
@@ -55,7 +55,7 @@
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 250)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_notable_question">
@@ -90,7 +90,7 @@
             <field name="domain">[('parent_id', '=', False), ('views', '>=', 500)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_famous_question">
@@ -127,7 +127,7 @@
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 1)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_favorite_question_1">
@@ -162,7 +162,7 @@
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 5)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_favorite_question_5">
@@ -197,7 +197,7 @@
             <field name="domain">[('parent_id', '=', False), ('favourite_count', '>=', 25)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_stellar_question_25">
@@ -234,7 +234,7 @@
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 1)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_student">
@@ -269,7 +269,7 @@
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 4)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_nice_question">
@@ -304,7 +304,7 @@
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 6)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_good_question">
@@ -339,7 +339,7 @@
             <field name="domain">[('parent_id', '=', False), ('vote_count', '>=', 15)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_great_question">
@@ -375,7 +375,7 @@
             <field name="domain">[('parent_id', '=', False), ('has_validated_answer', '=', True)]</field>
             <field name="condition">higher</field>
             <field name="batch_mode">True</field>
-            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post_create_uid')" />
+            <field name="batch_distinctive_field" eval="ref('website_forum.field_forum_post__create_uid')" />
             <field name="batch_user_expression">user.id</field>
         </record>
         <record model="gamification.challenge" id="challenge_scholar">
diff --git a/addons/website_hr_recruitment/data/config_data.xml b/addons/website_hr_recruitment/data/config_data.xml
index 56919da2e3c..3284b439a04 100644
--- a/addons/website_hr_recruitment/data/config_data.xml
+++ b/addons/website_hr_recruitment/data/config_data.xml
@@ -19,7 +19,7 @@
     </data>
     <data>
         <record id="hr_recruitment.model_hr_applicant" model="ir.model">
-            <field name="website_form_default_field_id" ref="hr_recruitment.field_hr_applicant_description" />
+            <field name="website_form_default_field_id" ref="hr_recruitment.field_hr_applicant__description" />
             <field name="website_form_access">True</field>
             <field name="website_form_label">Apply for a Job</field>
         </record>
diff --git a/odoo/addons/base/models/ir_translation.py b/odoo/addons/base/models/ir_translation.py
index b7c819c88a9..c073db3656c 100644
--- a/odoo/addons/base/models/ir_translation.py
+++ b/odoo/addons/base/models/ir_translation.py
@@ -74,14 +74,14 @@ class IrTranslationImport(object):
             params['type'] = 'model'
             params['name'] = 'ir.model.fields,field_description'
             params['imd_model'] = 'ir.model.fields'
-            params['imd_name'] = 'field_%s_%s' % (model.replace('.', '_'), field)
+            params['imd_name'] = 'field_%s__%s' % (model.replace('.', '_'), field)
 
         elif params['type'] == 'help':
             model, field = params['name'].split(',')
             params['type'] = 'model'
             params['name'] = 'ir.model.fields,help'
             params['imd_model'] = 'ir.model.fields'
-            params['imd_name'] = 'field_%s_%s' % (model.replace('.', '_'), field)
+            params['imd_name'] = 'field_%s__%s' % (model.replace('.', '_'), field)
 
         elif params['type'] == 'view':
             params['type'] = 'model'