diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 24451c90e89..0ae52465604 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -509,15 +509,12 @@ class HomeStaticTemplateHelpers(object):
                 # After several performance tests, we found out that deepcopy is the most efficient
                 # solution in this case (compared with copy, xpath with '.' and stringifying).
                 parent_tree = copy.deepcopy(self.template_dict[parent_addon][parent_name])
-                parent_tag = parent_tree.tag
-                # replace temporarily the parent tag so it is never the target of the inheritance
-                parent_tree.tag = 't'
+
                 xpaths = list(template_tree)
                 if self.debug and inherit_mode == self.EXTENSION_MODE:
                     for xpath in xpaths:
                         xpath.insert(0, etree.Comment(" Modified by %s from %s " % (template_name, addon)))
                 inherited_template = apply_inheritance_specs(parent_tree, xpaths)
-                inherited_template.tag = parent_tag
 
                 if inherit_mode == self.PRIMARY_MODE:  # New template_tree: A' = B(A)
                     inherited_template.set(self.NAME_TEMPLATE_DIRECTIVE, template_name)
diff --git a/addons/web/tests/test_serving_base.py b/addons/web/tests/test_serving_base.py
index 31be8bfa89e..87c01d748dc 100644
--- a/addons/web/tests/test_serving_base.py
+++ b/addons/web/tests/test_serving_base.py
@@ -397,7 +397,7 @@ class TestStaticInheritance(BaseCase):
                             <div t-name="template_%(t_number)s_mod_%(m_number)s"
                                 t-inherit="template_%(t_inherit)s_mod_%(m_number)s"
                                 t-inherit-mode="primary">
-                                <xpath expr="//div[1]" position="before">
+                                <xpath expr="/div/div[1]" position="before">
                                     <div>Sick XPath</div>
                                 </xpath>
                             </div>
@@ -408,7 +408,7 @@ class TestStaticInheritance(BaseCase):
                             <div t-name="template_%(t_number)s_mod_%(m_number)s"
                                 t-inherit="mod_%(m_module_inherit)s.template_%(t_module_inherit)s_mod_%(m_module_inherit)s"
                                 t-inherit-mode="primary">
-                                <xpath expr="//div[1]" position="inside">
+                                <xpath expr="/div/div[1]" position="inside">
                                     <div>Mental XPath</div>
                                 </xpath>
                             </div>
@@ -476,9 +476,9 @@ class TestStaticInheritance(BaseCase):
         contents = HomeStaticTemplateHelpers.get_qweb_templates(addons=self._get_module_names(), debug=True)
         expected = b"""
             <templates>
-                <form overriden-attr="overriden">
+                <div overriden-attr="overriden" t-name="template_1_1">
                     <!-- Modified by template_1_2 from module_1 -->And I grew strong
-                </form>
+                </div>
             </templates>
         """
 
@@ -510,11 +510,12 @@ class TestStaticInheritance(BaseCase):
         contents = HomeStaticTemplateHelpers.get_qweb_templates(addons=self._get_module_names(), debug=True)
         expected = b"""
             <templates>
-                <form>
-                    <!-- Modified by template_1_2 from module_1 -->And I grew strong
+                <div t-name="template_1_1">
+                    <!-- Modified by template_1_2 from module_1 -->
+                    And I grew strong
                     <p>And I learned how to get along</p>
                     And so you're back
-                </form>
+                </div>
             </templates>
         """
 
@@ -550,11 +551,11 @@ class TestStaticInheritance(BaseCase):
         contents = HomeStaticTemplateHelpers.get_qweb_templates(addons=self._get_module_names(), debug=True)
         expected = b"""
             <templates>
-                <form>
+                <div t-name="template_1_1">
                     <!-- Modified by template_1_2 from module_1 -->
                     And I grew strong
                     <p>And I learned how to get along</p>
-                </form>
+                </div>
                 And so you're back
             </templates>
         """
@@ -563,7 +564,7 @@ class TestStaticInheritance(BaseCase):
 
     def test_replace_root_node_tag(self):
         """
-        Root node is not targeted by //NODE_TAG in xpath
+        Root node IS targeted by //NODE_TAG in xpath
         """
         self.modules = [
             ('module_1_file_1', None, 'module_1'),
@@ -589,11 +590,10 @@ class TestStaticInheritance(BaseCase):
         contents = HomeStaticTemplateHelpers.get_qweb_templates(addons=self._get_module_names(), debug=True)
         expected = b"""
             <templates>
-                <form t-name="template_1_1" random-attr="gloria">
-                    <div>At first I was afraid</div>
+                <div t-name="template_1_1">
                     <!-- Modified by template_1_2 from module_1 -->
-                    <div>Form replacer</div>
-                </form>
+                    Form replacer
+                </div>
             </templates>
         """
 
@@ -601,7 +601,7 @@ class TestStaticInheritance(BaseCase):
 
     def test_replace_root_node_tag_in_primary(self):
         """
-        Root node is not targeted by //NODE_TAG in xpath
+        Root node IS targeted by //NODE_TAG in xpath
         """
         self.maxDiff = None
         self.modules = [
@@ -630,10 +630,9 @@ class TestStaticInheritance(BaseCase):
                     <div>At first I was afraid</div>
                     <form>Inner Form</form>
                 </form>
-                <form t-name="template_1_2" random-attr="gloria" t-inherit="template_1_1">
-                    <div>At first I was afraid</div>
-                    <div>Form replacer</div>
-                </form>
+                <div t-name="template_1_2" t-inherit="template_1_1">
+                    Form replacer
+                </div>
             </templates>
         """
 
@@ -671,10 +670,10 @@ class TestStaticInheritance(BaseCase):
                 <form t-name="template_1_1" random-attr="gloria">
                     <div>At first I was afraid</div>
                  </form>
-                 <form overriden-attr="overriden" t-name="template_1_2" t-inherit="template_1_1">
+                 <div overriden-attr="overriden" t-name="template_1_2" t-inherit="template_1_1">
                     And I grew strong
                     <p>And I learned how to get along</p>
-                 </form>
+                 </div>
             </templates>
         """
 
@@ -708,11 +707,11 @@ class TestStaticInheritance(BaseCase):
         contents = HomeStaticTemplateHelpers.get_qweb_templates(addons=self._get_module_names(), debug=False)
         expected = b"""
             <templates>
-                <form>
+                <div t-name="template_1_1">
                     And I grew strong
                     <p>And I learned how to get along</p>
                     And so you're back
-                </form>
+                </div>
             </templates>
         """
 
diff --git a/odoo/tools/template_inheritance.py b/odoo/tools/template_inheritance.py
index e025cd32712..77f738f2e2a 100644
--- a/odoo/tools/template_inheritance.py
+++ b/odoo/tools/template_inheritance.py
@@ -138,6 +138,9 @@ def apply_inheritance_specs(source, specs_tree, inherit_branding=False, pre_loca
                         else:
                             comment = content
                     source = copy.deepcopy(spec_content)
+                    for attr in ('t-name', 't-inherit'):
+                        if node.get(attr):
+                            source.set(attr, node.get(attr))
                     if comment is not None:
                         text = source.text
                         source.text = None