diff --git a/database_cleanup/__openerp__.py b/database_cleanup/__openerp__.py
index b2737fff7..cdd379c7e 100644
--- a/database_cleanup/__openerp__.py
+++ b/database_cleanup/__openerp__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Database cleanup',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'author': "Therp BV,Odoo Community Association (OCA)",
     'depends': ['base'],
     'license': 'AGPL-3',
diff --git a/database_cleanup/i18n/database_cleanup.pot b/database_cleanup/i18n/database_cleanup.pot
index 7fbf10c6b..c02592b9a 100644
--- a/database_cleanup/i18n/database_cleanup.pot
+++ b/database_cleanup/i18n/database_cleanup.pot
@@ -4,8 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-11-01 09:20+0000\n"
+"PO-Revision-Date: 2018-11-01 09:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -14,18 +16,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__purge_line_ids
 msgid "Columns to purge"
 msgstr ""
 
 #. module: database_cleanup
 #: model:ir.actions.server,name:database_cleanup.cleanup_create_indexes_line_action
-#: model:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_wizard_view_form
 msgid "Create"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_wizard_view_form
 msgid "Create all"
 msgstr ""
 
@@ -41,62 +43,62 @@ msgid "Create missing indexes"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_line_view_tree
+#: model_terms:ir.ui.view,arch_db:database_cleanup.cleanup_create_indexes_line_view_tree
 msgid "Create this index"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__purged
 msgid "Created"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_create_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__create_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_create_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__create_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__create_date
 msgid "Created on"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_data_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__data_id
 msgid "Data entry"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__purge_line_ids
 msgid "Data to purge"
 msgstr ""
 
@@ -106,24 +108,24 @@ msgid "Database cleanup"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_display_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__display_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -133,7 +135,7 @@ msgid "Duplicated property"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_field_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__field_id
 msgid "Field"
 msgstr ""
 
@@ -143,129 +145,134 @@ msgid "Fields"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__id
 msgid "ID"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property___last_update
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table___last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property____last_update
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_write_uid
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__write_uid
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_write_date
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_column__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_data__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__write_date
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__write_date
 msgid "Last Updated on"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_menu_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__menu_id
 msgid "Menu entry"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_menu__purge_line_ids
 msgid "Menus to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_model_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__model_id
 msgid "Model"
 msgstr ""
 
+#. module: database_cleanup
+#: model:ir.model,name:database_cleanup.model_ir_model_data
+msgid "Model Data"
+msgstr ""
+
 #. module: database_cleanup
 #: model:ir.model,name:database_cleanup.model_ir_model
 msgid "Models"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_model__purge_line_ids
 msgid "Models to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_module__purge_line_ids
 msgid "Modules to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_name
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__name
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__name
 msgid "Name"
 msgstr ""
 
@@ -306,17 +313,17 @@ msgid "No orphaned tables found"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
+#: model_terms:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Nothing found to clean up."
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_property__purge_line_ids
 msgid "Properties to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_property_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__property_id
 msgid "Property"
 msgstr ""
 
@@ -328,29 +335,29 @@ msgstr ""
 #: model:ir.actions.server,name:database_cleanup.action_purge_module_line
 #: model:ir.actions.server,name:database_cleanup.action_purge_property_line
 #: model:ir.actions.server,name:database_cleanup.action_purge_table_line
-#: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
+#: model_terms:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard_purge_line_ids
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_wizard__purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard__purge_line_ids
 msgid "Purge Line"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__wizard_id
 msgid "Purge Wizard"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
+#: model_terms:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Purge all"
 msgstr ""
 
@@ -380,7 +387,7 @@ msgstr ""
 #: model:ir.actions.server,name:database_cleanup.action_purge_models
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_line_model
 #: model:ir.model,name:database_cleanup.model_cleanup_purge_wizard_model
-#: model:ir.ui.view,arch_db:database_cleanup.tree_purge_line
+#: model_terms:ir.ui.view,arch_db:database_cleanup.tree_purge_line
 msgid "Purge models"
 msgstr ""
 
@@ -444,24 +451,24 @@ msgid "Purge tables"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.tree_purge_line
+#: model_terms:ir.ui.view,arch_db:database_cleanup.tree_purge_line
 msgid "Purge this model"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_purged
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table_purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_column__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_data__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_menu__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_model__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_module__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__purged
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_table__purged
 msgid "Purged"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property_reason
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_property__reason
 msgid "Reason"
 msgstr ""
 
@@ -471,7 +478,7 @@ msgid "Same value as default"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
+#: model_terms:ir.ui.view,arch_db:database_cleanup.form_purge_wizard
 msgid "Select lines"
 msgstr ""
 
