diff --git a/docsource/modules150-160.rst b/docsource/modules150-160.rst
index a4f9edfb7b8b..939135315da0 100644
--- a/docsource/modules150-160.rst
+++ b/docsource/modules150-160.rst
@@ -14,7 +14,7 @@ Module coverage 15.0 -> 16.0
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | account_edi                                     |                      |No DB layout changes.                            |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
-| |del| account_edi_facturx                       |                      |                                                 |
+| |del| account_edi_facturx                       |                      |Merged into account_edi_ubl_cii                  |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | account_edi_proxy_client                        |                      |No DB layout changes.                            |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
@@ -22,7 +22,7 @@ Module coverage 15.0 -> 16.0
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | |del| account_edi_ubl_bis3                      |                      |                                                 |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
-| account_edi_ubl_cii                             |                      |                                                 |
+| account_edi_ubl_cii                             | Done                 |                                                 |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | account_fleet                                   |                      |No DB layout changes.                            |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
diff --git a/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/pre-migration.py b/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/pre-migration.py
new file mode 100644
index 000000000000..bd8369688ccd
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/pre-migration.py
@@ -0,0 +1,25 @@
+from openupgradelib import openupgrade
+
+_xmlids_renames = [
+    (
+        "l10n_be_edi.edi_efff_1",
+        "account_edi_ubl_cii.edi_efff_1",
+    ),
+    (
+        "account_edi_facturx.edi_facturx_1_0_05",
+        "account_edi_ubl_cii.edi_facturx_1_0_05",
+    ),
+    (
+        "l10n_nl_edi.edi_nlcius_1",
+        "account_edi_ubl_cii.edi_nlcius_1",
+    ),
+    (
+        "account_edi_ubl.edi_ubl_2_1",
+        "account_edi_ubl_cii.edi_ubl_2_1",
+    ),
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_xmlids(env.cr, _xmlids_renames)
diff --git a/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/upgrade_analysis_work.txt
new file mode 100644
index 000000000000..94cfabe1143e
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_edi_ubl_cii/16.0.1.0/upgrade_analysis_work.txt
@@ -0,0 +1,34 @@
+---Models in module 'account_edi_ubl_cii'---
+new model account.edi.xml.ubl_a_nz [abstract]
+# NOTHING TO DO
+
+---Fields in module 'account_edi_ubl_cii'---
+---XML records in module 'account_edi_ubl_cii'---
+NEW account.edi.format: account_edi_ubl_cii.edi_efff_1 [renamed from l10n_be_edi module]
+NEW account.edi.format: account_edi_ubl_cii.edi_facturx_1_0_05 [renamed from account_edi_facturx module]
+NEW account.edi.format: account_edi_ubl_cii.edi_nlcius_1 [renamed from l10n_nl_edi module]
+NEW account.edi.format: account_edi_ubl_cii.edi_ubl_2_1 [renamed from account_edi_ubl module]
+DEL account.edi.format: account_edi_facturx.edi_facturx_1_0_05 [renamed to account_edi_ubl_cii module]
+DEL account.edi.format: account_edi_ubl.edi_ubl_2_1 [renamed to account_edi_ubl_cii module]
+DEL account.edi.format: l10n_be_edi.edi_efff_1 [renamed to account_edi_ubl_cii module]
+DEL account.edi.format: l10n_nl_edi.edi_nlcius_1 [renamed to account_edi_ubl_cii module]
+# DONE pre-migration: rename xmlid
+
+NEW account.edi.format: account_edi_ubl_cii.ubl_a_nz
+DEL account.edi.format: l10n_no_edi.edi_ehf_3
+DEL ir.ui.view: account_edi_facturx.account_invoice_facturx_export
+DEL ir.ui.view: account_edi_facturx.account_invoice_line_facturx_export
+DEL ir.ui.view: account_edi_facturx.account_invoice_partner_facturx_export
+DEL ir.ui.view: account_edi_facturx.account_invoice_pdfa_3_facturx_metadata
+DEL ir.ui.view: account_edi_ubl.export_ubl_invoice
+DEL ir.ui.view: account_edi_ubl.export_ubl_invoice_line
+DEL ir.ui.view: account_edi_ubl.export_ubl_invoice_partner
+DEL ir.ui.view: account_edi_ubl_bis3.export_bis3_invoice
+DEL ir.ui.view: account_edi_ubl_bis3.export_bis3_invoice_line
+DEL ir.ui.view: account_edi_ubl_bis3.export_bis3_invoice_partner
+DEL ir.ui.view: l10n_be_edi.export_efff_invoice
+DEL ir.ui.view: l10n_nl_edi.export_nlcius_invoice
+DEL ir.ui.view: l10n_nl_edi.export_nlcius_invoice_partner
+DEL ir.ui.view: l10n_no_edi.export_ehf_3_invoice
+DEL ir.ui.view: l10n_no_edi.export_ehf_3_invoice_partner
+# NOTHING TO DO