diff --git a/addons/calendar/static/src/models/activity.js b/addons/calendar/static/src/models/activity.js
index cc82777dfb1..e47c5561ce1 100644
--- a/addons/calendar/static/src/models/activity.js
+++ b/addons/calendar/static/src/models/activity.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Activity',
     modelMethods: {
         /**
diff --git a/addons/calendar/static/src/models/activity_group.js b/addons/calendar/static/src/models/activity_group.js
index 4fe56595f96..2ed369637bf 100644
--- a/addons/calendar/static/src/models/activity_group.js
+++ b/addons/calendar/static/src/models/activity_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, registerPatch } from '@mail/model';
+import { many, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ActivityGroup',
     modelMethods: {
         /**
diff --git a/addons/calendar/static/src/models/activity_group_view.js b/addons/calendar/static/src/models/activity_group_view.js
index bcd4982b52d..4c291485c51 100644
--- a/addons/calendar/static/src/models/activity_group_view.js
+++ b/addons/calendar/static/src/models/activity_group_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ActivityGroupView',
     recordMethods: {
         /**
diff --git a/addons/calendar/static/src/models/activity_view.js b/addons/calendar/static/src/models/activity_view.js
index 1c0d8d7be40..0a4b3249867 100644
--- a/addons/calendar/static/src/models/activity_view.js
+++ b/addons/calendar/static/src/models/activity_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
 import Dialog from 'web.Dialog';
 
-registerPatch({
+Patch({
     name: 'ActivityView',
     recordMethods: {
         /**
diff --git a/addons/calendar/static/src/models/calendar_event.js b/addons/calendar/static/src/models/calendar_event.js
index 1c8b914d98f..fd9b9e8e3af 100644
--- a/addons/calendar/static/src/models/calendar_event.js
+++ b/addons/calendar/static/src/models/calendar_event.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
 import fieldUtils from 'web.field_utils';
 import { getLangTimeFormat } from 'web.time';
 
-registerModel({
+Model({
     name: 'calendar.event',
     fields: {
         allday: attr(),
diff --git a/addons/crm/static/src/models/activity_group_view.js b/addons/crm/static/src/models/activity_group_view.js
index ae4c0fd1d60..0a234348b75 100644
--- a/addons/crm/static/src/models/activity_group_view.js
+++ b/addons/crm/static/src/models/activity_group_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ActivityGroupView',
     recordMethods: {
         /**
diff --git a/addons/crm/static/src/models/ir_model.js b/addons/crm/static/src/models/ir_model.js
index 5ce64ca3fa8..13ea2766716 100644
--- a/addons/crm/static/src/models/ir_model.js
+++ b/addons/crm/static/src/models/ir_model.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from "@mail/model";
+import { Patch } from "@mail/model";
 
-registerPatch({
+Patch({
     name: "ir.model",
     fields: {
         availableWebViews: {
diff --git a/addons/crm_livechat/static/src/models/messaging_initializer.js b/addons/crm_livechat/static/src/models/messaging_initializer.js
index c42b7112d2a..502e8b6973e 100644
--- a/addons/crm_livechat/static/src/models/messaging_initializer.js
+++ b/addons/crm_livechat/static/src/models/messaging_initializer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { insert, registerPatch } from '@mail/model';
+import { insert, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessagingInitializer',
     recordMethods: {
         /**
diff --git a/addons/hr/static/src/models/employee.js b/addons/hr/static/src/models/employee.js
index ccaecd84276..0628a631662 100644
--- a/addons/hr/static/src/models/employee.js
+++ b/addons/hr/static/src/models/employee.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, one, registerModel } from '@mail/model';
+import { attr, clear, insert, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Employee',
     modelMethods: {
         /**
diff --git a/addons/hr/static/src/models/messaging.js b/addons/hr/static/src/models/messaging.js
index fe80058b6ca..0cedccbd6eb 100644
--- a/addons/hr/static/src/models/messaging.js
+++ b/addons/hr/static/src/models/messaging.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
 // dummy import to ensure mail Messaging patches are loaded beforehand
 import '@mail/models/messaging';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     recordMethods: {
         /**
diff --git a/addons/hr/static/src/models/partner.js b/addons/hr/static/src/models/partner.js
index fdb05093081..4ba6affc3ff 100644
--- a/addons/hr/static/src/models/partner.js
+++ b/addons/hr/static/src/models/partner.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerPatch } from '@mail/model';
+import { attr, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Partner',
     recordMethods: {
         /**
diff --git a/addons/hr/static/src/models/user.js b/addons/hr/static/src/models/user.js
index 7dea772e60e..aeab46b3857 100644
--- a/addons/hr/static/src/models/user.js
+++ b/addons/hr/static/src/models/user.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'User',
     fields: {
         /**
diff --git a/addons/hr_holidays/static/src/models/partner.js b/addons/hr_holidays/static/src/models/partner.js
index 9eadd90ed05..c41b98fda2f 100644
--- a/addons/hr_holidays/static/src/models/partner.js
+++ b/addons/hr_holidays/static/src/models/partner.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, registerPatch } from '@mail/model';
+import { attr, clear, Patch } from '@mail/model';
 
 import { str_to_date } from 'web.time';
 
-registerPatch({
+Patch({
     name: 'Partner',
     fields: {
         isOnline: {
diff --git a/addons/im_livechat/static/src/models/channel.js b/addons/im_livechat/static/src/models/channel.js
index acc09254927..ab568902cab 100644
--- a/addons/im_livechat/static/src/models/channel.js
+++ b/addons/im_livechat/static/src/models/channel.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerPatch } from '@mail/model';
+import { attr, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Channel',
     fields: {
         anonymous_country: one('Country'),
diff --git a/addons/im_livechat/static/src/models/channel_preview_view.js b/addons/im_livechat/static/src/models/channel_preview_view.js
index 5bc36c2dc86..fcae7576645 100644
--- a/addons/im_livechat/static/src/models/channel_preview_view.js
+++ b/addons/im_livechat/static/src/models/channel_preview_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ChannelPreviewView',
     fields: {
         imageUrl: {
diff --git a/addons/im_livechat/static/src/models/chat_window.js b/addons/im_livechat/static/src/models/chat_window.js
index c8171056901..61cc5c699be 100644
--- a/addons/im_livechat/static/src/models/chat_window.js
+++ b/addons/im_livechat/static/src/models/chat_window.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ChatWindow',
     recordMethods: {
         /**
diff --git a/addons/im_livechat/static/src/models/composer_view.js b/addons/im_livechat/static/src/models/composer_view.js
index 847741629dd..d8244d239b6 100644
--- a/addons/im_livechat/static/src/models/composer_view.js
+++ b/addons/im_livechat/static/src/models/composer_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, registerPatch } from '@mail/model';
+import { clear, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ComposerView',
     fields: {
         dropZoneView: {
diff --git a/addons/im_livechat/static/src/models/discuss.js b/addons/im_livechat/static/src/models/discuss.js
index c042641b4f6..ffaab45ed32 100644
--- a/addons/im_livechat/static/src/models/discuss.js
+++ b/addons/im_livechat/static/src/models/discuss.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Discuss',
     recordMethods: {
         /**
diff --git a/addons/im_livechat/static/src/models/discuss_sidebar_category.js b/addons/im_livechat/static/src/models/discuss_sidebar_category.js
index 132e1e7b060..8a6838bdc3c 100644
--- a/addons/im_livechat/static/src/models/discuss_sidebar_category.js
+++ b/addons/im_livechat/static/src/models/discuss_sidebar_category.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'DiscussSidebarCategory',
     fields: {
         categoryItemsOrderedByLastAction: {
diff --git a/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js b/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
index c616f51d157..ae0e88ac30c 100644
--- a/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
+++ b/addons/im_livechat/static/src/models/discuss_sidebar_category_item.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, registerPatch } from '@mail/model';
+import { clear, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'DiscussSidebarCategoryItem',
     fields: {
         avatarUrl: {
diff --git a/addons/im_livechat/static/src/models/message.js b/addons/im_livechat/static/src/models/message.js
index 42c977845f5..62e85c51ee0 100644
--- a/addons/im_livechat/static/src/models/message.js
+++ b/addons/im_livechat/static/src/models/message.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Message',
     fields: {
         hasReactionIcon: {
diff --git a/addons/im_livechat/static/src/models/message_action_list.js b/addons/im_livechat/static/src/models/message_action_list.js
index d8a167899e0..a35dcf3fb1c 100644
--- a/addons/im_livechat/static/src/models/message_action_list.js
+++ b/addons/im_livechat/static/src/models/message_action_list.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, registerPatch } from '@mail/model';
+import { clear, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessageActionList',
     fields: {
         actionReplyTo: {
diff --git a/addons/im_livechat/static/src/models/messaging.js b/addons/im_livechat/static/src/models/messaging.js
index 0c5a0ce8c54..221ce869c6b 100644
--- a/addons/im_livechat/static/src/models/messaging.js
+++ b/addons/im_livechat/static/src/models/messaging.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, registerPatch } from '@mail/model';
+import { many, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     fields: {
         /**
diff --git a/addons/im_livechat/static/src/models/messaging_initializer.js b/addons/im_livechat/static/src/models/messaging_initializer.js
index c648ffaf637..a72cb051307 100644
--- a/addons/im_livechat/static/src/models/messaging_initializer.js
+++ b/addons/im_livechat/static/src/models/messaging_initializer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { insert, registerPatch } from '@mail/model';
+import { insert, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessagingInitializer',
     recordMethods: {
         /**
diff --git a/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js b/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
index 08e2d083687..accabb33ac3 100644
--- a/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
+++ b/addons/im_livechat/static/src/models/mobile_messaging_navbar_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MobileMessagingNavbarView',
     fields: {
         tabs: {
diff --git a/addons/im_livechat/static/src/models/notification_list_view.js b/addons/im_livechat/static/src/models/notification_list_view.js
index 86fa12821dc..fd10c7110fa 100644
--- a/addons/im_livechat/static/src/models/notification_list_view.js
+++ b/addons/im_livechat/static/src/models/notification_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'NotificationListView',
     fields: {
         filteredChannels: {
diff --git a/addons/im_livechat/static/src/models/partner.js b/addons/im_livechat/static/src/models/partner.js
index 6d64a17ca1e..a56dfb94360 100644
--- a/addons/im_livechat/static/src/models/partner.js
+++ b/addons/im_livechat/static/src/models/partner.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Partner',
     fields: {
         /**
diff --git a/addons/im_livechat/static/src/models/res_users_settings.js b/addons/im_livechat/static/src/models/res_users_settings.js
index 7a410acfa54..401747874c2 100644
--- a/addons/im_livechat/static/src/models/res_users_settings.js
+++ b/addons/im_livechat/static/src/models/res_users_settings.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'res.users.settings',
     fields: {
         is_discuss_sidebar_category_livechat_open: attr({
diff --git a/addons/im_livechat/static/src/models/thread.js b/addons/im_livechat/static/src/models/thread.js
index 2a2732635b7..01ca49f7ffd 100644
--- a/addons/im_livechat/static/src/models/thread.js
+++ b/addons/im_livechat/static/src/models/thread.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Thread',
     recordMethods: {
         /**
diff --git a/addons/im_livechat/static/src/models/thread_icon_view.js b/addons/im_livechat/static/src/models/thread_icon_view.js
index 0ec9cfed2e0..e73bdf9042f 100644
--- a/addons/im_livechat/static/src/models/thread_icon_view.js
+++ b/addons/im_livechat/static/src/models/thread_icon_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ThreadIconView',
     fields: {
         threadTypingIconView: {
diff --git a/addons/im_livechat/static/src/public_models/chatbot.js b/addons/im_livechat/static/src/public_models/chatbot.js
index 1c0b88d0068..3e1c08cc4fd 100644
--- a/addons/im_livechat/static/src/public_models/chatbot.js
+++ b/addons/im_livechat/static/src/public_models/chatbot.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, one, clear, increment, registerModel } from '@mail/model';
+import { attr, one, clear, increment, Model } from '@mail/model';
 
 import { qweb } from 'web.core';
 import { Markup } from 'web.utils';
 
-registerModel({
+Model({
     name: 'Chatbot',
     recordMethods: {
         /**
diff --git a/addons/im_livechat/static/src/public_models/chatbot_step.js b/addons/im_livechat/static/src/public_models/chatbot_step.js
index ca6aab43cf0..99b3e8c8f11 100644
--- a/addons/im_livechat/static/src/public_models/chatbot_step.js
+++ b/addons/im_livechat/static/src/public_models/chatbot_step.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChatbotStep',
     fields: {
         chabotOwner: one('Chatbot', {
diff --git a/addons/im_livechat/static/src/public_models/livechat_button_view.js b/addons/im_livechat/static/src/public_models/livechat_button_view.js
index c4e9d695083..20e2887a021 100644
--- a/addons/im_livechat/static/src/public_models/livechat_button_view.js
+++ b/addons/im_livechat/static/src/public_models/livechat_button_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import {unaccent} from 'web.utils';
 import {getCookie, setCookie, deleteCookie} from 'web.utils.cookies';
 
-registerModel({
+Model({
     name: 'LivechatButtonView',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/livechat_operator.js b/addons/im_livechat/static/src/public_models/livechat_operator.js
index ec2d2599a7c..36425940651 100644
--- a/addons/im_livechat/static/src/public_models/livechat_operator.js
+++ b/addons/im_livechat/static/src/public_models/livechat_operator.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LivechatOperator',
     fields: {
         id: attr({
diff --git a/addons/im_livechat/static/src/public_models/messaging.js b/addons/im_livechat/static/src/public_models/messaging.js
index b123f57a752..fd01900febb 100644
--- a/addons/im_livechat/static/src/public_models/messaging.js
+++ b/addons/im_livechat/static/src/public_models/messaging.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     fields: {
         publicLivechatGlobal: one('PublicLivechatGlobal', {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat.js b/addons/im_livechat/static/src/public_models/public_livechat.js
index 62ced1f3fe9..bdb4578be97 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat.js
@@ -2,9 +2,9 @@
 
 import PublicLivechat from '@im_livechat/legacy/models/public_livechat';
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PublicLivechat',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_feedback_view.js b/addons/im_livechat/static/src/public_models/public_livechat_feedback_view.js
index 1ce18598ebc..16714a3af2e 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_feedback_view.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_feedback_view.js
@@ -2,9 +2,9 @@
 
 import Feedback from '@im_livechat/legacy/widgets/feedback/feedback';
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PublicLivechatFeedbackView',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_global.js b/addons/im_livechat/static/src/public_models/public_livechat_global.js
index 7158174c3a3..f1161b27b81 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_global.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_global.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import { qweb } from 'web.core';
 import { Markup } from 'web.utils';
 import {getCookie, setCookie, deleteCookie} from 'web.utils.cookies';
 
-registerModel({
+Model({
     name: 'PublicLivechatGlobal',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_global_notification_handler.js b/addons/im_livechat/static/src/public_models/public_livechat_global_notification_handler.js
index cc7d32248ae..f10727d3a9b 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_global_notification_handler.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_global_notification_handler.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { increment, one, registerModel } from '@mail/model';
+import { increment, one, Model } from '@mail/model';
 
 import session from 'web.session';
 import utils from 'web.utils';
 import {getCookie} from 'web.utils.cookies';
 
-registerModel({
+Model({
     name: 'PublicLivechatGlobalNotificationHandler',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_message.js b/addons/im_livechat/static/src/public_models/public_livechat_message.js
index c37ddff5dc4..51f0125e202 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_message.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_message.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
 import PublicLivechatMessage from '@im_livechat/legacy/models/public_livechat_message';
 
-registerModel({
+Model({
     name: 'PublicLivechatMessage',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_view.js b/addons/im_livechat/static/src/public_models/public_livechat_view.js
index fd1f22c4cac..042ba4e03df 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_view.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_view.js
@@ -2,9 +2,9 @@
 
 import PublicLivechatView from '@im_livechat/legacy/widgets/public_livechat_view/public_livechat_view';
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PublicLivechatView',
     lifecycleHooks: {
         _created() {
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_window.js b/addons/im_livechat/static/src/public_models/public_livechat_window.js
index 0d83353583f..de15a4881ff 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_window.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_window.js
@@ -2,9 +2,9 @@
 
 import PublicLivechatWindow from '@im_livechat/legacy/widgets/public_livechat_window/public_livechat_window';
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PublicLivechatWindow',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/core_models/device.js b/addons/mail/static/src/core_models/device.js
index 558c213e820..cd41c4a50d7 100644
--- a/addons/mail/static/src/core_models/device.js
+++ b/addons/mail/static/src/core_models/device.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 import { browser } from "@web/core/browser/browser";
 import { isMobileOS } from "@web/core/browser/feature_detection";
 import { SIZES } from '@web/core/ui/ui_service';
 
-registerModel({
+Model({
     name: 'Device',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/core_models/locale.js b/addons/mail/static/src/core_models/locale.js
index a730f4399e0..04ff51c36f5 100644
--- a/addons/mail/static/src/core_models/locale.js
+++ b/addons/mail/static/src/core_models/locale.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
 import { localization } from '@web/core/l10n/localization';
 
-registerModel({
+Model({
     name: 'Locale',
     fields: {
         /**
diff --git a/addons/mail/static/src/core_models/messaging.js b/addons/mail/static/src/core_models/messaging.js
index 078d2425dc4..bc1df7e12fe 100644
--- a/addons/mail/static/src/core_models/messaging.js
+++ b/addons/mail/static/src/core_models/messaging.js
@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 import { makeDeferred } from '@mail/utils/deferred';
 
 import { browser } from '@web/core/browser/browser';
 
 import { EventBus } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'Messaging',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/core_models/record.js b/addons/mail/static/src/core_models/record.js
index a225c1d2644..ba7be89a124 100644
--- a/addons/mail/static/src/core_models/record.js
+++ b/addons/mail/static/src/core_models/record.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
 /**
  * The object below defines a model. Instances of such model (or inherited
@@ -8,7 +8,7 @@ import { one, registerModel } from '@mail/model';
  * represent server record (e.g. Thread, Message) or UI elements (e.g.
  * MessagingMenu, ChatWindow). These instances are called "records".
  */
-registerModel({
+ Model({
     /**
      * Name of the model. Important to refer to appropriate model like in
      * relational fields. Name of models must be unique.
diff --git a/addons/mail/static/src/core_models/timer.js b/addons/mail/static/src/core_models/timer.js
index 36071c25fa8..b0656fea5df 100644
--- a/addons/mail/static/src/core_models/timer.js
+++ b/addons/mail/static/src/core_models/timer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Timer',
     identifyingMode: 'xor',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/model/model_core.js b/addons/mail/static/src/model/model_core.js
index 0a29d0786ab..9b944c7a638 100644
--- a/addons/mail/static/src/model/model_core.js
+++ b/addons/mail/static/src/model/model_core.js
@@ -421,7 +421,7 @@ function patchRecordMethods(patch) {
  * @param {Object} [definition.recordMethods]
  * @param {string} [definition.template]
  */
-export function registerModel({ componentSetup, fields, identifyingMode = 'and', isLegacyComponent = false, lifecycleHooks, modelGetters, modelMethods, name, onChanges, recordGetters, recordMethods, template }) {
+export function Model({ componentSetup, fields, identifyingMode = 'and', isLegacyComponent = false, lifecycleHooks, modelGetters, modelMethods, name, onChanges, recordGetters, recordMethods, template }) {
     if (!name) {
         throw new Error("Model is lacking a name.");
     }
@@ -474,7 +474,7 @@ export function registerModel({ componentSetup, fields, identifyingMode = 'and',
     }
 }
 
-export function registerPatch({ componentSetup, fields, lifecycleHooks, modelMethods, name, onChanges, recordMethods }) {
+export function Patch({ componentSetup, fields, lifecycleHooks, modelMethods, name, onChanges, recordMethods }) {
     if (!name) {
         throw new Error("Patch is lacking the name of the model to be patched.");
     }
diff --git a/addons/mail/static/src/models/activity.js b/addons/mail/static/src/models/activity.js
index ea1eb0725c2..680049351a8 100644
--- a/addons/mail/static/src/models/activity.js
+++ b/addons/mail/static/src/models/activity.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 
 import { markup } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'Activity',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/activity_button_view.js b/addons/mail/static/src/models/activity_button_view.js
index 7a0ced2de30..4a696813afb 100644
--- a/addons/mail/static/src/models/activity_button_view.js
+++ b/addons/mail/static/src/models/activity_button_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ActivityButtonView',
     template: 'mail.ActivityButtonView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/activity_cell_view.js b/addons/mail/static/src/models/activity_cell_view.js
index 816b05d7512..d2fb4877e83 100644
--- a/addons/mail/static/src/models/activity_cell_view.js
+++ b/addons/mail/static/src/models/activity_cell_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ActivityCellView',
     template: 'mail.ActivityCellView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/activity_group.js b/addons/mail/static/src/models/activity_group.js
index 4dc632b98c7..7450469cb69 100644
--- a/addons/mail/static/src/models/activity_group.js
+++ b/addons/mail/static/src/models/activity_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ActivityGroup',
     modelMethods: {
         convertData(data) {
diff --git a/addons/mail/static/src/models/activity_group_view.js b/addons/mail/static/src/models/activity_group_view.js
index bef01cb1b7d..1e137f5bbef 100644
--- a/addons/mail/static/src/models/activity_group_view.js
+++ b/addons/mail/static/src/models/activity_group_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
 import session from 'web.session';
 
-registerModel({
+Model({
     name: 'ActivityGroupView',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/activity_list_view.js b/addons/mail/static/src/models/activity_list_view.js
index 6b922ec1baa..6578dd64ba9 100644
--- a/addons/mail/static/src/models/activity_list_view.js
+++ b/addons/mail/static/src/models/activity_list_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import session from 'web.session';
 
-registerModel({
+Model({
     name: 'ActivityListView',
     template: 'mail.ActivityListView',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/activity_list_view_item.js b/addons/mail/static/src/models/activity_list_view_item.js
index 47ede70cc4c..97d63c6b086 100644
--- a/addons/mail/static/src/models/activity_list_view_item.js
+++ b/addons/mail/static/src/models/activity_list_view_item.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import { auto_str_to_date } from 'web.time';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'ActivityListViewItem',
     template: 'mail.ActivityListViewItem',
     recordMethods: {
diff --git a/addons/mail/static/src/models/activity_mark_done_popover_content_view.js b/addons/mail/static/src/models/activity_mark_done_popover_content_view.js
index 7d45bba7395..40992933cab 100644
--- a/addons/mail/static/src/models/activity_mark_done_popover_content_view.js
+++ b/addons/mail/static/src/models/activity_mark_done_popover_content_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import { onMounted } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'ActivityMarkDonePopoverContentView',
     template: 'mail.ActivityMarkDonePopoverContentView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/activity_menu_view.js b/addons/mail/static/src/models/activity_menu_view.js
index 78fec296b7e..ead1d6b9783 100644
--- a/addons/mail/static/src/models/activity_menu_view.js
+++ b/addons/mail/static/src/models/activity_menu_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, many, registerModel } from '@mail/model';
+import { attr, many, Model } from '@mail/model';
 
 import session from 'web.session';
 
-registerModel({
+Model({
     name: 'ActivityMenuView',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/models/activity_type.js b/addons/mail/static/src/models/activity_type.js
index 76828faa3a9..3af25d0e5b2 100644
--- a/addons/mail/static/src/models/activity_type.js
+++ b/addons/mail/static/src/models/activity_type.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, registerModel } from '@mail/model';
+import { attr, many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ActivityType',
     fields: {
         activities: many('Activity', { inverse: 'type' }),
diff --git a/addons/mail/static/src/models/activity_view.js b/addons/mail/static/src/models/activity_view.js
index dc9729de2a6..84284e97154 100644
--- a/addons/mail/static/src/models/activity_view.js
+++ b/addons/mail/static/src/models/activity_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import { auto_str_to_date, getLangDateFormat, getLangDatetimeFormat } from 'web.time';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'ActivityView',
     template: 'mail.ActivityView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/attachment.js b/addons/mail/static/src/models/attachment.js
index aeae9eafcc7..5771320373a 100644
--- a/addons/mail/static/src/models/attachment.js
+++ b/addons/mail/static/src/models/attachment.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Attachment',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/attachment_card.js b/addons/mail/static/src/models/attachment_card.js
index c5d0e851280..711f170c2ae 100644
--- a/addons/mail/static/src/models/attachment_card.js
+++ b/addons/mail/static/src/models/attachment_card.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'AttachmentCard',
     template: 'mail.AttachmentCard',
     recordMethods: {
diff --git a/addons/mail/static/src/models/attachment_delete_confirm_view.js b/addons/mail/static/src/models/attachment_delete_confirm_view.js
index e44eff3a337..98ed3434c66 100644
--- a/addons/mail/static/src/models/attachment_delete_confirm_view.js
+++ b/addons/mail/static/src/models/attachment_delete_confirm_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'AttachmentDeleteConfirmView',
     template: 'mail.AttachmentDeleteConfirmView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/attachment_image.js b/addons/mail/static/src/models/attachment_image.js
index 80464d8ec6b..fc40107f08b 100644
--- a/addons/mail/static/src/models/attachment_image.js
+++ b/addons/mail/static/src/models/attachment_image.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'AttachmentImage',
     template: 'mail.AttachmentImage',
     recordMethods: {
diff --git a/addons/mail/static/src/models/attachment_list.js b/addons/mail/static/src/models/attachment_list.js
index dc0fe83124c..8a572319b62 100644
--- a/addons/mail/static/src/models/attachment_list.js
+++ b/addons/mail/static/src/models/attachment_list.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'AttachmentList',
     template: 'mail.AttachmentList',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/attachment_viewer.js b/addons/mail/static/src/models/attachment_viewer.js
index a8cd9b256e1..baa26048545 100644
--- a/addons/mail/static/src/models/attachment_viewer.js
+++ b/addons/mail/static/src/models/attachment_viewer.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, increment, many, one, registerModel } from '@mail/model';
+import { attr, clear, increment, many, one, Model } from '@mail/model';
 
 import { hidePDFJSButtons } from '@web/legacy/js/libs/pdfjs';
 
-registerModel({
+Model({
     name: 'AttachmentViewer',
     identifyingMode: 'xor',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/attachment_viewer__translate.js b/addons/mail/static/src/models/attachment_viewer__translate.js
index f933cf6be43..824e3ed6bbd 100644
--- a/addons/mail/static/src/models/attachment_viewer__translate.js
+++ b/addons/mail/static/src/models/attachment_viewer__translate.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
 /**
  * Tracked translate transformations on image visualisation. This is
@@ -9,7 +9,7 @@ import { attr, one, registerModel } from '@mail/model';
  * reasons (overhead of making vdom is too significant for each mouse
  * position changes while dragging)
  */
-registerModel({
+ Model({
     name: 'AttachmentViewer.Translate',
     fields: {
         dx: attr({ default: 0 }),
diff --git a/addons/mail/static/src/models/attachment_viewer_viewable.js b/addons/mail/static/src/models/attachment_viewer_viewable.js
index 4d456b3a060..75dd382d0ab 100644
--- a/addons/mail/static/src/models/attachment_viewer_viewable.js
+++ b/addons/mail/static/src/models/attachment_viewer_viewable.js
@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from "@mail/model";
+import { attr, one, Model } from "@mail/model";
 
 /**
  * Intermediary model to facilitate adding support for additional
  * models to the AttachmentViewer.
  */
 
-registerModel({
+ Model({
     name: "AttachmentViewerViewable",
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/autocomplete_input_view.js b/addons/mail/static/src/models/autocomplete_input_view.js
index 0bf342da720..ebedf6976be 100644
--- a/addons/mail/static/src/models/autocomplete_input_view.js
+++ b/addons/mail/static/src/models/autocomplete_input_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import { onMounted, onWillUnmount } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'AutocompleteInputView',
     template: 'mail.AutocompleteInputView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/blur_manager.js b/addons/mail/static/src/models/blur_manager.js
index a56ff94d03b..92ffc009c6c 100644
--- a/addons/mail/static/src/models/blur_manager.js
+++ b/addons/mail/static/src/models/blur_manager.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 function drawAndBlurImageOnCanvas(image, blurAmount, canvas) {
     canvas.width = image.width;
@@ -17,7 +17,7 @@ function drawAndBlurImageOnCanvas(image, blurAmount, canvas) {
     canvas.getContext('2d').restore();
 }
 
-registerModel({
+Model({
     name: 'BlurManager',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/call_action_list_view.js b/addons/mail/static/src/models/call_action_list_view.js
index d2a67d68a20..65b05af9450 100644
--- a/addons/mail/static/src/models/call_action_list_view.js
+++ b/addons/mail/static/src/models/call_action_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallActionListView',
     template: 'mail.CallActionListView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/call_demo_view.js b/addons/mail/static/src/models/call_demo_view.js
index fe5e8e29ea1..b54cf8556e9 100644
--- a/addons/mail/static/src/models/call_demo_view.js
+++ b/addons/mail/static/src/models/call_demo_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallDemoView',
     template: 'mail.CallDemoView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/call_invite_request_popup.js b/addons/mail/static/src/models/call_invite_request_popup.js
index a568a047744..22a086221e9 100644
--- a/addons/mail/static/src/models/call_invite_request_popup.js
+++ b/addons/mail/static/src/models/call_invite_request_popup.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallInviteRequestPopup',
     template: 'mail.CallInviteRequestPopup',
     recordMethods: {
diff --git a/addons/mail/static/src/models/call_main_view.js b/addons/mail/static/src/models/call_main_view.js
index fe5a1f792aa..fca6c80eaed 100644
--- a/addons/mail/static/src/models/call_main_view.js
+++ b/addons/mail/static/src/models/call_main_view.js
@@ -2,13 +2,13 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
 import { onMounted, onWillUnmount } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'CallMainView',
     template: 'mail.CallMainView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/call_main_view_tile.js b/addons/mail/static/src/models/call_main_view_tile.js
index f998b279d94..84d3288e9da 100644
--- a/addons/mail/static/src/models/call_main_view_tile.js
+++ b/addons/mail/static/src/models/call_main_view_tile.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallMainViewTile',
     fields: {
         callMainViewOwner: one('CallMainView', { identifying: true, inverse: 'mainTiles' }),
diff --git a/addons/mail/static/src/models/call_option_menu.js b/addons/mail/static/src/models/call_option_menu.js
index 021d9d931ac..c1bdf8660e4 100644
--- a/addons/mail/static/src/models/call_option_menu.js
+++ b/addons/mail/static/src/models/call_option_menu.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallOptionMenu',
     template: 'mail.CallOptionMenu',
     componentSetup() {
diff --git a/addons/mail/static/src/models/call_participant_card.js b/addons/mail/static/src/models/call_participant_card.js
index 71ecbe4651b..9a8b926ee65 100644
--- a/addons/mail/static/src/models/call_participant_card.js
+++ b/addons/mail/static/src/models/call_participant_card.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'CallParticipantCard',
     template: 'mail.CallParticipantCard',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/call_participant_card_popover_content_view.js b/addons/mail/static/src/models/call_participant_card_popover_content_view.js
index 797befae3f5..d7d71ba7ba6 100644
--- a/addons/mail/static/src/models/call_participant_card_popover_content_view.js
+++ b/addons/mail/static/src/models/call_participant_card_popover_content_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'CallParticipantCardPopoverContentView',
     template: 'mail.CallParticipantCardPopoverContentView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/call_participant_video_view.js b/addons/mail/static/src/models/call_participant_video_view.js
index 6419ebb49a1..c719a9af60b 100644
--- a/addons/mail/static/src/models/call_participant_video_view.js
+++ b/addons/mail/static/src/models/call_participant_video_view.js
@@ -2,9 +2,9 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallParticipantVideoView',
     template: 'mail.CallParticipantVideoView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/call_settings_menu.js b/addons/mail/static/src/models/call_settings_menu.js
index 2ff7f5efb58..4aca21d6f57 100644
--- a/addons/mail/static/src/models/call_settings_menu.js
+++ b/addons/mail/static/src/models/call_settings_menu.js
@@ -2,9 +2,9 @@
 
 import { browser } from "@web/core/browser/browser";
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallSettingsMenu',
     template: 'mail.CallSettingsMenu',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/call_sidebar_view.js b/addons/mail/static/src/models/call_sidebar_view.js
index 698070796f6..dfca398d50a 100644
--- a/addons/mail/static/src/models/call_sidebar_view.js
+++ b/addons/mail/static/src/models/call_sidebar_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallSidebarView',
     template: 'mail.CallSidebarView',
     fields: {
diff --git a/addons/mail/static/src/models/call_sidebar_view_tile.js b/addons/mail/static/src/models/call_sidebar_view_tile.js
index a2c39c0cb9a..db2864f1366 100644
--- a/addons/mail/static/src/models/call_sidebar_view_tile.js
+++ b/addons/mail/static/src/models/call_sidebar_view_tile.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallSidebarViewTile',
     fields: {
         callSidebarViewOwner: one('CallSidebarView', { identifying: true, inverse: 'sidebarTiles' }),
diff --git a/addons/mail/static/src/models/call_systray_menu.js b/addons/mail/static/src/models/call_systray_menu.js
index 03f259b5ae2..97e7335a87e 100644
--- a/addons/mail/static/src/models/call_systray_menu.js
+++ b/addons/mail/static/src/models/call_systray_menu.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'CallSystrayMenu',
     template: 'mail.CallSystrayMenu',
     fields: {
diff --git a/addons/mail/static/src/models/call_view.js b/addons/mail/static/src/models/call_view.js
index eb75145e12e..476b6c684c5 100644
--- a/addons/mail/static/src/models/call_view.js
+++ b/addons/mail/static/src/models/call_view.js
@@ -2,9 +2,9 @@
 
 import { browser } from "@web/core/browser/browser";
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'CallView',
     template: 'mail.CallView',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/canned_response.js b/addons/mail/static/src/models/canned_response.js
index d160b7e471e..8bd4c31e089 100644
--- a/addons/mail/static/src/models/canned_response.js
+++ b/addons/mail/static/src/models/canned_response.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 import { cleanSearchTerm } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'CannedResponse',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/channel.js b/addons/mail/static/src/models/channel.js
index 76cd25681c8..1edad552f34 100644
--- a/addons/mail/static/src/models/channel.js
+++ b/addons/mail/static/src/models/channel.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, many, registerModel } from '@mail/model';
+import { attr, clear, one, many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Channel',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/channel_command.js b/addons/mail/static/src/models/channel_command.js
index af8a93c1d76..02d598be280 100644
--- a/addons/mail/static/src/models/channel_command.js
+++ b/addons/mail/static/src/models/channel_command.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 import { cleanSearchTerm } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'ChannelCommand',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/channel_invitation_form.js b/addons/mail/static/src/models/channel_invitation_form.js
index d025dd43fee..3a4ee9ba0e7 100644
--- a/addons/mail/static/src/models/channel_invitation_form.js
+++ b/addons/mail/static/src/models/channel_invitation_form.js
@@ -2,12 +2,12 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, link, many, one, registerModel, unlink } from '@mail/model';
+import { attr, clear, link, many, one, Model, unlink } from '@mail/model';
 import { cleanSearchTerm } from '@mail/utils/utils';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'ChannelInvitationForm',
     template: 'mail.ChannelInvitationForm',
     componentSetup() {
diff --git a/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js b/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js
index dae3dafffca..c2fd826254c 100644
--- a/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js
+++ b/addons/mail/static/src/models/channel_invitation_form_selectable_partner_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChannelInvitationFormSelectablePartnerView',
     template: 'mail.ChannelInvitationFormSelectablePartnerView',
     fields: {
diff --git a/addons/mail/static/src/models/channel_invitation_form_selected_partner_view.js b/addons/mail/static/src/models/channel_invitation_form_selected_partner_view.js
index 5e548f07993..4d9c3017650 100644
--- a/addons/mail/static/src/models/channel_invitation_form_selected_partner_view.js
+++ b/addons/mail/static/src/models/channel_invitation_form_selected_partner_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChannelInvitationFormSelectedPartnerView',
     template: 'mail.ChannelInvitationFormSelectedPartnerView',
     fields: {
diff --git a/addons/mail/static/src/models/channel_member.js b/addons/mail/static/src/models/channel_member.js
index f4eaaa71300..a6139f7f651 100644
--- a/addons/mail/static/src/models/channel_member.js
+++ b/addons/mail/static/src/models/channel_member.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, many, registerModel } from '@mail/model';
+import { attr, clear, one, many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChannelMember',
     fields: {
         avatarUrl: attr({
diff --git a/addons/mail/static/src/models/channel_member_list_category_view.js b/addons/mail/static/src/models/channel_member_list_category_view.js
index 0fafca87c75..ea5cba9fcec 100644
--- a/addons/mail/static/src/models/channel_member_list_category_view.js
+++ b/addons/mail/static/src/models/channel_member_list_category_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'ChannelMemberListCategoryView',
     template: 'mail.ChannelMemberListCategoryView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/channel_member_list_view.js b/addons/mail/static/src/models/channel_member_list_view.js
index fe016fa0841..cb21fe2f357 100644
--- a/addons/mail/static/src/models/channel_member_list_view.js
+++ b/addons/mail/static/src/models/channel_member_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChannelMemberListView',
     template: 'mail.ChannelMemberListView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/channel_member_view.js b/addons/mail/static/src/models/channel_member_view.js
index 89fe2cf797d..4e6c63c811e 100644
--- a/addons/mail/static/src/models/channel_member_view.js
+++ b/addons/mail/static/src/models/channel_member_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { isEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'ChannelMemberView',
     template: 'mail.ChannelMemberView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/channel_preview_view.js b/addons/mail/static/src/models/channel_preview_view.js
index 9ae4306df76..4ef74e2e256 100644
--- a/addons/mail/static/src/models/channel_preview_view.js
+++ b/addons/mail/static/src/models/channel_preview_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { htmlToTextContentInline } from '@mail/js/utils';
 
-registerModel({
+Model({
     name: 'ChannelPreviewView',
     template: 'mail.ChannelPreviewView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/chat_window.js b/addons/mail/static/src/models/chat_window.js
index afa963788ba..3d15009181c 100644
--- a/addons/mail/static/src/models/chat_window.js
+++ b/addons/mail/static/src/models/chat_window.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'ChatWindow',
     identifyingMode: 'xor',
     template: 'mail.ChatWindow',
diff --git a/addons/mail/static/src/models/chat_window_header_view.js b/addons/mail/static/src/models/chat_window_header_view.js
index 5abc39ec6ef..8ffad43295e 100644
--- a/addons/mail/static/src/models/chat_window_header_view.js
+++ b/addons/mail/static/src/models/chat_window_header_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 import { isEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'ChatWindowHeaderView',
     template: 'mail.ChatWindowHeaderView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/chat_window_hidden_menu_item_view.js b/addons/mail/static/src/models/chat_window_hidden_menu_item_view.js
index 4549a5786ff..ab639c73a46 100644
--- a/addons/mail/static/src/models/chat_window_hidden_menu_item_view.js
+++ b/addons/mail/static/src/models/chat_window_hidden_menu_item_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChatWindowHiddenMenuItemView',
     template: 'mail.ChatWindowHiddenMenuItemView',
     fields: {
diff --git a/addons/mail/static/src/models/chat_window_hidden_menu_view.js b/addons/mail/static/src/models/chat_window_hidden_menu_view.js
index c6316044852..e77bc451aed 100644
--- a/addons/mail/static/src/models/chat_window_hidden_menu_view.js
+++ b/addons/mail/static/src/models/chat_window_hidden_menu_view.js
@@ -2,9 +2,9 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ChatWindowHiddenMenuView',
     template: 'mail.ChatWindowHiddenMenuView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/chat_window_manager.js b/addons/mail/static/src/models/chat_window_manager.js
index 6e838994c23..bb152a34aaf 100644
--- a/addons/mail/static/src/models/chat_window_manager.js
+++ b/addons/mail/static/src/models/chat_window_manager.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
 export const BASE_VISUAL = {
     /**
@@ -40,7 +40,7 @@ export const BASE_VISUAL = {
     visible: [],
 };
 
-registerModel({
+Model({
     name: 'ChatWindowManager',
     template: 'mail.ChatWindowManager',
     recordMethods: {
diff --git a/addons/mail/static/src/models/chatter.js b/addons/mail/static/src/models/chatter.js
index 594504d91eb..71fadce95f6 100644
--- a/addons/mail/static/src/models/chatter.js
+++ b/addons/mail/static/src/models/chatter.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, insert, link, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, link, many, one, Model } from '@mail/model';
 
 const getThreadNextTemporaryId = (function () {
     let tmpId = 0;
@@ -19,7 +19,7 @@ const getMessageNextTemporaryId = (function () {
     };
 })();
 
-registerModel({
+Model({
     name: 'Chatter',
     template: 'mail.Chatter',
     isLegacyComponent: true,
diff --git a/addons/mail/static/src/models/clock.js b/addons/mail/static/src/models/clock.js
index 4b42b160d22..a9d2f2b48a2 100644
--- a/addons/mail/static/src/models/clock.js
+++ b/addons/mail/static/src/models/clock.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, many, registerModel } from '@mail/model';
+import { attr, many, Model } from '@mail/model';
 
 /**
  * Models a record that provides the current date, updated at a given frequency.
  */
-registerModel({
+Model({
     name: 'Clock',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/models/clock_watcher.js b/addons/mail/static/src/models/clock_watcher.js
index 5bc3b5b214e..8b5144ab32e 100644
--- a/addons/mail/static/src/models/clock_watcher.js
+++ b/addons/mail/static/src/models/clock_watcher.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
 /**
  * Models a record that makes use of a clock.
  */
-registerModel({
+Model({
     name: 'ClockWatcher',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/composer.js b/addons/mail/static/src/models/composer.js
index 81a878b85b6..5c35c5b2281 100644
--- a/addons/mail/static/src/models/composer.js
+++ b/addons/mail/static/src/models/composer.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'Composer',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/composer_suggestable.js b/addons/mail/static/src/models/composer_suggestable.js
index 5319e959bd3..161f0afcd0b 100644
--- a/addons/mail/static/src/models/composer_suggestable.js
+++ b/addons/mail/static/src/models/composer_suggestable.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ComposerSuggestable',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/composer_suggested_recipient_list_view.js b/addons/mail/static/src/models/composer_suggested_recipient_list_view.js
index c14bc546c23..09c26d02a34 100644
--- a/addons/mail/static/src/models/composer_suggested_recipient_list_view.js
+++ b/addons/mail/static/src/models/composer_suggested_recipient_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ComposerSuggestedRecipientListView',
     template: 'mail.ComposerSuggestedRecipientListView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/composer_suggested_recipient_view.js b/addons/mail/static/src/models/composer_suggested_recipient_view.js
index 87fe5e99b32..d08972cbfc8 100644
--- a/addons/mail/static/src/models/composer_suggested_recipient_view.js
+++ b/addons/mail/static/src/models/composer_suggested_recipient_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ComposerSuggestedRecipientView',
     fields: {
         composerSuggestedRecipientListViewOwner: one('ComposerSuggestedRecipientListView', { identifying: true, inverse: 'composerSuggestedRecipientViews' }),
diff --git a/addons/mail/static/src/models/composer_suggestion_list_view.js b/addons/mail/static/src/models/composer_suggestion_list_view.js
index f3a0cf85a49..925da524bf9 100644
--- a/addons/mail/static/src/models/composer_suggestion_list_view.js
+++ b/addons/mail/static/src/models/composer_suggestion_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ComposerSuggestionListView',
     template: 'mail.ComposerSuggestionListView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/composer_suggestion_list_view_extra_composer_suggestion_view_item.js b/addons/mail/static/src/models/composer_suggestion_list_view_extra_composer_suggestion_view_item.js
index 767de4a1f2e..3a1b67345d8 100644
--- a/addons/mail/static/src/models/composer_suggestion_list_view_extra_composer_suggestion_view_item.js
+++ b/addons/mail/static/src/models/composer_suggestion_list_view_extra_composer_suggestion_view_item.js
@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
 /**
  * Models a relation between a ComposerSuggestionListView and a
  * ComposerSuggestionView where suggestable is used as iterating field for extra
  * suggestions.
  */
-registerModel({
+Model({
     name: 'ComposerSuggestionListViewExtraComposerSuggestionViewItem',
     fields: {
         composerSuggestionListViewOwner: one('ComposerSuggestionListView', { identifying: true, inverse: 'composerSuggestionListViewExtraComposerSuggestionViewItems' }),
diff --git a/addons/mail/static/src/models/composer_suggestion_list_view_main_composer_suggestion_view_item.js b/addons/mail/static/src/models/composer_suggestion_list_view_main_composer_suggestion_view_item.js
index a91f86ca3f4..40acc855eb9 100644
--- a/addons/mail/static/src/models/composer_suggestion_list_view_main_composer_suggestion_view_item.js
+++ b/addons/mail/static/src/models/composer_suggestion_list_view_main_composer_suggestion_view_item.js
@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
 /**
  * Models a relation between a ComposerSuggestionListView and a
  * ComposerSuggestionView where suggestable is used as iterating field for main
  * suggestions.
  */
-registerModel({
+Model({
     name: 'ComposerSuggestionListViewMainComposerSuggestionViewItem',
     fields: {
         composerSuggestionListViewOwner: one('ComposerSuggestionListView', { identifying: true, inverse: 'composerSuggestionListViewMainComposerSuggestionViewItems' }),
diff --git a/addons/mail/static/src/models/composer_suggestion_view.js b/addons/mail/static/src/models/composer_suggestion_view.js
index c39c35c30ba..5a9f3222e4d 100644
--- a/addons/mail/static/src/models/composer_suggestion_view.js
+++ b/addons/mail/static/src/models/composer_suggestion_view.js
@@ -2,7 +2,7 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { sprintf } from '@web/core/utils/strings';
 
 /**
@@ -11,7 +11,7 @@ import { sprintf } from '@web/core/utils/strings';
  * For instance, to mention a partner, can type "@" and some keyword,
  * and display suggested partners to mention.
  */
-registerModel({
+Model({
     name: 'ComposerSuggestionView',
     template: 'mail.ComposerSuggestionView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/composer_text_input_view.js b/addons/mail/static/src/models/composer_text_input_view.js
index 455ba8d59c8..972d04dbaf5 100644
--- a/addons/mail/static/src/models/composer_text_input_view.js
+++ b/addons/mail/static/src/models/composer_text_input_view.js
@@ -2,9 +2,9 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ComposerTextInputView',
     template: 'mail.ComposerTextInputView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/composer_view.js b/addons/mail/static/src/models/composer_view.js
index 5a31a1e2242..6f4d6a99871 100644
--- a/addons/mail/static/src/models/composer_view.js
+++ b/addons/mail/static/src/models/composer_view.js
@@ -1,14 +1,14 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, link, many, one, registerModel } from '@mail/model';
+import { attr, clear, link, many, one, Model } from '@mail/model';
 import { addLink, escapeAndCompactTextContent, parseAndTransform } from '@mail/js/utils';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
 import { escape, sprintf } from '@web/core/utils/strings';
 import { url } from '@web/core/utils/urls';
 
-registerModel({
+Model({
     name: 'ComposerView',
     template: 'mail.ComposerView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/country.js b/addons/mail/static/src/models/country.js
index 410c96e4793..869028c6157 100644
--- a/addons/mail/static/src/models/country.js
+++ b/addons/mail/static/src/models/country.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Country',
     fields: {
         code: attr(),
diff --git a/addons/mail/static/src/models/delete_message_confirm_view.js b/addons/mail/static/src/models/delete_message_confirm_view.js
index c129498c1d8..98269afa0b0 100644
--- a/addons/mail/static/src/models/delete_message_confirm_view.js
+++ b/addons/mail/static/src/models/delete_message_confirm_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DeleteMessageConfirmView',
     template: 'mail.DeleteMessageConfirmView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/dialog.js b/addons/mail/static/src/models/dialog.js
index ee71000c944..9744f2eb15d 100644
--- a/addons/mail/static/src/models/dialog.js
+++ b/addons/mail/static/src/models/dialog.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Dialog',
     identifyingMode: 'xor',
     template: 'mail.Dialog',
diff --git a/addons/mail/static/src/models/dialog_manager.js b/addons/mail/static/src/models/dialog_manager.js
index ffea0b5f95e..4ae6b8ceff1 100644
--- a/addons/mail/static/src/models/dialog_manager.js
+++ b/addons/mail/static/src/models/dialog_manager.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { many, registerModel } from '@mail/model';
+import { many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DialogManager',
     template: 'mail.DialogManager',
     componentSetup() {
diff --git a/addons/mail/static/src/models/discuss.js b/addons/mail/static/src/models/discuss.js
index a2f35b9716c..cd08fb9c472 100644
--- a/addons/mail/static/src/models/discuss.js
+++ b/addons/mail/static/src/models/discuss.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { escape, sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'Discuss',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/discuss_mobile_mailbox_selection_item_view.js b/addons/mail/static/src/models/discuss_mobile_mailbox_selection_item_view.js
index 80faaf0d54d..d6390d0ad16 100644
--- a/addons/mail/static/src/models/discuss_mobile_mailbox_selection_item_view.js
+++ b/addons/mail/static/src/models/discuss_mobile_mailbox_selection_item_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussMobileMailboxSelectionItemView',
     template: 'mail.DiscussMobileMailboxSelectionItemView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/discuss_mobile_mailbox_selection_view.js b/addons/mail/static/src/models/discuss_mobile_mailbox_selection_view.js
index 10059aa46fb..644aef0ed63 100644
--- a/addons/mail/static/src/models/discuss_mobile_mailbox_selection_view.js
+++ b/addons/mail/static/src/models/discuss_mobile_mailbox_selection_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussMobileMailboxSelectionView',
     template: 'mail.DiscussMobileMailboxSelectionView',
     fields: {
diff --git a/addons/mail/static/src/models/discuss_public_view.js b/addons/mail/static/src/models/discuss_public_view.js
index b60fdf9b0c4..aa112254f12 100644
--- a/addons/mail/static/src/models/discuss_public_view.js
+++ b/addons/mail/static/src/models/discuss_public_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussPublicView',
     template: 'mail.DiscussPublicView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/discuss_sidebar_category.js b/addons/mail/static/src/models/discuss_sidebar_category.js
index 55473f657ba..0381863b877 100644
--- a/addons/mail/static/src/models/discuss_sidebar_category.js
+++ b/addons/mail/static/src/models/discuss_sidebar_category.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussSidebarCategory',
     template: 'mail.DiscussSidebarCategory',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/discuss_sidebar_category_item.js b/addons/mail/static/src/models/discuss_sidebar_category_item.js
index 4f600221167..54cb9f52fed 100644
--- a/addons/mail/static/src/models/discuss_sidebar_category_item.js
+++ b/addons/mail/static/src/models/discuss_sidebar_category_item.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import Dialog from 'web.Dialog';
 
-registerModel({
+Model({
     name: 'DiscussSidebarCategoryItem',
     template: 'mail.DiscussSidebarCategoryItem',
     recordMethods: {
diff --git a/addons/mail/static/src/models/discuss_sidebar_mailbox_view.js b/addons/mail/static/src/models/discuss_sidebar_mailbox_view.js
index 3b0e7dd9ac6..914cf72f03b 100644
--- a/addons/mail/static/src/models/discuss_sidebar_mailbox_view.js
+++ b/addons/mail/static/src/models/discuss_sidebar_mailbox_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussSidebarMailboxView',
     template: 'mail.DiscussSidebarMailboxView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/discuss_sidebar_view.js b/addons/mail/static/src/models/discuss_sidebar_view.js
index 2fcb541ad7e..7fd63d357bb 100644
--- a/addons/mail/static/src/models/discuss_sidebar_view.js
+++ b/addons/mail/static/src/models/discuss_sidebar_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussSidebarView',
     template: 'mail.DiscussSidebarView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/discuss_view.js b/addons/mail/static/src/models/discuss_view.js
index b288e56579f..6200b8359d6 100644
--- a/addons/mail/static/src/models/discuss_view.js
+++ b/addons/mail/static/src/models/discuss_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DiscussView',
     template: 'mail.DiscussView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/drop_zone_view.js b/addons/mail/static/src/models/drop_zone_view.js
index f8fdafe3e44..ed074d38983 100644
--- a/addons/mail/static/src/models/drop_zone_view.js
+++ b/addons/mail/static/src/models/drop_zone_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, decrement, increment, one, registerModel } from '@mail/model';
+import { attr, decrement, increment, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'DropZoneView',
     template: 'mail.DropZoneView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/emoji.js b/addons/mail/static/src/models/emoji.js
index b4834aebccf..cc0755deea0 100644
--- a/addons/mail/static/src/models/emoji.js
+++ b/addons/mail/static/src/models/emoji.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Emoji',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/emoji_category.js b/addons/mail/static/src/models/emoji_category.js
index e97b867fa88..bb497faf808 100644
--- a/addons/mail/static/src/models/emoji_category.js
+++ b/addons/mail/static/src/models/emoji_category.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiCategory',
     fields: {
         allEmojiInCategoryOfCurrent: many('EmojiInCategory', { inverse: 'category' }),
diff --git a/addons/mail/static/src/models/emoji_category_view.js b/addons/mail/static/src/models/emoji_category_view.js
index ab29b1706db..e4c1d2fc418 100644
--- a/addons/mail/static/src/models/emoji_category_view.js
+++ b/addons/mail/static/src/models/emoji_category_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiCategoryView',
     template: 'mail.EmojiCategoryView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/emoji_grid_row_view.js b/addons/mail/static/src/models/emoji_grid_row_view.js
index 47a9f314d19..399602423f2 100644
--- a/addons/mail/static/src/models/emoji_grid_row_view.js
+++ b/addons/mail/static/src/models/emoji_grid_row_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiGridRowView',
     template: 'mail.EmojiGridRowView',
     fields: {
diff --git a/addons/mail/static/src/models/emoji_grid_view.js b/addons/mail/static/src/models/emoji_grid_view.js
index af02cbcdb63..67d5a6dca16 100644
--- a/addons/mail/static/src/models/emoji_grid_view.js
+++ b/addons/mail/static/src/models/emoji_grid_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, increment, many, one, registerModel } from '@mail/model';
+import { attr, clear, increment, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiGridView',
     template: 'mail.EmojiGridView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/emoji_grid_view_row_registry.js b/addons/mail/static/src/models/emoji_grid_view_row_registry.js
index 888dbc805b9..abb80818386 100644
--- a/addons/mail/static/src/models/emoji_grid_view_row_registry.js
+++ b/addons/mail/static/src/models/emoji_grid_view_row_registry.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, many, one, registerModel } from '@mail/model';
+import { clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiGridViewRowRegistry',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/emoji_in_category.js b/addons/mail/static/src/models/emoji_in_category.js
index c2027baaa5a..6db2e0d59c1 100644
--- a/addons/mail/static/src/models/emoji_in_category.js
+++ b/addons/mail/static/src/models/emoji_in_category.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiInCategory',
     fields: {
         category: one('EmojiCategory', { identifying: true, inverse: 'allEmojiInCategoryOfCurrent' }),
diff --git a/addons/mail/static/src/models/emoji_or_emoji_in_category.js b/addons/mail/static/src/models/emoji_or_emoji_in_category.js
index b495e7672d1..1e03cdabe7b 100644
--- a/addons/mail/static/src/models/emoji_or_emoji_in_category.js
+++ b/addons/mail/static/src/models/emoji_or_emoji_in_category.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiOrEmojiInCategory',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/emoji_picker_header_action_view.js b/addons/mail/static/src/models/emoji_picker_header_action_view.js
index 2d34bd143d3..2ba82a06bf3 100644
--- a/addons/mail/static/src/models/emoji_picker_header_action_view.js
+++ b/addons/mail/static/src/models/emoji_picker_header_action_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, clear, registerModel } from '@mail/model';
+import { attr, one, clear, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiPickerHeaderActionView',
     template: 'mail.EmojiPickerHeaderActionView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/emoji_picker_view.js b/addons/mail/static/src/models/emoji_picker_view.js
index 6ae50755439..8c2701cc841 100644
--- a/addons/mail/static/src/models/emoji_picker_view.js
+++ b/addons/mail/static/src/models/emoji_picker_view.js
@@ -2,9 +2,9 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiPickerView',
     template: 'mail.EmojiPickerView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/emoji_picker_view__category.js b/addons/mail/static/src/models/emoji_picker_view__category.js
index 0e5e3e6e7aa..6523554f3a2 100644
--- a/addons/mail/static/src/models/emoji_picker_view__category.js
+++ b/addons/mail/static/src/models/emoji_picker_view__category.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 /**
  * Emoji category info of a specific emoji picker view
  */
-registerModel({
+Model({
     name: 'EmojiPickerView.Category',
     fields: {
         category: one('EmojiCategory', { identifying: true, inverse: 'allEmojiPickerViewCategory' }),
diff --git a/addons/mail/static/src/models/emoji_registry.js b/addons/mail/static/src/models/emoji_registry.js
index 8c902950270..72098b390c6 100644
--- a/addons/mail/static/src/models/emoji_registry.js
+++ b/addons/mail/static/src/models/emoji_registry.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, insert, many, registerModel } from '@mail/model';
+import { attr, insert, many, Model } from '@mail/model';
 import { getBundle, loadBundle } from '@web/core/assets';
 
-registerModel({
+Model({
     name: 'EmojiRegistry',
     recordMethods: {
         async loadEmojiData() {
diff --git a/addons/mail/static/src/models/emoji_view.js b/addons/mail/static/src/models/emoji_view.js
index bf4cc69312f..79eb8730b69 100644
--- a/addons/mail/static/src/models/emoji_view.js
+++ b/addons/mail/static/src/models/emoji_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'EmojiView',
     template: 'mail.EmojiView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/file_uploader.js b/addons/mail/static/src/models/file_uploader.js
index bce7aa38b10..3ea8cbd7fcd 100644
--- a/addons/mail/static/src/models/file_uploader.js
+++ b/addons/mail/static/src/models/file_uploader.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import core from 'web.core';
 
@@ -12,7 +12,7 @@ const getAttachmentNextTemporaryId = (function () {
     };
 })();
 
-registerModel({
+Model({
     name: 'FileUploader',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/follower.js b/addons/mail/static/src/models/follower.js
index 57a090b9138..b4ec7089e4f 100644
--- a/addons/mail/static/src/models/follower.js
+++ b/addons/mail/static/src/models/follower.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, link, many, one, registerModel, unlink } from '@mail/model';
+import { attr, clear, insert, link, many, one, Model, unlink } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Follower',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/follower_list_menu_view.js b/addons/mail/static/src/models/follower_list_menu_view.js
index 55235366df0..6f9ed520310 100644
--- a/addons/mail/static/src/models/follower_list_menu_view.js
+++ b/addons/mail/static/src/models/follower_list_menu_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'FollowerListMenuView',
     template: 'mail.FollowerListMenuView',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/follower_subtype.js b/addons/mail/static/src/models/follower_subtype.js
index 4bc680c4fdd..fa9a6caf995 100644
--- a/addons/mail/static/src/models/follower_subtype.js
+++ b/addons/mail/static/src/models/follower_subtype.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, registerModel } from '@mail/model';
+import { attr, many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'FollowerSubtype',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/follower_subtype_list.js b/addons/mail/static/src/models/follower_subtype_list.js
index 660129932eb..4c46e17758a 100644
--- a/addons/mail/static/src/models/follower_subtype_list.js
+++ b/addons/mail/static/src/models/follower_subtype_list.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'FollowerSubtypeList',
     template: 'mail.FollowerSubtypeList',
     componentSetup() {
diff --git a/addons/mail/static/src/models/follower_subtype_view.js b/addons/mail/static/src/models/follower_subtype_view.js
index ec437182c6e..4bbfff25836 100644
--- a/addons/mail/static/src/models/follower_subtype_view.js
+++ b/addons/mail/static/src/models/follower_subtype_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'FollowerSubtypeView',
     template: 'mail.FollowerSubtypeView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/follower_view.js b/addons/mail/static/src/models/follower_view.js
index 00a2028328b..5faa2d7114b 100644
--- a/addons/mail/static/src/models/follower_view.js
+++ b/addons/mail/static/src/models/follower_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'FollowerView',
     template: 'mail.FollowerView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/guest.js b/addons/mail/static/src/models/guest.js
index a602b66ca5f..888cea23e01 100644
--- a/addons/mail/static/src/models/guest.js
+++ b/addons/mail/static/src/models/guest.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Guest',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/ir_model.js b/addons/mail/static/src/models/ir_model.js
index 199fde18551..9f2ff89bca2 100644
--- a/addons/mail/static/src/models/ir_model.js
+++ b/addons/mail/static/src/models/ir_model.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ir.model',
     fields: {
         /**
diff --git a/addons/mail/static/src/models/kanban_field_activity_view.js b/addons/mail/static/src/models/kanban_field_activity_view.js
index f64426c34db..dc8428ffa85 100644
--- a/addons/mail/static/src/models/kanban_field_activity_view.js
+++ b/addons/mail/static/src/models/kanban_field_activity_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'KanbanFieldActivityView',
     template: 'mail.KanbanFieldActivityView',
     fields: {
diff --git a/addons/mail/static/src/models/link_preview.js b/addons/mail/static/src/models/link_preview.js
index b4e0ad909f7..704958e6e08 100644
--- a/addons/mail/static/src/models/link_preview.js
+++ b/addons/mail/static/src/models/link_preview.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreview',
     recordMethods: {
         async remove() {
diff --git a/addons/mail/static/src/models/link_preview_aside_view.js b/addons/mail/static/src/models/link_preview_aside_view.js
index 28bbcea21f8..47d5c4bfa77 100644
--- a/addons/mail/static/src/models/link_preview_aside_view.js
+++ b/addons/mail/static/src/models/link_preview_aside_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewAsideView',
     template: 'mail.LinkPreviewAsideView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/link_preview_card_view.js b/addons/mail/static/src/models/link_preview_card_view.js
index 6b62544a454..10e22363ec6 100644
--- a/addons/mail/static/src/models/link_preview_card_view.js
+++ b/addons/mail/static/src/models/link_preview_card_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewCardView',
     template: 'mail.LinkPreviewCardView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/link_preview_delete_confirm_view.js b/addons/mail/static/src/models/link_preview_delete_confirm_view.js
index 9c18a47a7ef..0fa9e962640 100644
--- a/addons/mail/static/src/models/link_preview_delete_confirm_view.js
+++ b/addons/mail/static/src/models/link_preview_delete_confirm_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewDeleteConfirmView',
     template: 'mail.LinkPreviewDeleteConfirmView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/link_preview_image_view.js b/addons/mail/static/src/models/link_preview_image_view.js
index 0aef1c1c429..5c13402d772 100644
--- a/addons/mail/static/src/models/link_preview_image_view.js
+++ b/addons/mail/static/src/models/link_preview_image_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewImageView',
     template: 'mail.LinkPreviewImageView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/link_preview_list_view.js b/addons/mail/static/src/models/link_preview_list_view.js
index ef796598705..2969470d93e 100644
--- a/addons/mail/static/src/models/link_preview_list_view.js
+++ b/addons/mail/static/src/models/link_preview_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, one, registerModel } from '@mail/model';
+import { many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewListView',
     template: 'mail.LinkPreviewListView',
     fields: {
diff --git a/addons/mail/static/src/models/link_preview_video_view.js b/addons/mail/static/src/models/link_preview_video_view.js
index 9bca1f7d44a..0f0316e8c05 100644
--- a/addons/mail/static/src/models/link_preview_video_view.js
+++ b/addons/mail/static/src/models/link_preview_video_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'LinkPreviewVideoView',
     template: 'mail.LinkPreviewVideoView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/list_field_activity_view.js b/addons/mail/static/src/models/list_field_activity_view.js
index d86d48f739d..34151bc89eb 100644
--- a/addons/mail/static/src/models/list_field_activity_view.js
+++ b/addons/mail/static/src/models/list_field_activity_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ListFieldActivityView',
     template: 'mail.ListFieldActivityView',
     fields: {
diff --git a/addons/mail/static/src/models/mail_template.js b/addons/mail/static/src/models/mail_template.js
index e31ec25fdbb..05a21fff7f9 100644
--- a/addons/mail/static/src/models/mail_template.js
+++ b/addons/mail/static/src/models/mail_template.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, registerModel } from '@mail/model';
+import { attr, many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MailTemplate',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/mail_template_view.js b/addons/mail/static/src/models/mail_template_view.js
index 370773fdbb5..872b9ffa285 100644
--- a/addons/mail/static/src/models/mail_template_view.js
+++ b/addons/mail/static/src/models/mail_template_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MailTemplateView',
     template: 'mail.MailTemplateView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/mailbox.js b/addons/mail/static/src/models/mailbox.js
index c924c3ac137..511e7d0b243 100644
--- a/addons/mail/static/src/models/mailbox.js
+++ b/addons/mail/static/src/models/mailbox.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Mailbox',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/media_stream.js b/addons/mail/static/src/models/media_stream.js
index ed813e65af3..950606ca9ea 100644
--- a/addons/mail/static/src/models/media_stream.js
+++ b/addons/mail/static/src/models/media_stream.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MediaStream',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/message.js b/addons/mail/static/src/models/message.js
index 475a719c093..04df512350e 100644
--- a/addons/mail/static/src/models/message.js
+++ b/addons/mail/static/src/models/message.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 import { addLink, htmlToTextContentInline, parseAndTransform } from '@mail/js/utils';
 
 import { session } from '@web/session';
@@ -9,7 +9,7 @@ import { getLangDatetimeFormat, str_to_datetime } from 'web.time';
 
 import { markup } from '@odoo/owl';
 
-registerModel({
+Model({
     name: 'Message',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/message_action.js b/addons/mail/static/src/models/message_action.js
index 0652a7152b9..dcdda3aa891 100644
--- a/addons/mail/static/src/models/message_action.js
+++ b/addons/mail/static/src/models/message_action.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageAction',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/message_action_list.js b/addons/mail/static/src/models/message_action_list.js
index 6fe8b5ec87f..7ae9172a7d8 100644
--- a/addons/mail/static/src/models/message_action_list.js
+++ b/addons/mail/static/src/models/message_action_list.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageActionList',
     template: "mail.MessageActionList",
     fields: {
diff --git a/addons/mail/static/src/models/message_action_view.js b/addons/mail/static/src/models/message_action_view.js
index 8560e9f2676..1e2f483f849 100644
--- a/addons/mail/static/src/models/message_action_view.js
+++ b/addons/mail/static/src/models/message_action_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'MessageActionView',
     template: "mail.MessageActionView",
     recordMethods: {
diff --git a/addons/mail/static/src/models/message_author_prefix_view.js b/addons/mail/static/src/models/message_author_prefix_view.js
index 7a36ba95f59..df1fd9e6378 100644
--- a/addons/mail/static/src/models/message_author_prefix_view.js
+++ b/addons/mail/static/src/models/message_author_prefix_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageAuthorPrefixView',
     template: 'mail.MessageAuthorPrefixView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/message_in_reply_to_view.js b/addons/mail/static/src/models/message_in_reply_to_view.js
index f2137a8cf7a..7b9bc403ff9 100644
--- a/addons/mail/static/src/models/message_in_reply_to_view.js
+++ b/addons/mail/static/src/models/message_in_reply_to_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 import { markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'MessageInReplyToView',
     template: "mail.MessageInReplyToView",
     recordMethods: {
diff --git a/addons/mail/static/src/models/message_list_view.js b/addons/mail/static/src/models/message_list_view.js
index a265a6e264a..103477b7048 100644
--- a/addons/mail/static/src/models/message_list_view.js
+++ b/addons/mail/static/src/models/message_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageListView',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/message_list_view_item.js b/addons/mail/static/src/models/message_list_view_item.js
index d78206a4c5b..33a2f715971 100644
--- a/addons/mail/static/src/models/message_list_view_item.js
+++ b/addons/mail/static/src/models/message_list_view_item.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 /**
  * Models a relation between a message list view and a message view where
  * message is used as iterating field.
  */
-registerModel({
+Model({
     name: 'MessageListViewItem',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/message_notification_popover_content_view.js b/addons/mail/static/src/models/message_notification_popover_content_view.js
index ae01d25ea52..4cce732e289 100644
--- a/addons/mail/static/src/models/message_notification_popover_content_view.js
+++ b/addons/mail/static/src/models/message_notification_popover_content_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageNotificationPopoverContentView',
     template: 'mail.MessageNotificationPopoverContentView',
     fields: {
diff --git a/addons/mail/static/src/models/message_reaction_group.js b/addons/mail/static/src/models/message_reaction_group.js
index eddd6f5f027..af33da301dd 100644
--- a/addons/mail/static/src/models/message_reaction_group.js
+++ b/addons/mail/static/src/models/message_reaction_group.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 import { markEventHandled } from '@mail/utils/utils';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'MessageReactionGroup',
     template: 'mail.MessageReactionGroup',
     recordMethods: {
diff --git a/addons/mail/static/src/models/message_seen_indicator.js b/addons/mail/static/src/models/message_seen_indicator.js
index 69f89d8dac1..a6f1dcd9ab8 100644
--- a/addons/mail/static/src/models/message_seen_indicator.js
+++ b/addons/mail/static/src/models/message_seen_indicator.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'MessageSeenIndicator',
     fields: {
         hasEveryoneFetched: attr({ default: false,
diff --git a/addons/mail/static/src/models/message_seen_indicator_view.js b/addons/mail/static/src/models/message_seen_indicator_view.js
index 45a54e7c5ab..85700bf57f6 100644
--- a/addons/mail/static/src/models/message_seen_indicator_view.js
+++ b/addons/mail/static/src/models/message_seen_indicator_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessageSeenIndicatorView',
     template: 'mail.MessageSeenIndicatorView',
     fields: {
diff --git a/addons/mail/static/src/models/message_view.js b/addons/mail/static/src/models/message_view.js
index 7adf541259c..cc910408f4a 100644
--- a/addons/mail/static/src/models/message_view.js
+++ b/addons/mail/static/src/models/message_view.js
@@ -2,10 +2,10 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, increment, one, registerModel } from '@mail/model';
+import { attr, clear, increment, one, Model } from '@mail/model';
 import { isEventHandled, markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'MessageView',
     template: 'mail.MessageView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/messaging.js b/addons/mail/static/src/models/messaging.js
index 87e98f3ff19..2311182e065 100644
--- a/addons/mail/static/src/models/messaging.js
+++ b/addons/mail/static/src/models/messaging.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerPatch } from '@mail/model';
+import { attr, clear, many, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/models/messaging_initializer.js b/addons/mail/static/src/models/messaging_initializer.js
index ab6366e5aa3..d2215894d05 100644
--- a/addons/mail/static/src/models/messaging_initializer.js
+++ b/addons/mail/static/src/models/messaging_initializer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { insert, registerModel } from '@mail/model';
+import { insert, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessagingInitializer',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/messaging_menu.js b/addons/mail/static/src/models/messaging_menu.js
index 68225b5a543..3cf2d719087 100644
--- a/addons/mail/static/src/models/messaging_menu.js
+++ b/addons/mail/static/src/models/messaging_menu.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessagingMenu',
     template: 'mail.MessagingMenu',
     componentSetup() {
diff --git a/addons/mail/static/src/models/messaging_menu_tab_view.js b/addons/mail/static/src/models/messaging_menu_tab_view.js
index 3f130704efd..e51bc4fcb1d 100644
--- a/addons/mail/static/src/models/messaging_menu_tab_view.js
+++ b/addons/mail/static/src/models/messaging_menu_tab_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MessagingMenuTabView',
     template: 'mail.MessagingMenuTabView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/messaging_notification_handler.js b/addons/mail/static/src/models/messaging_notification_handler.js
index 55e1e6a2a36..3b0b2091025 100644
--- a/addons/mail/static/src/models/messaging_notification_handler.js
+++ b/addons/mail/static/src/models/messaging_notification_handler.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { decrement, increment, insert, registerModel } from '@mail/model';
+import { decrement, increment, insert, Model } from '@mail/model';
 import { htmlToTextContentInline } from '@mail/js/utils';
 
 import { escape, sprintf } from '@web/core/utils/strings';
@@ -9,7 +9,7 @@ import { Markup } from 'web.utils';
 
 const PREVIEW_MSG_MAX_SIZE = 350; // optimal for native English speakers
 
-registerModel({
+Model({
     name: 'MessagingNotificationHandler',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/mobile_messaging_navbar_view.js b/addons/mail/static/src/models/mobile_messaging_navbar_view.js
index 2a7dca16db2..3be67d01b2f 100644
--- a/addons/mail/static/src/models/mobile_messaging_navbar_view.js
+++ b/addons/mail/static/src/models/mobile_messaging_navbar_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'MobileMessagingNavbarView',
     template: 'mail.MobileMessagingNavbarView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/notification.js b/addons/mail/static/src/models/notification.js
index 2d0824da972..33ad08c66d9 100644
--- a/addons/mail/static/src/models/notification.js
+++ b/addons/mail/static/src/models/notification.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, one, registerModel } from '@mail/model';
+import { attr, clear, insert, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Notification',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/notification_group.js b/addons/mail/static/src/models/notification_group.js
index dd34e310539..482477d0ac6 100644
--- a/addons/mail/static/src/models/notification_group.js
+++ b/addons/mail/static/src/models/notification_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'NotificationGroup',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/notification_group_view.js b/addons/mail/static/src/models/notification_group_view.js
index a461a76ec52..c9f46277a2f 100644
--- a/addons/mail/static/src/models/notification_group_view.js
+++ b/addons/mail/static/src/models/notification_group_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'NotificationGroupView',
     template: 'mail.NotificationGroupView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/notification_list_view.js b/addons/mail/static/src/models/notification_list_view.js
index 4fe174831be..21ec31ba8c1 100644
--- a/addons/mail/static/src/models/notification_list_view.js
+++ b/addons/mail/static/src/models/notification_list_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'NotificationListView',
     template: 'mail.NotificationListView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/notification_message_view.js b/addons/mail/static/src/models/notification_message_view.js
index 0acd5fe6592..55e7a218fb2 100644
--- a/addons/mail/static/src/models/notification_message_view.js
+++ b/addons/mail/static/src/models/notification_message_view.js
@@ -2,9 +2,9 @@
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'NotificationMessageView',
     template: 'mail.NotificationMessageView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/notification_request_view.js b/addons/mail/static/src/models/notification_request_view.js
index a82099d2801..e9f8ab5e1c7 100644
--- a/addons/mail/static/src/models/notification_request_view.js
+++ b/addons/mail/static/src/models/notification_request_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'NotificationRequestView',
     template: 'mail.NotificationRequestView',
     recordMethods: {
diff --git a/addons/mail/static/src/models/other_member_long_typing_in_thread_timer.js b/addons/mail/static/src/models/other_member_long_typing_in_thread_timer.js
index 1380cc0bbf5..88893970681 100644
--- a/addons/mail/static/src/models/other_member_long_typing_in_thread_timer.js
+++ b/addons/mail/static/src/models/other_member_long_typing_in_thread_timer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'OtherMemberLongTypingInThreadTimer',
     recordMethods: {
         onOtherMemberLongTypingTimeout() {
diff --git a/addons/mail/static/src/models/partner.js b/addons/mail/static/src/models/partner.js
index 103b2b9f448..ac676d4e5bb 100644
--- a/addons/mail/static/src/models/partner.js
+++ b/addons/mail/static/src/models/partner.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 import { cleanSearchTerm } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'Partner',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/persona.js b/addons/mail/static/src/models/persona.js
index fe0adc3a535..805c497932a 100644
--- a/addons/mail/static/src/models/persona.js
+++ b/addons/mail/static/src/models/persona.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Persona',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/persona_im_status_icon_view.js b/addons/mail/static/src/models/persona_im_status_icon_view.js
index 5d72808fdf4..d046bbba4ac 100644
--- a/addons/mail/static/src/models/persona_im_status_icon_view.js
+++ b/addons/mail/static/src/models/persona_im_status_icon_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { markEventHandled } from '@mail/utils/utils';
 
-registerModel({
+Model({
     name: 'PersonaImStatusIconView',
     template: 'mail.PersonaImStatusIconView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/popover_manager.js b/addons/mail/static/src/models/popover_manager.js
index 8d86669dc48..ccb2424d60f 100644
--- a/addons/mail/static/src/models/popover_manager.js
+++ b/addons/mail/static/src/models/popover_manager.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { many, registerModel } from '@mail/model';
+import { many, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PopoverManager',
     template: 'mail.PopoverManager',
     fields: {
diff --git a/addons/mail/static/src/models/popover_view.js b/addons/mail/static/src/models/popover_view.js
index 2c3ad4e7b95..3d5d5619b2b 100644
--- a/addons/mail/static/src/models/popover_view.js
+++ b/addons/mail/static/src/models/popover_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 import { usePosition } from '@web/core/position_hook';
 
-registerModel({
+Model({
     name: 'PopoverView',
     template: 'mail.PopoverView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/res_users_settings.js b/addons/mail/static/src/models/res_users_settings.js
index 8d125be92b2..05ceaf10b4f 100644
--- a/addons/mail/static/src/models/res_users_settings.js
+++ b/addons/mail/static/src/models/res_users_settings.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
 /**
  * Mirrors the fields of the python model res.users.settings.
  */
-registerModel({
+Model({
     name: 'res.users.settings',
     fields: {
         id: attr({ identifying: true }),
diff --git a/addons/mail/static/src/models/res_users_settings_volumes.js b/addons/mail/static/src/models/res_users_settings_volumes.js
index d0aec6c9ecd..92a474df6db 100644
--- a/addons/mail/static/src/models/res_users_settings_volumes.js
+++ b/addons/mail/static/src/models/res_users_settings_volumes.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
 /**
  * Mirrors the fields of the python model res.users.settings.volumes.
  */
-registerModel({
+Model({
     name: 'res.users.settings.volumes',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/rtc.js b/addons/mail/static/src/models/rtc.js
index c92dbb2a49a..70542c97f39 100644
--- a/addons/mail/static/src/models/rtc.js
+++ b/addons/mail/static/src/models/rtc.js
@@ -2,7 +2,7 @@
 
 import { browser } from "@web/core/browser/browser";
 
-import { attr, clear, insert, many, one, registerModel, unlink } from '@mail/model';
+import { attr, clear, insert, many, one, Model, unlink } from '@mail/model';
 import { monitorAudio } from '@mail/utils/media_monitoring';
 import { sprintf } from '@web/core/utils/strings';
 
@@ -14,7 +14,7 @@ const getRTCPeerNotificationNextTemporaryId = (function () {
     };
 })();
 
-registerModel({
+Model({
     name: 'Rtc',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/models/rtc_data_channel.js b/addons/mail/static/src/models/rtc_data_channel.js
index 579aa6e99a1..0877115c251 100644
--- a/addons/mail/static/src/models/rtc_data_channel.js
+++ b/addons/mail/static/src/models/rtc_data_channel.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'RtcDataChannel',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/rtc_peer_connection.js b/addons/mail/static/src/models/rtc_peer_connection.js
index 4d2ca77080b..d4a0212d40b 100644
--- a/addons/mail/static/src/models/rtc_peer_connection.js
+++ b/addons/mail/static/src/models/rtc_peer_connection.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'RtcPeerConnection',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/rtc_peer_notification.js b/addons/mail/static/src/models/rtc_peer_notification.js
index 08c62a43154..25e8e454fee 100644
--- a/addons/mail/static/src/models/rtc_peer_notification.js
+++ b/addons/mail/static/src/models/rtc_peer_notification.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'RtcPeerNotification',
     fields: {
         channelId: attr({ readonly: true, required: true }),
diff --git a/addons/mail/static/src/models/rtc_session.js b/addons/mail/static/src/models/rtc_session.js
index 52626b2bc6a..c627ed4a293 100644
--- a/addons/mail/static/src/models/rtc_session.js
+++ b/addons/mail/static/src/models/rtc_session.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'RtcSession',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/sound_effect.js b/addons/mail/static/src/models/sound_effect.js
index 76d4e0c0e38..a38e6f4eb7b 100644
--- a/addons/mail/static/src/models/sound_effect.js
+++ b/addons/mail/static/src/models/sound_effect.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'SoundEffect',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/sound_effects.js b/addons/mail/static/src/models/sound_effects.js
index f1dec14d7b2..fde83b0cf4b 100644
--- a/addons/mail/static/src/models/sound_effects.js
+++ b/addons/mail/static/src/models/sound_effects.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'SoundEffects',
     fields: {
         channelJoin: one('SoundEffect', { default: { defaultVolume: 0.3, path: '/mail/static/src/audio/channel_01_in' }, isCausal: true }),
diff --git a/addons/mail/static/src/models/suggested_recipient_info.js b/addons/mail/static/src/models/suggested_recipient_info.js
index 8b94703e78f..71d8406acc5 100644
--- a/addons/mail/static/src/models/suggested_recipient_info.js
+++ b/addons/mail/static/src/models/suggested_recipient_info.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'SuggestedRecipientInfo',
     fields: {
         composerSuggestedRecipientViews: many('ComposerSuggestedRecipientView', { inverse: 'suggestedRecipientInfo' }),
diff --git a/addons/mail/static/src/models/thread.js b/addons/mail/static/src/models/thread.js
index 34df82611d9..ebec9dac956 100644
--- a/addons/mail/static/src/models/thread.js
+++ b/addons/mail/static/src/models/thread.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, insertAndUnlink, link, many, one, registerModel, unlink } from '@mail/model';
+import { attr, clear, insert, insertAndUnlink, link, many, one, Model, unlink } from '@mail/model';
 import { cleanSearchTerm } from '@mail/utils/utils';
 import * as mailUtils from '@mail/js/utils';
 
@@ -17,7 +17,7 @@ const getSuggestedRecipientInfoNextTemporaryId = (function () {
     };
 })();
 
-registerModel({
+Model({
     name: 'Thread',
     lifecycleHooks: {
         _willDelete() {
diff --git a/addons/mail/static/src/models/thread_cache.js b/addons/mail/static/src/models/thread_cache.js
index 415e4a7f535..2ac598e7ce5 100644
--- a/addons/mail/static/src/models/thread_cache.js
+++ b/addons/mail/static/src/models/thread_cache.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, link, many, one, registerModel } from '@mail/model';
+import { attr, clear, link, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadCache',
     recordMethods: {
         async loadMoreMessages() {
diff --git a/addons/mail/static/src/models/thread_icon_view.js b/addons/mail/static/src/models/thread_icon_view.js
index 1406b20dadb..58214f4470d 100644
--- a/addons/mail/static/src/models/thread_icon_view.js
+++ b/addons/mail/static/src/models/thread_icon_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadIconView',
     template: 'mail.ThreadIconView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/thread_needaction_preview_view.js b/addons/mail/static/src/models/thread_needaction_preview_view.js
index 35e36ef57c7..fe3963be85a 100644
--- a/addons/mail/static/src/models/thread_needaction_preview_view.js
+++ b/addons/mail/static/src/models/thread_needaction_preview_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 import { htmlToTextContentInline } from '@mail/js/utils';
 
-registerModel({
+Model({
     name: 'ThreadNeedactionPreviewView',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/thread_partner_seen_info.js b/addons/mail/static/src/models/thread_partner_seen_info.js
index c549cb09868..0262f9825ba 100644
--- a/addons/mail/static/src/models/thread_partner_seen_info.js
+++ b/addons/mail/static/src/models/thread_partner_seen_info.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadPartnerSeenInfo',
     fields: {
         lastFetchedMessage: one('Message'),
diff --git a/addons/mail/static/src/models/thread_textual_typing_status_view.js b/addons/mail/static/src/models/thread_textual_typing_status_view.js
index ec6f053b5fe..1b712e2ca3a 100644
--- a/addons/mail/static/src/models/thread_textual_typing_status_view.js
+++ b/addons/mail/static/src/models/thread_textual_typing_status_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerModel } from '@mail/model';
+import { clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadTextualTypingStatusView',
     template: 'mail.ThreadTextualTypingStatusView',
     fields: {
diff --git a/addons/mail/static/src/models/thread_typing_icon_view.js b/addons/mail/static/src/models/thread_typing_icon_view.js
index 90ba34425dd..7eb85505892 100644
--- a/addons/mail/static/src/models/thread_typing_icon_view.js
+++ b/addons/mail/static/src/models/thread_typing_icon_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadTypingIconView',
     template: 'mail.ThreadTypingIconView',
     identifyingMode: 'xor',
diff --git a/addons/mail/static/src/models/thread_view.js b/addons/mail/static/src/models/thread_view.js
index b6ddacd2c66..b5947849253 100644
--- a/addons/mail/static/src/models/thread_view.js
+++ b/addons/mail/static/src/models/thread_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, many, one, registerModel } from '@mail/model';
+import { attr, clear, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadView',
     template: 'mail.ThreadView',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/thread_view_topbar.js b/addons/mail/static/src/models/thread_view_topbar.js
index 6e85a043487..6bd1106c818 100644
--- a/addons/mail/static/src/models/thread_view_topbar.js
+++ b/addons/mail/static/src/models/thread_view_topbar.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadViewTopbar',
     template: 'mail.ThreadViewTopbar',
     componentSetup() {
diff --git a/addons/mail/static/src/models/thread_viewer.js b/addons/mail/static/src/models/thread_viewer.js
index 80280fdab1b..a8fd92e9977 100644
--- a/addons/mail/static/src/models/thread_viewer.js
+++ b/addons/mail/static/src/models/thread_viewer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'ThreadViewer',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/throttle.js b/addons/mail/static/src/models/throttle.js
index 8c38210b4a3..db055bfb7c6 100644
--- a/addons/mail/static/src/models/throttle.js
+++ b/addons/mail/static/src/models/throttle.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 /**
  * This model defines a "Throttle", which is an abstraction to throttle calls on a
@@ -9,7 +9,7 @@ import { attr, clear, one, registerModel } from '@mail/model';
  * calls most of the time, and a few priviledged exception to immediately make the call
  * are re-trigger a cooldown like a fresh throttle call.
  */
-registerModel({
+Model({
     name: 'Throttle',
     identifyingMode: 'xor',
     recordMethods: {
diff --git a/addons/mail/static/src/models/timer.js b/addons/mail/static/src/models/timer.js
index ec5aabce2d5..20c23875a42 100644
--- a/addons/mail/static/src/models/timer.js
+++ b/addons/mail/static/src/models/timer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Timer',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/tracking_value.js b/addons/mail/static/src/models/tracking_value.js
index cb94d357a49..d90869fad5e 100644
--- a/addons/mail/static/src/models/tracking_value.js
+++ b/addons/mail/static/src/models/tracking_value.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 import { sprintf } from '@web/core/utils/strings';
 
-registerModel({
+Model({
     name: 'TrackingValue',
     fields: {
         /**
diff --git a/addons/mail/static/src/models/tracking_value_item.js b/addons/mail/static/src/models/tracking_value_item.js
index 2c995f9cf68..da564dc0cfb 100644
--- a/addons/mail/static/src/models/tracking_value_item.js
+++ b/addons/mail/static/src/models/tracking_value_item.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
 import { format } from 'web.field_utils';
 import { session } from '@web/session';
@@ -9,7 +9,7 @@ import { deserializeDateTime } from '@web/core/l10n/dates';
 
 const formatters = registry.category("formatters");
 
-registerModel({
+Model({
     name: 'TrackingValueItem',
     identifyingMode: 'xor',
     fields: {
diff --git a/addons/mail/static/src/models/use_drag_visible_drop_zone.js b/addons/mail/static/src/models/use_drag_visible_drop_zone.js
index 27d405ab99a..d2fda640f8e 100644
--- a/addons/mail/static/src/models/use_drag_visible_drop_zone.js
+++ b/addons/mail/static/src/models/use_drag_visible_drop_zone.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, decrement, increment, one, registerModel } from '@mail/model';
+import { attr, decrement, increment, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'UseDragVisibleDropZone',
     identifyingMode: 'xor',
     lifecycleHooks: {
diff --git a/addons/mail/static/src/models/user.js b/addons/mail/static/src/models/user.js
index 072223270a0..8414efbde07 100644
--- a/addons/mail/static/src/models/user.js
+++ b/addons/mail/static/src/models/user.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'User',
     modelMethods: {
         /**
diff --git a/addons/mail/static/src/models/user_notification_manager.js b/addons/mail/static/src/models/user_notification_manager.js
index a56e5fc2dad..4f523bde97a 100644
--- a/addons/mail/static/src/models/user_notification_manager.js
+++ b/addons/mail/static/src/models/user_notification_manager.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
 import { url } from '@web/core/utils/urls';
 
-registerModel({
+Model({
     name: 'UserNotificationManager',
     recordMethods: {
         /**
diff --git a/addons/mail/static/src/models/user_setting.js b/addons/mail/static/src/models/user_setting.js
index 464ef4ebb3b..3c60d5d2770 100644
--- a/addons/mail/static/src/models/user_setting.js
+++ b/addons/mail/static/src/models/user_setting.js
@@ -2,7 +2,7 @@
 
 import { browser } from "@web/core/browser/browser";
 
-import { attr, clear, registerModel } from '@mail/model';
+import { attr, clear, Model } from '@mail/model';
 
 /**
  * Models various user settings. It is used as a complement to
@@ -10,7 +10,7 @@ import { attr, clear, registerModel } from '@mail/model';
  * client-side. This is particularly useful for allowing guests to have their
  * own settings.
  */
-registerModel({
+Model({
     name: 'UserSetting',
     lifecycleHooks: {
         _created() {
diff --git a/addons/mail/static/src/models/web_client_view_attachment_view.js b/addons/mail/static/src/models/web_client_view_attachment_view.js
index 9b9ee22580b..2c844867652 100644
--- a/addons/mail/static/src/models/web_client_view_attachment_view.js
+++ b/addons/mail/static/src/models/web_client_view_attachment_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
 import { hidePDFJSButtons } from '@web/legacy/js/libs/pdfjs';
 
-registerModel({
+Model({
     name: 'WebClientViewAttachmentView',
     template: 'mail.WebClientViewAttachmentView',
     componentSetup() {
diff --git a/addons/mail/static/src/models/welcome_view.js b/addons/mail/static/src/models/welcome_view.js
index 4e5c6153e85..68c4a5de429 100644
--- a/addons/mail/static/src/models/welcome_view.js
+++ b/addons/mail/static/src/models/welcome_view.js
@@ -1,14 +1,14 @@
 /** @odoo-module **/
 
 import { useUpdateToModel } from '@mail/component_hooks/use_update_to_model';
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
 const getNextGuestNameInputId = (function () {
     let id = 0;
     return () => ++id;
 })();
 
-registerModel({
+Model({
     name: 'WelcomeView',
     template: 'mail.WelcomeView',
     componentSetup() {
diff --git a/addons/mail/static/tests/models/autocomplete_input_view.js b/addons/mail/static/tests/models/autocomplete_input_view.js
index 64913246ab0..fe38faf2af0 100644
--- a/addons/mail/static/tests/models/autocomplete_input_view.js
+++ b/addons/mail/static/tests/models/autocomplete_input_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'AutocompleteInputView',
     recordMethods: {
         onSource(req, res) {
diff --git a/addons/mail/static/tests/models/clock_watcher_qunit_tests.js b/addons/mail/static/tests/models/clock_watcher_qunit_tests.js
index 9e9e1a01fb2..5ddd70c94d5 100644
--- a/addons/mail/static/tests/models/clock_watcher_qunit_tests.js
+++ b/addons/mail/static/tests/models/clock_watcher_qunit_tests.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ClockWatcher',
     fields: {
         qunitTestOwner: one('QUnitTest', {
diff --git a/addons/mail/static/tests/models/emoji_registry_qunit_tests.js b/addons/mail/static/tests/models/emoji_registry_qunit_tests.js
index 7f046e0d1c4..cc2830601b8 100644
--- a/addons/mail/static/tests/models/emoji_registry_qunit_tests.js
+++ b/addons/mail/static/tests/models/emoji_registry_qunit_tests.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'EmojiRegistry',
     recordMethods: {
         async loadEmojiData() {
diff --git a/addons/mail/static/tests/models/qunit_test.js b/addons/mail/static/tests/models/qunit_test.js
index 3861596ac46..db6120e1bf8 100644
--- a/addons/mail/static/tests/models/qunit_test.js
+++ b/addons/mail/static/tests/models/qunit_test.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'QUnitTest',
     fields: {
         clockWatcher: one('ClockWatcher', {
diff --git a/addons/mail/static/tests/models/test_models.js b/addons/mail/static/tests/models/test_models.js
index 4300f105977..30c1f15bf82 100644
--- a/addons/mail/static/tests/models/test_models.js
+++ b/addons/mail/static/tests/models/test_models.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, many, one, registerModel } from '@mail/model';
+import { attr, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'TestAddress',
     fields: {
         id: attr({
@@ -15,7 +15,7 @@ registerModel({
     },
 });
 
-registerModel({
+Model({
     name: 'TestContact',
     fields: {
         id: attr({
@@ -39,7 +39,7 @@ registerModel({
     },
 });
 
-registerModel({
+Model({
     name: 'TestHobby',
     fields: {
         description: attr({
@@ -48,7 +48,7 @@ registerModel({
     },
 });
 
-registerModel({
+Model({
     name: 'TestTask',
     fields: {
         id: attr({
diff --git a/addons/mail/static/tests/models/throttle_qunit_tests.js b/addons/mail/static/tests/models/throttle_qunit_tests.js
index 8052b534b5b..9e6f64908e8 100644
--- a/addons/mail/static/tests/models/throttle_qunit_tests.js
+++ b/addons/mail/static/tests/models/throttle_qunit_tests.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Throttle',
     fields: {
         duration: {
diff --git a/addons/mail/static/tests/models/timer_qunit_tests.js b/addons/mail/static/tests/models/timer_qunit_tests.js
index dcd100225d8..bd1519cc174 100644
--- a/addons/mail/static/tests/models/timer_qunit_tests.js
+++ b/addons/mail/static/tests/models/timer_qunit_tests.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Timer',
     fields: {
         duration: {
diff --git a/addons/note/static/src/models/activity_group.js b/addons/note/static/src/models/activity_group.js
index fc7681d8903..4c4e5167e0c 100644
--- a/addons/note/static/src/models/activity_group.js
+++ b/addons/note/static/src/models/activity_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ActivityGroup',
     fields: {
         isNote: attr({
diff --git a/addons/note/static/src/models/activity_menu_view.js b/addons/note/static/src/models/activity_menu_view.js
index 2873ed58eda..ef000ee5963 100644
--- a/addons/note/static/src/models/activity_menu_view.js
+++ b/addons/note/static/src/models/activity_menu_view.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { attr, clear, registerPatch } from '@mail/model';
+import { attr, clear, Patch } from '@mail/model';
 
 const { DateTime } = luxon;
 
-registerPatch({
+Patch({
     name: 'ActivityMenuView',
     recordMethods: {
         /**
diff --git a/addons/rating/static/src/models/channel_preview_view.js b/addons/rating/static/src/models/channel_preview_view.js
index 345ebe1e6ca..f00c5f24cbd 100644
--- a/addons/rating/static/src/models/channel_preview_view.js
+++ b/addons/rating/static/src/models/channel_preview_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ChannelPreviewView',
     fields: {
         isEmpty: {
diff --git a/addons/rating/static/src/models/message.js b/addons/rating/static/src/models/message.js
index 42b399160e5..702e84549db 100644
--- a/addons/rating/static/src/models/message.js
+++ b/addons/rating/static/src/models/message.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Message',
     modelMethods: {
         /**
diff --git a/addons/rating/static/src/models/rating.js b/addons/rating/static/src/models/rating.js
index 1ec155490c2..a22474bdc63 100644
--- a/addons/rating/static/src/models/rating.js
+++ b/addons/rating/static/src/models/rating.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerModel } from '@mail/model';
+import { attr, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Rating',
     fields: {
         id: attr({
diff --git a/addons/rating/static/src/models/thread_needaction_preview_view.js b/addons/rating/static/src/models/thread_needaction_preview_view.js
index 73781cf5538..b1360b8cdf3 100644
--- a/addons/rating/static/src/models/thread_needaction_preview_view.js
+++ b/addons/rating/static/src/models/thread_needaction_preview_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ThreadNeedactionPreviewView',
     fields: {
         isEmpty: {
diff --git a/addons/sms/static/src/models/message.js b/addons/sms/static/src/models/message.js
index bf79f069556..ef15595fc41 100644
--- a/addons/sms/static/src/models/message.js
+++ b/addons/sms/static/src/models/message.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Message',
     recordMethods: {
         /**
diff --git a/addons/sms/static/src/models/message_view.js b/addons/sms/static/src/models/message_view.js
index 9105e8a0a19..bfca4905c34 100644
--- a/addons/sms/static/src/models/message_view.js
+++ b/addons/sms/static/src/models/message_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessageView',
     fields: {
         failureNotificationIconClassName: {
diff --git a/addons/sms/static/src/models/notification_group.js b/addons/sms/static/src/models/notification_group.js
index ab5380e21b6..de018701b0d 100644
--- a/addons/sms/static/src/models/notification_group.js
+++ b/addons/sms/static/src/models/notification_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'NotificationGroup',
     recordMethods: {
         /**
diff --git a/addons/sms/static/src/models/notification_group_view.js b/addons/sms/static/src/models/notification_group_view.js
index 4eddb716fe9..32f73e74bb1 100644
--- a/addons/sms/static/src/models/notification_group_view.js
+++ b/addons/sms/static/src/models/notification_group_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'NotificationGroupView',
     fields: {
         imageSrc: {
diff --git a/addons/snailmail/static/src/models/dialog.js b/addons/snailmail/static/src/models/dialog.js
index 2d06773b7f3..3d01ca111fd 100644
--- a/addons/snailmail/static/src/models/dialog.js
+++ b/addons/snailmail/static/src/models/dialog.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Dialog',
     fields: {
         componentClassName: {
diff --git a/addons/snailmail/static/src/models/message.js b/addons/snailmail/static/src/models/message.js
index 7d8451a5510..ab0ce6dbd4e 100644
--- a/addons/snailmail/static/src/models/message.js
+++ b/addons/snailmail/static/src/models/message.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Message',
     recordMethods: {
         /**
diff --git a/addons/snailmail/static/src/models/message_view.js b/addons/snailmail/static/src/models/message_view.js
index 2890c072c1f..9b3e824d71d 100644
--- a/addons/snailmail/static/src/models/message_view.js
+++ b/addons/snailmail/static/src/models/message_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessageView',
     recordMethods: {
         /**
diff --git a/addons/snailmail/static/src/models/messaging.js b/addons/snailmail/static/src/models/messaging.js
index 848e25659db..0127a7f2543 100644
--- a/addons/snailmail/static/src/models/messaging.js
+++ b/addons/snailmail/static/src/models/messaging.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     recordMethods: {
         async fetchSnailmailCreditsUrl() {
diff --git a/addons/snailmail/static/src/models/notification_group.js b/addons/snailmail/static/src/models/notification_group.js
index 0d9899a6912..dc6b69f557c 100644
--- a/addons/snailmail/static/src/models/notification_group.js
+++ b/addons/snailmail/static/src/models/notification_group.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'NotificationGroup',
     recordMethods: {
         /**
diff --git a/addons/snailmail/static/src/models/notification_group_view.js b/addons/snailmail/static/src/models/notification_group_view.js
index e8d28463ad9..74600b5a983 100644
--- a/addons/snailmail/static/src/models/notification_group_view.js
+++ b/addons/snailmail/static/src/models/notification_group_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'NotificationGroupView',
     fields: {
         imageSrc: {
diff --git a/addons/snailmail/static/src/models/popover_view.js b/addons/snailmail/static/src/models/popover_view.js
index a48caeadbb7..b353212652a 100644
--- a/addons/snailmail/static/src/models/popover_view.js
+++ b/addons/snailmail/static/src/models/popover_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'PopoverView',
     fields: {
         anchorRef: {
diff --git a/addons/snailmail/static/src/models/snailmail_error_view.js b/addons/snailmail/static/src/models/snailmail_error_view.js
index 78ac1ee20b1..a8e207baa84 100644
--- a/addons/snailmail/static/src/models/snailmail_error_view.js
+++ b/addons/snailmail/static/src/models/snailmail_error_view.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
 import { useComponentToModel } from '@mail/component_hooks/use_component_to_model';
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'SnailmailErrorView',
     template: 'snailmail.SnailmailErrorView',
     componentSetup() {
diff --git a/addons/snailmail/static/src/models/snailmail_notification_popover_content_view.js b/addons/snailmail/static/src/models/snailmail_notification_popover_content_view.js
index 09be9ee930f..63a5434e135 100644
--- a/addons/snailmail/static/src/models/snailmail_notification_popover_content_view.js
+++ b/addons/snailmail/static/src/models/snailmail_notification_popover_content_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerModel } from '@mail/model';
+import { attr, clear, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'SnailmailNotificationPopoverContentView',
     template: 'snailmail.SnailmailNotificationPopoverContentView',
     fields: {
diff --git a/addons/website/static/src/models/chat_window_manager.js b/addons/website/static/src/models/chat_window_manager.js
index 5498b27ec3d..52931254875 100644
--- a/addons/website/static/src/models/chat_window_manager.js
+++ b/addons/website/static/src/models/chat_window_manager.js
@@ -1,9 +1,9 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 import { BASE_VISUAL } from '@mail/models/chat_window_manager';
 
-registerPatch({
+Patch({
     name: 'ChatWindowManager',
     fields: {
         visual: {
diff --git a/addons/website/static/src/models/messaging.js b/addons/website/static/src/models/messaging.js
index 04d33bb40fe..c1cf8921157 100644
--- a/addons/website/static/src/models/messaging.js
+++ b/addons/website/static/src/models/messaging.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Messaging',
     fields: {
         isWebsitePreviewOpen: attr({
diff --git a/addons/website_livechat/static/src/models/messaging_notification_handler.js b/addons/website_livechat/static/src/models/messaging_notification_handler.js
index 7e033d44971..d1dc6122e43 100644
--- a/addons/website_livechat/static/src/models/messaging_notification_handler.js
+++ b/addons/website_livechat/static/src/models/messaging_notification_handler.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'MessagingNotificationHandler',
     recordMethods: {
         /**
diff --git a/addons/website_livechat/static/src/models/thread.js b/addons/website_livechat/static/src/models/thread.js
index 804bf7748fd..3c0cc479860 100644
--- a/addons/website_livechat/static/src/models/thread.js
+++ b/addons/website_livechat/static/src/models/thread.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, insert, one, registerPatch } from '@mail/model';
+import { clear, insert, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Thread',
     modelMethods: {
         /**
diff --git a/addons/website_livechat/static/src/models/thread_view.js b/addons/website_livechat/static/src/models/thread_view.js
index a029c1c9d2e..f50929d9f3f 100644
--- a/addons/website_livechat/static/src/models/thread_view.js
+++ b/addons/website_livechat/static/src/models/thread_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { clear, one, registerPatch } from '@mail/model';
+import { clear, one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ThreadView',
     fields: {
         visitorBanner: one('VisitorBannerView', {
diff --git a/addons/website_livechat/static/src/models/visitor.js b/addons/website_livechat/static/src/models/visitor.js
index 6be24a8906d..cde0ea14b94 100644
--- a/addons/website_livechat/static/src/models/visitor.js
+++ b/addons/website_livechat/static/src/models/visitor.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, clear, insert, many, one, registerModel } from '@mail/model';
+import { attr, clear, insert, many, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'Visitor',
     modelMethods: {
         convertData(data) {
diff --git a/addons/website_livechat/static/src/models/visitor_banner_view.js b/addons/website_livechat/static/src/models/visitor_banner_view.js
index b2b5137e24f..55d93de7a8d 100644
--- a/addons/website_livechat/static/src/models/visitor_banner_view.js
+++ b/addons/website_livechat/static/src/models/visitor_banner_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerModel } from '@mail/model';
+import { one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'VisitorBannerView',
     template: 'website_livechat.VisitorBannerView',
     fields: {
diff --git a/addons/website_livechat/static/src/public_models/chatbot.js b/addons/website_livechat/static/src/public_models/chatbot.js
index bf9a6bad79f..c1a8b010463 100644
--- a/addons/website_livechat/static/src/public_models/chatbot.js
+++ b/addons/website_livechat/static/src/public_models/chatbot.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { attr, registerPatch } from '@mail/model';
+import { attr, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Chatbot',
     fields: {
         awaitUserInputDebounceTime: {
diff --git a/addons/website_livechat/static/src/public_models/livechat_button_view.js b/addons/website_livechat/static/src/public_models/livechat_button_view.js
index 7367736c701..7950f35cde8 100644
--- a/addons/website_livechat/static/src/public_models/livechat_button_view.js
+++ b/addons/website_livechat/static/src/public_models/livechat_button_view.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { attr, clear, one, registerPatch } from '@mail/model';
+import { attr, clear, one, Patch } from '@mail/model';
 
 import {unaccent} from 'web.utils';
 import {setCookie} from 'web.utils.cookies';
 
-registerPatch({
+Patch({
     name: 'LivechatButtonView',
     recordMethods: {
         /**
diff --git a/addons/website_livechat/static/src/public_models/public_livechat_floating_text_view.js b/addons/website_livechat/static/src/public_models/public_livechat_floating_text_view.js
index e8b745584a9..d8b377ea528 100644
--- a/addons/website_livechat/static/src/public_models/public_livechat_floating_text_view.js
+++ b/addons/website_livechat/static/src/public_models/public_livechat_floating_text_view.js
@@ -2,9 +2,9 @@
 
 import { PublicLivechatFloatingTextView } from '@website_livechat/legacy/widgets/public_livechat_floating_text_view/public_livechat_floating_text_view';
 
-import { attr, one, registerModel } from '@mail/model';
+import { attr, one, Model } from '@mail/model';
 
-registerModel({
+Model({
     name: 'PublicLivechatFloatingTextView',
     lifecycleHooks: {
         _created() {
diff --git a/addons/website_livechat/static/src/public_models/public_livechat_global.js b/addons/website_livechat/static/src/public_models/public_livechat_global.js
index c0fdfd57c21..21c9b0e4d28 100644
--- a/addons/website_livechat/static/src/public_models/public_livechat_global.js
+++ b/addons/website_livechat/static/src/public_models/public_livechat_global.js
@@ -1,10 +1,10 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
 import { deleteCookie, setCookie } from 'web.utils.cookies';
 
-registerPatch({
+Patch({
     name: 'PublicLivechatGlobal',
     recordMethods: {
         /**
diff --git a/addons/website_livechat/static/src/public_models/timer.js b/addons/website_livechat/static/src/public_models/timer.js
index 7ee1aedb1e7..462f0c40992 100644
--- a/addons/website_livechat/static/src/public_models/timer.js
+++ b/addons/website_livechat/static/src/public_models/timer.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { one, registerPatch } from '@mail/model';
+import { one, Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'Timer',
     recordMethods: {
         /**
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_common.js b/addons/website_livechat/static/tests/tours/website_livechat_common.js
index 416af5e6f9f..424ffa48a44 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_common.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_common.js
@@ -8,9 +8,9 @@ odoo.define('website_livechat.tour_common', function (require) {
 // not part of the current assets bundles (as trying to import it will silently
 // crash).
 require('@im_livechat/public_models/livechat_button_view');
-const { registerPatch } = require('@mail/model');
+const { Patch } = require('@mail/model');
 
-registerPatch({
+Patch({
     name: 'LivechatButtonView',
     recordMethods: {
         /**
diff --git a/addons/website_slides/static/src/models/activity_view.js b/addons/website_slides/static/src/models/activity_view.js
index 75723e7560e..243a086a293 100644
--- a/addons/website_slides/static/src/models/activity_view.js
+++ b/addons/website_slides/static/src/models/activity_view.js
@@ -1,8 +1,8 @@
 /** @odoo-module **/
 
-import { registerPatch } from '@mail/model';
+import { Patch } from '@mail/model';
 
-registerPatch({
+Patch({
     name: 'ActivityView',
     recordMethods: {
         /**