diff --git a/addons/project/static/src/xml/project_templates.xml b/addons/project/static/src/xml/project_templates.xml
index 9341d551f1d..ea98a13b8e1 100644
--- a/addons/project/static/src/xml/project_templates.xml
+++ b/addons/project/static/src/xml/project_templates.xml
@@ -17,7 +17,7 @@
 
     <span t-name="project.statusWithColor" t-att-class="'o_status_bubble o_color_bubble_' + color"></span>
 
-    <div t-name="project.ControlPanel" t-inherit="web.ControlPanel" t-inherit-mode="extension" owl="1">
+    <div t-name="project.ControlPanel" t-inherit="web.Legacy.ControlPanel" t-inherit-mode="extension" owl="1">
         <xpath expr="//ol[hasclass('breadcrumb')]" position="inside">
             <t t-call="project.ControlPanelContent"/>
         </xpath>
diff --git a/addons/web/static/src/legacy/js/control_panel/control_panel.js b/addons/web/static/src/legacy/js/control_panel/control_panel.js
index 0599c319332..638dbce8f03 100644
--- a/addons/web/static/src/legacy/js/control_panel/control_panel.js
+++ b/addons/web/static/src/legacy/js/control_panel/control_panel.js
@@ -216,7 +216,7 @@ odoo.define('web.ControlPanel', function (require) {
         withBreadcrumbs: Boolean,
         withSearchBar: Boolean,
     };
-    ControlPanel.template = 'web.ControlPanel';
+    ControlPanel.template = 'web.Legacy.ControlPanel';
 
     return ControlPanel;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/control_panel_x2many.js b/addons/web/static/src/legacy/js/control_panel/control_panel_x2many.js
index 22b4ae565da..e6aa1821377 100644
--- a/addons/web/static/src/legacy/js/control_panel/control_panel_x2many.js
+++ b/addons/web/static/src/legacy/js/control_panel/control_panel_x2many.js
@@ -34,7 +34,7 @@ odoo.define('web.ControlPanelX2Many', function (require) {
         cp_content: { type: Object, optional: 1 },
         pager: Object,
     };
-    ControlPanelX2Many.template = 'web.ControlPanelX2Many';
+    ControlPanelX2Many.template = 'web.Legacy.ControlPanelX2Many';
 
     return ControlPanelX2Many;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/custom_favorite_item.js b/addons/web/static/src/legacy/js/control_panel/custom_favorite_item.js
index dbf6d84db1f..3aa218d7d20 100644
--- a/addons/web/static/src/legacy/js/control_panel/custom_favorite_item.js
+++ b/addons/web/static/src/legacy/js/control_panel/custom_favorite_item.js
@@ -143,7 +143,7 @@ odoo.define('web.CustomFavoriteItem', function (require) {
     }
 
     CustomFavoriteItem.props = {};
-    CustomFavoriteItem.template = 'web.CustomFavoriteItem';
+    CustomFavoriteItem.template = 'web.Legacy.CustomFavoriteItem';
     CustomFavoriteItem.groupNumber = 3; // have 'Save Current Search' in its own group
 
     FavoriteMenu.registry.add('favorite-generator-menu', CustomFavoriteItem, 0);
diff --git a/addons/web/static/src/legacy/js/control_panel/custom_filter_item.js b/addons/web/static/src/legacy/js/control_panel/custom_filter_item.js
index a996cfe97cf..e6e2b9429aa 100644
--- a/addons/web/static/src/legacy/js/control_panel/custom_filter_item.js
+++ b/addons/web/static/src/legacy/js/control_panel/custom_filter_item.js
@@ -271,7 +271,7 @@ odoo.define('web.CustomFilterItem', function (require) {
     CustomFilterItem.props = {
         fields: Object,
     };
-    CustomFilterItem.template = 'web.CustomFilterItem';
+    CustomFilterItem.template = 'web.Legacy.CustomFilterItem';
 
     return CustomFilterItem;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/custom_group_by_item.js b/addons/web/static/src/legacy/js/control_panel/custom_group_by_item.js
index cd43257f33f..933fb0ee20b 100644
--- a/addons/web/static/src/legacy/js/control_panel/custom_group_by_item.js
+++ b/addons/web/static/src/legacy/js/control_panel/custom_group_by_item.js
@@ -37,7 +37,7 @@ odoo.define('web.CustomGroupByItem', function (require) {
         }
     }
 
-    CustomGroupByItem.template = 'web.CustomGroupByItem';
+    CustomGroupByItem.template = 'web.Legacy.CustomGroupByItem';
     CustomGroupByItem.props = {
         fields: Array,
     };
diff --git a/addons/web/static/src/legacy/js/control_panel/favorite_menu.js b/addons/web/static/src/legacy/js/control_panel/favorite_menu.js
index 3f288b451c4..7328a920836 100644
--- a/addons/web/static/src/legacy/js/control_panel/favorite_menu.js
+++ b/addons/web/static/src/legacy/js/control_panel/favorite_menu.js
@@ -101,7 +101,7 @@ odoo.define('web.FavoriteMenu', function (require) {
     FavoriteMenu.components = Object.assign({}, DropdownMenu.components, {
         Dialog,
     });
-    FavoriteMenu.template = 'web.FavoriteMenu';
+    FavoriteMenu.template = 'web.Legacy.FavoriteMenu';
 
     return FavoriteMenu;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/filter_menu.js b/addons/web/static/src/legacy/js/control_panel/filter_menu.js
index 7e0f3ee24c7..c40472bb69a 100644
--- a/addons/web/static/src/legacy/js/control_panel/filter_menu.js
+++ b/addons/web/static/src/legacy/js/control_panel/filter_menu.js
@@ -73,7 +73,7 @@ odoo.define('web.FilterMenu', function (require) {
     FilterMenu.props = Object.assign({}, DropdownMenu.props, {
         fields: Object,
     });
-    FilterMenu.template = 'web.FilterMenu';
+    FilterMenu.template = 'web.Legacy.FilterMenu';
 
     return FilterMenu;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/groupby_menu.js b/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
index c1769ac4c0a..73db1fe9201 100644
--- a/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
+++ b/addons/web/static/src/legacy/js/control_panel/groupby_menu.js
@@ -92,7 +92,7 @@ odoo.define('web.GroupByMenu', function (require) {
     GroupByMenu.props = Object.assign({}, DropdownMenu.props, {
         fields: Object,
     });
-    GroupByMenu.template = 'web.GroupByMenu';
+    GroupByMenu.template = 'web.Legacy.GroupByMenu';
 
     return GroupByMenu;
 });
diff --git a/addons/web/static/src/legacy/js/control_panel/search_bar.js b/addons/web/static/src/legacy/js/control_panel/search_bar.js
index f4bd2e04e0d..4d6625a1efd 100644
--- a/addons/web/static/src/legacy/js/control_panel/search_bar.js
+++ b/addons/web/static/src/legacy/js/control_panel/search_bar.js
@@ -488,7 +488,7 @@ odoo.define('web.SearchBar', function (require) {
     SearchBar.props = {
         fields: Object,
     };
-    SearchBar.template = 'web.SearchBar';
+    SearchBar.template = 'web.Legacy.SearchBar';
 
     return SearchBar;
 });
diff --git a/addons/web/static/src/legacy/xml/base.xml b/addons/web/static/src/legacy/xml/base.xml
index 329fdfa66e7..f00478ac324 100644
--- a/addons/web/static/src/legacy/xml/base.xml
+++ b/addons/web/static/src/legacy/xml/base.xml
@@ -3,7 +3,7 @@
 
 <!-- Owl Templates -->
 
-<t t-name="web.ControlPanel" owl="1">
+<t t-name="web.Legacy.ControlPanel" owl="1">
     <div class="o_control_panel" data-command-category="actions">
         <div class="o_cp_top">
             <div class="o_cp_top_left">
@@ -84,7 +84,7 @@
     </div>
 </t>
 
-<t t-name="web.ControlPanelX2Many" owl="1">
+<t t-name="web.Legacy.ControlPanelX2Many" owl="1">
     <div class="o_x2m_control_panel">
         <div class="o_cp_buttons" role="toolbar" aria-label="Control panel buttons" t-ref="buttons">
             <t t-slot="buttons"/>
@@ -182,7 +182,7 @@
     </div>
 </t>
 
-<t t-name="web.FavoriteMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
+<t t-name="web.Legacy.FavoriteMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
     <xpath expr="//DropdownMenuItem" position="attributes">
         <attribute name="t-on-remove-item.stop">_onItemRemoved</attribute>
     </xpath>
@@ -206,14 +206,14 @@
     </xpath>
 </t>
 
-<t t-name="web.FilterMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
+<t t-name="web.Legacy.FilterMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
     <xpath expr="//ul[@role='menu']" position="inside">
         <li t-if="items.length" class="dropdown-divider" role="separator"/>
         <CustomFilterItem fields="props.fields"/>
     </xpath>
 </t>
 
-<t t-name="web.GroupByMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
+<t t-name="web.Legacy.GroupByMenu" t-inherit="web.DropdownMenu" t-inherit-mode="primary" owl="1">
     <xpath expr="//ul[@role='menu']" position="inside">
         <t t-if="fields.length">
             <li t-if="items.length" class="dropdown-divider" role="separator"/>
@@ -280,7 +280,7 @@
     </li>
 </t>
 
-<t t-name="web.CustomFavoriteItem" owl="1">
+<t t-name="web.Legacy.CustomFavoriteItem" owl="1">
     <li class="o_menu_item o_add_favorite" role="menuitem">
         <span type="button"
             class="dropdown-item"
@@ -330,7 +330,7 @@
     </li>
 </t>
 
-<t t-name="web.CustomFilterItem" owl="1">
+<t t-name="web.Legacy.CustomFilterItem" owl="1">
     <div class="o_generator_menu">
         <button class="btn o_add_custom_filter dropdown-item"
             aria-expanded="false"
@@ -443,7 +443,7 @@
     </div>
 </t>
 
-<t t-name="web.CustomGroupByItem" owl="1">
+<t t-name="web.Legacy.CustomGroupByItem" owl="1">
     <div class="o_generator_menu">
         <span type="button"
             class="o_add_custom_group_by dropdown-item"
@@ -566,7 +566,7 @@
     </nav>
 </t>
 
-<t t-name="web.SearchBar" owl="1">
+<t t-name="web.Legacy.SearchBar" owl="1">
     <div class="o_searchview_input_container">
         <div t-foreach="model.get('facets')" t-as="facet" t-key="facet_index"
             tabindex="0"
diff --git a/addons/web/static/src/legacy/xml/pivot.xml b/addons/web/static/src/legacy/xml/pivot.xml
index 5eed6775304..650ebb3b587 100644
--- a/addons/web/static/src/legacy/xml/pivot.xml
+++ b/addons/web/static/src/legacy/xml/pivot.xml
@@ -133,7 +133,7 @@
         </div>
     </t>
 
-    <t t-name="web.PivotCustomGroupByItem" t-inherit="web.CustomGroupByItem" t-inherit-mode="primary" owl="1">
+    <t t-name="web.PivotCustomGroupByItem" t-inherit="web.Legacy.CustomGroupByItem" t-inherit-mode="primary" owl="1">
         <xpath expr="//div[hasclass('o_generator_menu')]" position="attributes">
             <attribute name="t-on-click">_onToggleCustomGroupbyItem</attribute>
         </xpath>