diff --git a/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
index e6d7b096..fbbd7674 100644
--- a/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
+++ b/web_widget_x2many_2d_matrix_example/i18n/web_widget_x2many_2d_matrix_example.pot
@@ -14,22 +14,22 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_create_uid
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_create_uid
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_create_date
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_create_date
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__create_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
 #: model:ir.actions.act_window,name:web_widget_x2many_2d_matrix_example.action_x2m_demo
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_demo_id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__demo_id
 msgid "Demo"
 msgstr ""
 
@@ -39,79 +39,79 @@ msgid "Demo x2m matrix widget"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_display_name
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_display_name
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__display_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__display_name
 msgid "Display Name"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_id
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_id
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__id
 msgid "ID"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo___last_update
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line___last_update
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz___last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line____last_update
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_write_uid
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_write_uid
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_uid
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_write_date
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_write_date
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__write_date
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_ids
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz_line_ids
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__line_ids
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_matrix_demo_wiz__line_ids
 msgid "Line"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_name
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo__name
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__name
 msgid "Name"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
+#: model_terms:ir.ui.view,arch_db:web_widget_x2many_2d_matrix_example.view_x2m_demo_form
 msgid "Try x2m 2d matrix"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_user_id
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__user_id
 msgid "User"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
-#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line_value
+#: model:ir.model.fields,field_description:web_widget_x2many_2d_matrix_example.field_x2m_demo_line__value
 msgid "Value"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
 #: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo
-msgid "x2m.demo"
+msgid "X2Many Demo"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
 #: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_demo_line
-msgid "x2m.demo.line"
+msgid "X2Many Demo Line"
 msgstr ""
 
 #. module: web_widget_x2many_2d_matrix_example
 #: model:ir.model,name:web_widget_x2many_2d_matrix_example.model_x2m_matrix_demo_wiz
-msgid "x2m.matrix.demo.wiz"
+msgid "X2Many Matrix Demo Wizard"
 msgstr ""