@@ -482,13 +489,13 @@ msgid "Select lines to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table_purge_line_ids
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_wizard_table__purge_line_ids
 msgid "Tables to purge"
 msgstr ""
 
 #. module: database_cleanup
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line_wizard_id
-#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line_wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_create_indexes_line__wizard_id
+#: model:ir.model.fields,field_description:database_cleanup.field_cleanup_purge_line__wizard_id
 msgid "Wizard"
 msgstr ""
 
@@ -527,8 +534,3 @@ msgstr ""
 msgid "cleanup.purge.line.table"
 msgstr ""
 
-#. module: database_cleanup
-#: model:ir.model,name:database_cleanup.model_ir_model_data
-msgid "ir.model.data"
-msgstr ""
-
diff --git a/database_cleanup/models/purge_columns.py b/database_cleanup/models/purge_columns.py
index c3c248d6b..84d545f13 100644
--- a/database_cleanup/models/purge_columns.py
+++ b/database_cleanup/models/purge_columns.py
@@ -9,6 +9,7 @@ from ..identifier_adapter import IdentifierAdapter
 class CleanupPurgeLineColumn(models.TransientModel):
     _inherit = 'cleanup.purge.line'
     _name = 'cleanup.purge.line.column'
+    _description = 'Purge Column Wizard Lines'
 
     model_id = fields.Many2one('ir.model', 'Model', required=True,
                                ondelete='CASCADE')
diff --git a/database_cleanup/models/purge_models.py b/database_cleanup/models/purge_models.py
index 42c96d80b..b2c40b93d 100644
--- a/database_cleanup/models/purge_models.py
+++ b/database_cleanup/models/purge_models.py
@@ -3,7 +3,7 @@
 # pylint: disable=consider-merging-classes-inherited
 from odoo import _, api, models, fields
 from odoo.exceptions import UserError
-from odoo.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 
 
 class IrModel(models.Model):
diff --git a/database_cleanup/models/purge_modules.py b/database_cleanup/models/purge_modules.py
index ed8c03a0a..66a221e53 100644
--- a/database_cleanup/models/purge_modules.py
+++ b/database_cleanup/models/purge_modules.py
@@ -4,7 +4,7 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError
 from odoo.modules.module import get_module_path
-from odoo.addons.base.ir.ir_model import MODULE_UNINSTALL_FLAG
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 
 
 class IrModelData(models.Model):
diff --git a/database_cleanup/models/purge_tables.py b/database_cleanup/models/purge_tables.py
index 275956f83..7ff1fec79 100644
--- a/database_cleanup/models/purge_tables.py
+++ b/database_cleanup/models/purge_tables.py
@@ -9,6 +9,7 @@ from ..identifier_adapter import IdentifierAdapter
 class CleanupPurgeLineTable(models.TransientModel):
     _inherit = 'cleanup.purge.line'
     _name = 'cleanup.purge.line.table'
+    _description = 'Purge tables wizard lines'
 
     wizard_id = fields.Many2one(
         'cleanup.purge.wizard.table', 'Purge Wizard', readonly=True)
diff --git a/database_cleanup/models/purge_wizard.py b/database_cleanup/models/purge_wizard.py
index b14af48e8..361615512 100644
--- a/database_cleanup/models/purge_wizard.py
+++ b/database_cleanup/models/purge_wizard.py
@@ -11,6 +11,7 @@ class CleanupPurgeLine(models.AbstractModel):
     """ Abstract base class for the purge wizard lines """
     _name = 'cleanup.purge.line'
     _order = 'name'
+    _description = 'Purge Column Abstract Wizard'
 
     name = fields.Char('Name', readonly=True)
     purged = fields.Boolean('Purged', readonly=True)
diff --git a/database_cleanup/tests/test_database_cleanup.py b/database_cleanup/tests/test_database_cleanup.py
index 28b817a54..9942efe6f 100644
--- a/database_cleanup/tests/test_database_cleanup.py
+++ b/database_cleanup/tests/test_database_cleanup.py
@@ -16,7 +16,7 @@ class TestDatabaseCleanup(TransactionCase):
         self.model = None
         # Create one property for tests
         self.env['ir.property'].create({
-            'fields_id': self.env.ref('base.field_res_partner_name').id,
+            'fields_id': self.env.ref('base.field_res_partner__name').id,
             'type': 'char',
             'value_text': 'My default partner name',
         })
diff --git a/database_cleanup/views/purge_wizard.xml b/database_cleanup/views/purge_wizard.xml
index 74fcb9008..5f909e335 100644
--- a/database_cleanup/views/purge_wizard.xml
+++ b/database_cleanup/views/purge_wizard.xml
@@ -34,7 +34,7 @@
                 <field name="name" />
                 <field name="purged" />
                 <button type="object" name="purge"
-                    icon="gtk-cancel" string="Purge this model"
+                    icon="fa-times-circle text-danger" string="Purge this model"
                     attrs="{'invisible': [('purged', '=', True)]}"/>
             </tree>
         </field>