diff --git a/account_multicompany_code/__manifest__.py b/account_multicompany_code/__manifest__.py
index cb3d4b5734c..5f6b7351a02 100644
--- a/account_multicompany_code/__manifest__.py
+++ b/account_multicompany_code/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "Account Multicompany Code",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Vauxoo",
     "category": "Accounting/Accounting",
     "website": "https://www.vauxoo.com/",
diff --git a/account_multicompany_code/models/account_account.py b/account_multicompany_code/models/account_account.py
index b515b226883..9a1f3261ae4 100644
--- a/account_multicompany_code/models/account_account.py
+++ b/account_multicompany_code/models/account_account.py
@@ -1,12 +1,12 @@
-from odoo import models
+from odoo import api, models
 
 
 class AccountAccount(models.Model):
     _inherit = "account.account"
 
-    def name_get(self):
-        result = dict(super().name_get())
+    @api.depends("company_id.code")
+    def _compute_display_name(self):
+        super()._compute_display_name()
         for record in self:
             if record.company_id.code:
-                result[record.id] += " (%s)" % record.company_id.code
-        return list(result.items())
+                record.display_name += " (%s)" % record.company_id.code
diff --git a/account_multicompany_code/models/account_journal.py b/account_multicompany_code/models/account_journal.py
index 04dfedf80be..efa4650c163 100644
--- a/account_multicompany_code/models/account_journal.py
+++ b/account_multicompany_code/models/account_journal.py
@@ -1,12 +1,12 @@
-from odoo import models
+from odoo import api, models
 
 
 class AccountJournal(models.Model):
     _inherit = "account.journal"
 
-    def name_get(self):
-        result = dict(super().name_get())
+    @api.depends("company_id.code")
+    def _compute_display_name(self):
+        super()._compute_display_name()
         for record in self:
             if record.company_id.code:
-                result[record.id] += " (%s)" % record.company_id.code
-        return list(result.items())
+                record.display_name += " (%s)" % record.company_id.code