diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt
index 3c7b2e4c..55d189f1 100644
--- a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt
+++ b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt
@@ -4,4 +4,5 @@
 ..  code-block:: typoscript
     :caption: EXT:site_package/Configuration/Sets/SitePackage/page.tsconfig
 
-    @import './PageTSconfig/PageLayout/*.tsconfig'
+    @import './PageTsConfig/'
+    @import './PageTsConfig/BackendLayouts/'
diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt
index 9b5175b3..95ad56ab 100644
--- a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt
+++ b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings-definitions-yaml.rst.txt
@@ -5,43 +5,40 @@
     :caption: EXT:site_package/Configuration/Sets/SitePackage/settings.definitions.yaml
 
     categories:
-      mySitepackage:
-        label: 'My Sitepackage'
-      mySitepackage.templates:
+      SitePackage:
+        label: 'Site Package'
+      SitePackage.templates:
         label: 'Templates'
-        parent: mySitepackage
-      mySitepackage.layout:
+        parent: SitePackage
+      SitePackage.layout:
         label: 'Layout'
-        parent: mySitepackage
-      mySitepackage.seo:
-        label: 'SEO settings'
-        parent: mySitepackage
+        parent: SitePackage
 
     settings:
-      mySitepackage.template_path:
-        label: 'Template path'
-        category: mySitepackage.templates
-        description: 'Path to the templates of the site package.'
+      SitePackage.template_path:
+        label: 'Page template path'
+        category: SitePackage.templates
+        description: 'Path to the templates of the Site Package.'
         type: string
-        default: 'EXT:site_package/Resources/Private/Templates/'
+        default: 'EXT:site_package/Resources/Private/PageView/'
 
-      mySitepackage.logo:
+      SitePackage.logo:
         label: 'Logo'
-        category: mySitepackage.layout
-        description: 'Path to the logo of the site package.'
+        category: SitePackage.layout
+        description: 'Path to the logo of Site Package.'
         type: string
         default: 'EXT:site_package/Resources/Public/Images/logo.svg'
 
-      mySitepackage.logo-alt:
+      SitePackage.logo-alt:
         label: 'Logo Alt text'
-        category: mySitepackage.layout
+        category: SitePackage.layout
         description: 'Alternative text of the logo for the visually impaired'
         type: string
         default: 'Logo'
 
-      mySitepackage.favicon:
+      SitePackage.favicon:
         label: 'Favicon'
         description: 'This icon is displayed in search engine results and in the browser tab'
-        category: mySitepackage.seo
+        category: SitePackage.layout
         type: string
         default: 'EXT:site_package/Resources/Public/Icons/favicon.ico'
diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt
index f73b7ead..36f6a653 100644
--- a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt
+++ b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt
@@ -6,14 +6,14 @@
     :linenos:
 
     styles:
-      templates:
-        layoutRootPath: EXT:site_package/Resources/Private/ContentElements/Layouts
-        partialRootPath: EXT:site_package/Resources/Private/ContentElements/Partials
-        templateRootPath: EXT:site_package/Resources/Private/ContentElements/Templates
-      content:
-        textmedia:
-          maxW: 1200
-          maxWInText: 600
-          linkWrap:
-            lightboxEnabled: true
-            lightboxCssClass: lightbox
+        templates:
+            layoutRootPath: EXT:site_package/Resources/Private/ContentElements/Layouts
+            partialRootPath: EXT:site_package/Resources/Private/ContentElements/Partials
+            templateRootPath: EXT:site_package/Resources/Private/ContentElements/Templates
+        content:
+            textmedia:
+                maxW: 1200
+                maxWInText: 600
+                linkWrap:
+                    lightboxEnabled: true
+                    lightboxCssClass: lightbox
diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml
index 7cc131b6..3c9914d0 100644
--- a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml
+++ b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.yaml
@@ -1,8 +1,8 @@
 styles:
   templates:
-    layoutRootPath: EXT:my_site_package/Resources/Private/Layouts/ContentElements
-    partialRootPath: EXT:my_site_package/Resources/Private/Partials/ContentElements
-    templateRootPath: EXT:my_site_package/Resources/Private/Templates/ContentElements
+    layoutRootPath: EXT:my_site_package/Resources/Private/ContentElements/Layouts
+    partialRootPath: EXT:my_site_package/Resources/Private/ContentElements/Partials
+    templateRootPath: EXT:my_site_package/Resources/Private/ContentElements/Templates
   content:
     textmedia:
       maxW: 1200
diff --git a/Documentation/CodeSnippets/Fluid/Header.rst.txt b/Documentation/CodeSnippets/Fluid/Header.rst.txt
index 54ec50af..6ac8ab88 100644
--- a/Documentation/CodeSnippets/Fluid/Header.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/Header.rst.txt
@@ -1,8 +1,8 @@
 ..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
-..  Extracted from EXT:site_package/Resources/Private/Templates/Partials/Header.html
+..  Extracted from EXT:site_package/Resources/Private/PageView/Partials/Header.html
 
 ..  code-block:: html
-    :caption: EXT:site_package/Resources/Private/Templates/Partials/Header.html
+    :caption: EXT:site_package/Resources/Private/PageView/Partials/Header.html
     :linenos:
 
     <nav class="navbar navbar-expand-lg bg-body-tertiary mb-4">
@@ -12,7 +12,7 @@
             </button>
             <div class="collapse navbar-collapse" id="menuToggler">
                 <f:link.page pageUid="{site.rootPageId}" class="navbar-brand">
-                    <f:image src="{settings.mySitepackage.logo}" alt="{settings.mySitepackage.logo-alt}" class="pe-3" />
+                    <f:image src="{settings.SitePackage.logo}" alt="{settings.SitePackage.logo-alt}" class="pe-3" />
                     {site.configuration.websiteTitle}
                 </f:link.page>
 
diff --git a/Documentation/CodeSnippets/Fluid/Image.rst.txt b/Documentation/CodeSnippets/Fluid/Image.rst.txt
index 32b3ecdf..cb827ffa 100644
--- a/Documentation/CodeSnippets/Fluid/Image.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/Image.rst.txt
@@ -6,5 +6,5 @@
     :linenos:
 
     <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-    <f:media class="image-embed-item rounded-circle" file="{file}" width="{dimensions.width}" height="{dimensions.height}" alt="{file.alternative}" title="{file.title}" loading="{settings.media.lazyLoading}" decoding="{settings.media.imageDecoding}" />
+    <f:media class="image-embed-item rounded" file="{file}" width="{dimensions.width}" height="{dimensions.height}" alt="{file.alternative}" title="{file.title}" loading="{settings.media.lazyLoading}" decoding="{settings.media.imageDecoding}" />
     </html>
diff --git a/Documentation/CodeSnippets/Fluid/Layout.rst.txt b/Documentation/CodeSnippets/Fluid/Layout.rst.txt
index a98214e8..4b6a4cfe 100644
--- a/Documentation/CodeSnippets/Fluid/Layout.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/Layout.rst.txt
@@ -1,5 +1,5 @@
 ..  code-block:: html
-    :caption: EXT:my_site_package/Resources/Private/Templates/Layouts/Layout.html
+    :caption: EXT:my_site_package/Resources/Private/PageView/Layouts/Layout.html
     :linenos:
 
     <f:asset.css identifier="bootstrap" href="EXT:my_site_package/Resources/Public/Libaries/bootstrap-5.3.3-dist/css/bootstrap.min.css" />
diff --git a/Documentation/CodeSnippets/Fluid/Menu.rst.txt b/Documentation/CodeSnippets/Fluid/Menu.rst.txt
index 71ba24d5..eee866c9 100644
--- a/Documentation/CodeSnippets/Fluid/Menu.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/Menu.rst.txt
@@ -1,8 +1,8 @@
 ..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
-..  Extracted from EXT:site_package/Resources/Private/Templates/Partials/Navigation/Menu.html
+..  Extracted from EXT:site_package/Resources/Private/PageView/Partials/Navigation/Menu.html
 
 ..  code-block:: html
-    :caption: EXT:site_package/Resources/Private/Templates/Partials/Navigation/Menu.html
+    :caption: EXT:site_package/Resources/Private/PageView/Partials/Navigation/Menu.html
     :linenos:
 
     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
diff --git a/Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt b/Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt
index ffcc1de6..fda062d7 100644
--- a/Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/MenuSitemap.rst.txt
@@ -18,7 +18,7 @@
             <ul class="list-group ps-4 mt-2">
                 <f:for each="{menu}" as="page">
                     <li class="list-group-item">
-                        <a href="{page.link}" class="text-decoration-none text-dark {f:if(condition: '{level} < 2', then: 'fw-bold')}">
+                        <a href="{page.link}" class="text-decoration-none text-dark level-{level}{f:if(condition: '{level} < 2', then: ' fw-bold')}">
                             <span>{page.title}</span>
                         </a>
                         <f:render section="Menu" arguments="{menu: page.children, level: '{level + 1}'}" />
diff --git a/Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt b/Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt
index aaf080b2..a96b961c 100644
--- a/Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/MenuSubpages.rst.txt
@@ -13,7 +13,7 @@
             <ul class="nav flex-column">
                 <f:for each="{menu}" as="page">
                     <li class="nav-item">
-                        <a href="{page.link}" class="nav-link{f:if(condition: 'page.active', then: 'active')}">
+                        <a href="{page.link}" class="nav-link{f:if(condition: 'page.active', then: ' active')}">
                             <span>{page.title}</span>
                         </a>
                     </li>
diff --git a/Documentation/CodeSnippets/Fluid/PartialContent.rst.txt b/Documentation/CodeSnippets/Fluid/PartialContent.rst.txt
index d1a541da..386565ae 100644
--- a/Documentation/CodeSnippets/Fluid/PartialContent.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/PartialContent.rst.txt
@@ -1,5 +1,5 @@
 ..  code-block:: html
-    :caption: Resources/Private/Templates/Partials/Content.html
+    :caption: Resources/Private/PageView/Partials/Content.html
     :linenos:
 
     <f:for each="{records}" as="record">
diff --git a/Documentation/CodeSnippets/Fluid/PartialJumbotron.rst.txt b/Documentation/CodeSnippets/Fluid/PartialJumbotron.rst.txt
deleted file mode 100644
index 9761150c..00000000
--- a/Documentation/CodeSnippets/Fluid/PartialJumbotron.rst.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
-..  Extracted from EXT:site_package/Resources/Private/Templates/Partials/Jumbotron.html
-
-..  code-block:: html
-    :caption: EXT:my_site_package/Resources/Private/Templates/Partials/Jumbotron.html
-    :linenos:
-
-    <f:for each="{content.jumbotron.records}" as="record">
-        <div class="container">
-            <div class="p-5 mb-4 bg-body-tertiary">
-                <div class="container-fluid py-5">
-                    <h1 class="display-5 fw-bold">{record.header}</h1>
-                    <p class="col-md-8 fs-4"><f:format.html>{record.bodytext}</f:format.html></p>
-                    <button class="btn btn-dark btn-lg" role="button" href="#" id="exampleButton">Example button</button>
-                </div>
-            </div>
-        </div>
-    </f:for>
diff --git a/Documentation/CodeSnippets/Fluid/Stage.rst.txt b/Documentation/CodeSnippets/Fluid/Stage.rst.txt
new file mode 100644
index 00000000..4cf9b396
--- /dev/null
+++ b/Documentation/CodeSnippets/Fluid/Stage.rst.txt
@@ -0,0 +1,16 @@
+..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
+..  Extracted from EXT:site_package/Resources/Private/PageView/Partials/Stage.html
+
+..  code-block:: html
+    :caption: EXT:site_package/Resources/Private/PageView/Partials/Stage.html
+    :linenos:
+
+    <f:for each="{content.stage.records}" as="record">
+        <div class="container">
+            <f:cObject
+                typoscriptObjectPath="{record.mainType}"
+                data="{record}"
+                table="{record.mainType}"
+            />
+        </div>
+    </f:for>
diff --git a/Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt b/Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
index 242fb78f..34c49b2e 100644
--- a/Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
+++ b/Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
@@ -1,14 +1,14 @@
 ..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
-..  Extracted from EXT:site_package/Resources/Private/Templates/Pages/Default.html
+..  Extracted from EXT:site_package/Resources/Private/PageView/Pages/Default.html
 
 ..  code-block:: html
-    :caption: EXT:site_package/Resources/Private/Templates/Pages/Default.html
+    :caption: EXT:site_package/Resources/Private/PageView/Pages/Default.html
     :linenos:
 
-    <f:layout name="Layout"/>
+    <f:layout name="PageLayout"/>
     <f:section name="Main">
 
-        <f:render partial="Jumbotron" arguments="{_all}"/>
+        <f:render partial="Stage" arguments="{_all}"/>
 
         <div class="container">
             <f:render partial="Content" arguments="{records: content.main.records}"/>
diff --git a/Documentation/CodeSnippets/PageLayout/_Subpage.tsconfig b/Documentation/CodeSnippets/PageLayout/_Subpage.tsconfig
index 94282168..1b284b7e 100644
--- a/Documentation/CodeSnippets/PageLayout/_Subpage.tsconfig
+++ b/Documentation/CodeSnippets/PageLayout/_Subpage.tsconfig
@@ -10,10 +10,10 @@ mod.web_layout.BackendLayouts {
           1 {
             columns {
               1 {
-                name = Jumbotron
+                name = Stage
                 colspan = 2
                 colPos = 1
-                identifier = jumbotron
+                identifier = stage
                 slideMode = slide
               }
             }
diff --git a/Documentation/CodeSnippets/codesnippets.php b/Documentation/CodeSnippets/codesnippets.php
index 57cac3fc..ee825532 100644
--- a/Documentation/CodeSnippets/codesnippets.php
+++ b/Documentation/CodeSnippets/codesnippets.php
@@ -47,23 +47,30 @@
     # code Snippets Fluid
     [
         'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Resources/Private/Templates/Pages/Default.html',
+        'sourceFile' => 'EXT:site_package/Resources/Private/PageView/Pages/Default.html',
         'targetFileName' => 'Fluid/TemplateDefault.rst.txt',
-        'caption' => 'EXT:site_package/Resources/Private/Templates/Pages/Default.html',
+        'caption' => 'EXT:site_package/Resources/Private/PageView/Pages/Default.html',
         'showLineNumbers' => true
     ],
     [
         'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Resources/Private/Templates/Partials/Header.html',
+        'sourceFile' => 'EXT:site_package/Resources/Private/PageView/Partials/Header.html',
         'targetFileName' => 'Fluid/Header.rst.txt',
-        'caption' => 'EXT:site_package/Resources/Private/Templates/Partials/Header.html',
+        'caption' => 'EXT:site_package/Resources/Private/PageView/Partials/Header.html',
         'showLineNumbers' => true
     ],
     [
         'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Resources/Private/Templates/Partials/Navigation/Menu.html',
+        'sourceFile' => 'EXT:site_package/Resources/Private/PageView/Partials/Navigation/Menu.html',
         'targetFileName' => 'Fluid/Menu.rst.txt',
-        'caption' => 'EXT:site_package/Resources/Private/Templates/Partials/Navigation/Menu.html',
+        'caption' => 'EXT:site_package/Resources/Private/PageView/Partials/Navigation/Menu.html',
+        'showLineNumbers' => true
+    ],
+    [
+        'action' => 'createCodeSnippet',
+        'sourceFile' => 'EXT:site_package/Resources/Private/PageView/Partials/Stage.html',
+        'targetFileName' => 'Fluid/Stage.rst.txt',
+        'caption' => 'EXT:site_package/Resources/Private/PageView/Partials/Stage.html',
         'showLineNumbers' => true
     ],
     [
diff --git a/Documentation/ContentElementRendering/Index.rst b/Documentation/ContentElementRendering/Index.rst
index bdfbb35d..2db55c52 100644
--- a/Documentation/ContentElementRendering/Index.rst
+++ b/Documentation/ContentElementRendering/Index.rst
@@ -76,7 +76,7 @@ into the folder :path:`vendor` during installation via Composer. You can find
 the files belonging to Fluid Styled Content in folder
 :path:`vendor/typo3/cms-fluid-styled-content` therefore. This folder is
 structured similarly to your site package extension and you can find the original
-templates in folder :path:`Resources/Private/Templates` here.
+templates in folder :path:`Resources/Private/PageView` here.
 
 By convention the templates of Fluid Styled Content have the name of the `CType` in CamelCase. Copy file
 :path:`vendor/typo3/cms-fluid-styled-content/Resources/Private/Templates/MenuSubpages.html`
diff --git a/Documentation/ContentMapping/Index.rst b/Documentation/ContentMapping/Index.rst
index 6107a1e6..c8aa7dfe 100644
--- a/Documentation/ContentMapping/Index.rst
+++ b/Documentation/ContentMapping/Index.rst
@@ -12,7 +12,7 @@ contain the content, into its own section. This section is however still filled
 with dummy content:
 
 ..  literalinclude:: _codesnippets/_SectionMain.html
-    :caption: Resources/Private/Templates/Pages/Default.html
+    :caption: Resources/Private/PageView/Pages/Default.html
 
 ..  contents::
 
@@ -57,9 +57,10 @@ newly created file is loaded within the page tree of your site automatically:
 This file automatically includes all `.tsconfig` files from the designated folder
 in which we will store the page layouts.
 
-We now create a default page layout with one column and row for the jumbotron:
+We now create a default page layout with two areas: One for the main content and
+one for the stage.
 
-..  literalinclude:: /CodeSnippets/PageLayout/_Default.tsconfig
+..  literalinclude:: _codesnippets/_Default.tsconfig
     :language: typoscript
     :caption: EXT:my_site_package/Configuration/TsConfig/Page/PageLayout/Default.tsconfig
     :linenos:
@@ -89,12 +90,12 @@ Choose the page layout in the page properties
 ---------------------------------------------
 
 Switch to the new backend layout and save the page properties. In the
-:guilabel:`Page` module you will see two columns called "Jumbotron" and
+:guilabel:`Page` module you will see two areas called "Stage" and
 "Main Content" now.
 
 If you followed step
 :ref:`Load the example data automatically <t3sitepackage:load-example-data>`
-the areas "Jumbotron" and "Main" should already contain some example content.
+the areas "Stage" and "Main" should already contain some example content.
 
 .. include:: /Images/AutomaticScreenshots/CreateNewContentElement.rst.txt
 
@@ -136,7 +137,7 @@ You can debug this variable in the main section of your template using the
 :ref:`Debug ViewHelper <f:debug> <t3viewhelper:typo3-fluid-debug>`:
 
 ..  literalinclude:: _codesnippets/_SectionMainDebug.diff
-    :caption: Resources/Private/Templates/Pages/Default.html
+    :caption: Resources/Private/PageView/Pages/Default.html
 
 The debug output after clearing all caches and previewing the page should look
 like this:
@@ -144,7 +145,7 @@ like this:
 ..  figure:: _images/contents_debug.png
     :alt: Screenshot of the debug output of {content}
 
-    The debug output should contain sections "jumbotron" and "main"
+    The debug output should contain sections "stage" and "main"
 
 ..  tip::
     Does your debug output show "NULL" instead? Check the following:
@@ -161,7 +162,7 @@ like this:
 TypoScript mapping in Fluid template
 ====================================
 
-Open the file :file:`Resources/Private/Templates/Page/Default.html` and locate the
+Open the file :file:`Resources/Private/PageView/Page/Default.html` and locate the
 main content area. It contains a headline (look for the :code:`<h2>`-tags) and
 some dummy content (look for the :code:`<p>`-tags).
 
@@ -170,7 +171,7 @@ rendering each content element using the
 :ref:`CObject ViewHelper <f:cObject> <t3viewhelper:typo3-fluid-cobject>`:
 
 ..  literalinclude:: _codesnippets/_SectionMainRender.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (diff)
+    :caption: Resources/Private/PageView/Pages/Default.html (diff)
 
 For content elements the main type is always `tt_content`. Therefore we include
 the TypoScript object :typoscript:`tt_content` here. It is defined in the TypoScript
@@ -197,7 +198,7 @@ the records of the page layout area to be rendered as variable `records` to
 the partial:
 
 ..  literalinclude:: _codesnippets/_SectionMainRenderPartial.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (diff)
+    :caption: Resources/Private/PageView/Pages/Default.html (diff)
 
 The partial then looks like this:
 
@@ -230,7 +231,7 @@ Next steps
     :glob:
 
     TypoScript
-    Jumbotron
+    Stage
     SubpageLayout
     AddContent
     *
diff --git a/Documentation/ContentMapping/Jumbotron.rst b/Documentation/ContentMapping/Jumbotron.rst
deleted file mode 100644
index 19bcdb9f..00000000
--- a/Documentation/ContentMapping/Jumbotron.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-:navigation-title: Jumbotron
-..  include:: /Includes.rst.txt
-
-..  _customize-content-elements:
-
-===================================================
-The jumbotron: Customize output of content elements
-===================================================
-
-..  contents::
-
-..  _jumbotron-partial:
-
-The jumbotron partial template
-==============================
-
-The partial of the jumbotron that we created in step
-:ref:`Split up the template into partials <t3sitepackage:partials>` still
-contains static content:
-
-..  code-block:: html
-    :caption: packages/my-site-package/Resources/Private/Templates/Partials/Jumbotron.html
-
-    <div class="container">
-    <div class="p-5 mb-4 bg-body-tertiary">
-        <div class="container-fluid py-5">
-            <h1 class="display-5 fw-bold">Custom jumbotron</h1>
-            <p class="col-md-8 fs-4">This jumbotron contains a button to demonstrate that JavaScript is working: </p>
-            <button class="btn btn-dark btn-lg" role="button" href="#" id="exampleButton">Example button</button>
-        </div>
-    </div>
-
-..  _jumbotron-content-records:
-
-Jumbotron content records
-=========================
-
-In our Fluid template the variable `{content.jumbotron.records}`
-already contains the content of the content elements entered in columns
-`jumbotron` in the TYPO3 backend. This column was defined in the
-:ref:`Page layout <t3sitepackage:content-mapping-backend-layout>`. It is provided
-by the :ref:`page-content data processor <t3sitepackage:page-content-data-processor>`.
-
-Open the partial displaying the jumbotron:
-:file:`Resources/Private/Templates/Partials/Jumbotron.html`. Using the
-:ref:`Debug ViewHelper <f:debug> <t3viewhelper:typo3-fluid-debug>` have a look
-at what kind of data is passed to your partial template:
-
-..  code-block:: html
-    :caption: EXT:my_site_package/Resources/Private/Templates/Partials/Jumbotron.html
-
-    <f:debug>{content.jumbotron.records}</f:debug>
-    <div class="jumbotron">
-        <!-- ... -->
-    </div>
-
-..  _jumbotron-customized-rendering:
-
-Customized rendering of the content records
-===========================================
-
-The variable will contain an array of :php:`\TYPO3\CMS\Core\Domain\Record`
-elements. If the array is empty. Check that your page indeed has content in
-the column "Jumbotron".
-
-You could render these content elements the way that we rendered the main content
-(compare :ref:`Extract the content element rendering to a
-partial <t3sitepackage:content-element-partial>`). However our expected HTML
-output is different from what fluid-styled-content produces out-of-the-box.
-
-Instead of letting the system extension fluid-styled-content render the
-content we will render it ourselves in this partial.
-
-We traverse the array provided by the page-content data processor and render
-the content ourselves:
-
-..  include:: /CodeSnippets/Fluid/PartialJumbotron.rst.txt
-
-The :ref:`For ViewHelper <f:for> <t3viewhelper:typo3fluid-fluid-for>` loops
-through all content elements in column jumbotron and provides them in variable
-`{record}`.
-
-The :php-short:`\TYPO3\CMS\Core\Domain\Record` object contains the information
-of the database row representing the current content element record.
-For advanced usage see :ref:`Use records in Fluid <t3coreapi:record_objects_fluid>`.
-
-Here we use the fields `header` and `bodytext` of the record. As the `bodytext`
-field has a rich-text editor in the backend, we pass it through the
-:ref:`Format.html ViewHelper <f:format.html> <t3viewhelper:typo3-fluid-format-html>`.
diff --git a/Documentation/ContentMapping/Stage.rst b/Documentation/ContentMapping/Stage.rst
new file mode 100644
index 00000000..6772be54
--- /dev/null
+++ b/Documentation/ContentMapping/Stage.rst
@@ -0,0 +1,53 @@
+:navigation-title: Stage
+..  include:: /Includes.rst.txt
+
+..  _jumbotron-partial:
+..  _jumbotron-content-records:
+..  _slide-mode:
+
+========================================================
+The Stage: Fall back to content of parent page (sliding)
+========================================================
+
+..  contents::
+
+..  _slide-mode-pagelayout:
+
+Page Layout with slide mode
+===========================
+
+The page layout contains a definition for the stage area in lines 10-19:
+
+..  literalinclude:: _codesnippets/_Default.tsconfig
+    :language: typoscript
+    :caption: packages/my_site_package/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig
+    :linenos:
+    :emphasize-lines: 10-19
+
+The definition is similar to the one we have seen for the main content area in
+section `Create a default page layout with page TSconfig <https://docs.typo3.org/permalink/t3sitepackage:content-mapping-backend-layout>`_.
+
+There are some key differences:
+
+*   The stage has the
+    :ref:`colPos <t3tsref:confval-mod-web-layout-backendlayouts-backendlayout-title-config-backend-layout-rows-row-columns-col-colpos>`
+    `1`, therefore all content elements in the stage area will automatically have
+    a `1` instead of a `0` in field "Column" / database column `colPos`.
+*   The :ref:`identifier <t3tsref:confval-mod-web-layout-backendlayouts-backendlayout-title-config-backend-layout-rows-row-columns-col-identifier>`
+    is `stage` therefore the content of the content area is available as
+    variable `{content.stage.records}` in the partial template.
+*   The :ref:`slideMode <t3tsref:confval-mod-web-layout-backendlayouts-backendlayout-title-config-backend-layout-rows-row-columns-col-slidemode>`
+    is set to `slide` therefore if no content is found in the content area on
+    the current page, TYPO3 will look one page up etc until content is found
+    or the page root is reached.
+
+..  _slide-mode-template:
+
+Using a content area with slide mode
+====================================
+
+The content elements will be automatically found and provided to your template.
+Therefore the template for the area "Stage" looks no different from the one
+for the main area except that is uses the corresponding variable of course:
+
+..  include:: /CodeSnippets/Fluid/Stage.rst.txt
diff --git a/Documentation/ContentMapping/SubpageLayout.rst b/Documentation/ContentMapping/SubpageLayout.rst
index 4b11853a..bd10eaec 100644
--- a/Documentation/ContentMapping/SubpageLayout.rst
+++ b/Documentation/ContentMapping/SubpageLayout.rst
@@ -8,7 +8,7 @@ Additional subpage layout
 =========================
 
 Edit the file
-:file:`packages/my-site-package/Resources/Private/Templates/Pages/Subpage.html`.
+:file:`packages/my-site-package/Resources/Private/PageView/Pages/Subpage.html`.
 
 Exchange the main content area just as we have done before with the default
 template. Now
@@ -16,7 +16,7 @@ replace the content area of the sidebar with the content elements in the Fluid
 variable :html:`{sidebarContent}`.
 
 ..  literalinclude:: _codesnippets/_SubpageWithSection.diff
-    :caption: Resources/Private/Templates/Pages/Subpage.html (diff)
+    :caption: Resources/Private/PageView/Pages/Subpage.html (diff)
 
 ..  contents::
 
@@ -25,7 +25,7 @@ variable :html:`{sidebarContent}`.
 Create a subpage page layout with page TSconfig
 ===============================================
 
-We now create a subpage layout with two columns and row for the jumbotron in a
+We now create a subpage layout with two columns and a row for the stage in a
 new file :file:`packages/my-site-package/Configuration/TsConfig/Page/PageLayout/Subpage.tsconfig`
 containing :ref:`page TSconfig <t3tsref:setting-page-tsconfig>`. :
 
@@ -47,7 +47,7 @@ Edit the page properties of `Start page` to use the backend layout
 ..  include:: _images/SwitchBackendLayoutForSubpages.rst.txt
 
 After saving you will be able to see on "Page 1" that the content of the columns "main" and
-"jumbotron" remains unchanged while there is a third column "sidebar".
+"stage" remains unchanged while there is a third column "sidebar".
 This is due to the fact that the backend layout "Default" and "TwoColumns"
 use the same colPos number for these columns.
 
diff --git a/Documentation/CodeSnippets/PageLayout/_Default.tsconfig b/Documentation/ContentMapping/_codesnippets/_Default.tsconfig
similarity index 89%
rename from Documentation/CodeSnippets/PageLayout/_Default.tsconfig
rename to Documentation/ContentMapping/_codesnippets/_Default.tsconfig
index a9eeba13..d47deb89 100644
--- a/Documentation/CodeSnippets/PageLayout/_Default.tsconfig
+++ b/Documentation/ContentMapping/_codesnippets/_Default.tsconfig
@@ -10,9 +10,9 @@ mod.web_layout.BackendLayouts {
           1 {
             columns {
               1 {
-                name = Jumbotron
+                name = Stage
                 colPos = 1
-                identifier = jumbotron
+                identifier = stage
                 slideMode = slide
               }
             }
diff --git a/Documentation/ContentMapping/_codesnippets/_SectionMain.html b/Documentation/ContentMapping/_codesnippets/_SectionMain.html
index 3bb450d4..f315f3f4 100644
--- a/Documentation/ContentMapping/_codesnippets/_SectionMain.html
+++ b/Documentation/ContentMapping/_codesnippets/_SectionMain.html
@@ -1,6 +1,6 @@
 <f:layout name="Layout"/>
 <f:section name="Main">
-    <f:render partial="Jumbotron" arguments="{_all}"/>
+    <f:render partial="Stage" arguments="{_all}"/>
     <div class="container">
         <h2>Start page content</h2>
         <p>The content of the start page is displayed here. [...] </p>
diff --git a/Documentation/ContentMapping/_codesnippets/_SectionMainDebug.diff b/Documentation/ContentMapping/_codesnippets/_SectionMainDebug.diff
index 706fa5a2..d5f2360f 100644
--- a/Documentation/ContentMapping/_codesnippets/_SectionMainDebug.diff
+++ b/Documentation/ContentMapping/_codesnippets/_SectionMainDebug.diff
@@ -1,6 +1,6 @@
  <f:layout name="Layout"/>
  <f:section name="Main">
-     <f:render partial="Jumbotron" arguments="{_all}"/>
+     <f:render partial="Stage" arguments="{_all}"/>
 +    <f:debug>{content}</f:debug>
      <div class="container">
          <h2>Start page content</h2>
diff --git a/Documentation/ContentMapping/_codesnippets/_SectionMainRender.diff b/Documentation/ContentMapping/_codesnippets/_SectionMainRender.diff
index c3bbd969..89308ef7 100644
--- a/Documentation/ContentMapping/_codesnippets/_SectionMainRender.diff
+++ b/Documentation/ContentMapping/_codesnippets/_SectionMainRender.diff
@@ -1,6 +1,6 @@
  <f:layout name="Layout"/>
  <f:section name="Main">
-     <f:render partial="Jumbotron" arguments="{_all}"/>
+     <f:render partial="Stage" arguments="{_all}"/>
 -    <f:debug>{content}</f:debug>
          <div class="container">
 -            <h2>Start page content</h2>
diff --git a/Documentation/ContentMapping/_codesnippets/_SectionMainRenderPartial.diff b/Documentation/ContentMapping/_codesnippets/_SectionMainRenderPartial.diff
index b7d12ea5..4ff308d8 100644
--- a/Documentation/ContentMapping/_codesnippets/_SectionMainRenderPartial.diff
+++ b/Documentation/ContentMapping/_codesnippets/_SectionMainRenderPartial.diff
@@ -1,6 +1,6 @@
  <f:layout name="Layout"/>
  <f:section name="Main">
-     <f:render partial="Jumbotron" arguments="{_all}"/>
+     <f:render partial="Stage" arguments="{_all}"/>
      <div class="container">
 -        <f:for each="{content.main.records}" as="record">...</f:for>
 +        <f:render partial="Content" arguments="{records: content.main.records}"/>
diff --git a/Documentation/ContentMapping/_codesnippets/_SubpageWithSection.diff b/Documentation/ContentMapping/_codesnippets/_SubpageWithSection.diff
index c4801958..1df190a3 100644
--- a/Documentation/ContentMapping/_codesnippets/_SubpageWithSection.diff
+++ b/Documentation/ContentMapping/_codesnippets/_SubpageWithSection.diff
@@ -1,6 +1,6 @@
 <f:layout name="Layout"/>
 <f:section name="Main">
-    <f:render partial="Jumbotron" arguments="{_all}"/>
+    <f:render partial="Stage" arguments="{_all}"/>
     <f:render partial="Navigation/Breadcrumb" arguments="{_all}"/>
     <div class="container">
         <div class="row">
diff --git a/Documentation/ContentMapping/_codesnippets/_pageview.diff b/Documentation/ContentMapping/_codesnippets/_pageview.diff
index c2d9e0d3..f7e1e26e 100644
--- a/Documentation/ContentMapping/_codesnippets/_pageview.diff
+++ b/Documentation/ContentMapping/_codesnippets/_pageview.diff
@@ -1,7 +1,7 @@
  page {
    10 {
      paths {
-       100 = EXT:my_site_package/Resources/Private/Templates/
+       100 = EXT:my_site_package/Resources/Private/PageView/
      }
 
 +    dataProcessing {
diff --git a/Documentation/FluidTemplates/Index.rst b/Documentation/FluidTemplates/Index.rst
index 5299dba2..5090d9e8 100644
--- a/Documentation/FluidTemplates/Index.rst
+++ b/Documentation/FluidTemplates/Index.rst
@@ -1,5 +1,6 @@
 ..  include:: /Includes.rst.txt
 
+..  _customize-content-elements:
 ..  _fluid-templates:
 
 ===============
@@ -33,7 +34,7 @@ Create the Fluid templates
 
 Copy the main :ref:`static HTML file <theme-example-static-html>` from
 :file:`Resources/Public/StaticTemplate/default.html`
-to :file:`Resources/Private/Templates/Pages/Default.html`. You can override
+to :file:`Resources/Private/PageView/Pages/Default.html`. You can override
 the file created in step :ref:`Minimal site package - The TYPO3 Fluid
 version <t3sitepackage:minimal-extension-fluid>`. The file name must begin
 with a capital letter
@@ -49,13 +50,13 @@ the `<html>` and `<head>` tags therefore they need to be removed from the
 template:
 
 ..  literalinclude:: _codesnippets/_remove_head.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (difference)
+    :caption: Resources/Private/PageView/Pages/Default.html (difference)
 
 The Fluid template :file:`Default.html` now contains only the HTML
 code inside the body:
 
 ..  literalinclude:: _codesnippets/_DefaultWithoutHead.html
-    :caption: Resources/Private/Templates/Pages/Default.html
+    :caption: Resources/Private/PageView/Pages/Default.html
 
 Flush the caches and preview the page. You should now see a pure HTML page
 without any styles or images. We will add them in a further step.
@@ -84,7 +85,7 @@ Replace `<script>` tags in the body by using the
 :ref:`Asset.script ViewHelper <f:asset.script> <t3viewhelper:typo3-fluid-asset-script>`.
 
 ..  literalinclude:: _codesnippets/_assets.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (difference)
+    :caption: Resources/Private/PageView/Pages/Default.html (difference)
 
 The path to the assets will be resolved by TYPO3. `EXT:` tells TYPO3 that this is
 an extension path. `my_site_package` is the
@@ -112,7 +113,7 @@ Replace all `<img>` tags in the template with the
 :ref:`Image ViewHelper <f:image> <t3viewhelper:typo3-fluid-image>`:
 
 ..  literalinclude:: _codesnippets/_replace_images.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (difference)
+    :caption: Resources/Private/PageView/Pages/Default.html (difference)
 
 Just like happened with the CSS paths in step :ref:`assets` the path to the
 image is now replaced in the output by a path like
@@ -129,7 +130,7 @@ If you compare the two static templates
 and :file:`Resources/Public/StaticTemplate/subpagepage.html` they share many
 parts like the footer or the header with the menu. In order to reuse those parts
 we extract them to their own Fluid files. These are called partials and stored
-in path :path:`Resources/Private/Templates/Partials`.
+in path :path:`Resources/Private/PageView/Partials`.
 
 We can use the :ref:`Render ViewHelper <f:render> <t3viewhelper:typo3-fluid-render>`
 to render the partial in the correct place.
@@ -137,12 +138,12 @@ to render the partial in the correct place.
 Remove the header from the template and replace it with a render ViewHelper:
 
 ..  literalinclude:: _codesnippets/_remove_header.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (difference)
+    :caption: Resources/Private/PageView/Pages/Default.html (difference)
 
 Move the Fluid code you just remove to a file called
-:file:`my-site-package/Resources/Private/Templates/Partials/Header.html`.
+:file:`my-site-package/Resources/Private/PageView/Partials/Header.html`.
 
-Do the same with the jumbotron, the breadcrumb, and the footer.
+Do the same with the stage, the breadcrumb, and the footer.
 
 You should now have the following files:
 
@@ -150,7 +151,7 @@ You should now have the following files:
     :level: 3
     :show-file-icons: true
 
-    *   EXT:my_site_package/Resources/Private/Templates
+    *   EXT:my_site_package/Resources/Private/PageView
 
         *   Pages
 
@@ -161,13 +162,13 @@ You should now have the following files:
 
             *   Footer.html
             *   Header.html
-            *   Jumbotron.html
+            *   Stage.html
 
-The Fluid template :file:`Resources/Private/Templates/Pages/Default.html`
+The Fluid template :file:`Resources/Private/PageView/Pages/Default.html`
 should now look like this:
 
 ..  literalinclude:: _codesnippets/_DefaultWithPartials.html
-    :caption: Resources/Private/Templates/Pages/Default.html
+    :caption: Resources/Private/PageView/Pages/Default.html
 
 You will learn how to display the dynamic content in chapter :ref:`content-mapping`.
 
@@ -177,11 +178,11 @@ Extract the menu into a partial
 -------------------------------
 
 Partials can also be rendered from within another partial. We move the menu in
-the partial :file:`Resources/Private/Templates/Partials/Header.html` to its
-own partial, :file:`Resources/Private/Templates/Partials/Navigation/Menu.html`:
+the partial :file:`Resources/Private/PageView/Partials/Header.html` to its
+own partial, :file:`Resources/Private/PageView/Partials/Navigation/Menu.html`:
 
 ..  literalinclude:: _codesnippets/_remove_menu_from_header.diff
-    :caption: EXT:my_site_package/Resources/Private/Templates/Partials/Header.html (Difference)
+    :caption: EXT:my_site_package/Resources/Private/PageView/Partials/Header.html (Difference)
 
 The :ref:`Render ViewHelper <f:render> <t3viewhelper:typo3-fluid-render>` is used
 the same like from within the template.
@@ -195,16 +196,16 @@ Extract the footer menu into a partial
 -------------------------------
 
 We can also move the footer menu from
-the partial :file:`Resources/Private/Templates/Partials/Footer.html` to its
-own partial, :file:`Resources/Private/Templates/Partials/Navigation/FooterMenu.html`:
+the partial :file:`Resources/Private/PageView/Partials/Footer.html` to its
+own partial, :file:`Resources/Private/PageView/Partials/Navigation/FooterMenu.html`:
 
 ..  literalinclude:: _codesnippets/_remove_menu_from_footer.diff
-    :caption: EXT:my_site_package/Resources/Private/Templates/Partials/Footer.html (Difference)
+    :caption: EXT:my_site_package/Resources/Private/PageView/Partials/Footer.html (Difference)
 
 The footer menu partial looks like this:
 
 ..  literalinclude:: _codesnippets/_FooterMenuPartial.html
-    :caption: Resources/Private/Templates/Partials/Navigation/FooterMenu.html
+    :caption: Resources/Private/PageView/Partials/Navigation/FooterMenu.html
 
 ..  _create_section:
 
@@ -216,15 +217,15 @@ You can also move a part of the template into a section, surrounded by a
 and use the :ref:`Render ViewHelper <f:render> <t3viewhelper:typo3-fluid-render>`
 with argument `section` to render it.
 
-We move the content, including the Jumbotron into such a section:
+We move the content, including the Stage into such a section:
 
 ..  literalinclude:: _codesnippets/_move_content_to_section.diff
-    :caption: Resources/Private/Templates/Pages/Default.html (difference)
+    :caption: Resources/Private/PageView/Pages/Default.html (difference)
 
 The result looks like this:
 
 ..  literalinclude:: _codesnippets/_DefaultWithSection.html
-    :caption: Resources/Private/Templates/Pages/Default.html
+    :caption: Resources/Private/PageView/Pages/Default.html
 
 You will learn how to display the dynamic content in chapter :ref:`content-mapping`.
 
@@ -236,7 +237,7 @@ The Fluid template for the subpage
 We can repeat the above steps for the subpage and write such a template:
 
 ..  literalinclude:: _codesnippets/_SubpageWithSection.html
-    :caption: Resources/Private/Templates/Pages/Subpage.html
+    :caption: Resources/Private/PageView/Pages/Subpage.html
     :linenos:
     :emphasize-lines: 1-9
 
@@ -245,13 +246,13 @@ We can repeat the above steps for the subpage and write such a template:
 Extract the breadcrumb into a partial
 -------------------------------------
 
-The subpage template contain a breadcrumb, between jumbotron and content, that
+The subpage template contain a breadcrumb, between stage and content, that
 you can also move to a partial.
 
 The breadcrum partial looks like this:
 
 ..  literalinclude:: _codesnippets/_BreadcrumbPartial.html
-    :caption: Resources/Private/Templates/Partials/Navigation/Breadcrumb.html
+    :caption: Resources/Private/PageView/Partials/Navigation/Breadcrumb.html
 
 ..  _the-website-layout-file:
 
@@ -259,27 +260,27 @@ Extract the repeated part to a layout
 =====================================
 
 Lines 1-9 of file `Subpage.html` in step :ref:`subpage` step are exactly the
-same like in file :file:`Resources/Private/Templates/Pages/Default.html`.
+same like in file :file:`Resources/Private/PageView/Pages/Default.html`.
 
 We can extract these lines into a so called Fluid layout and load them with the
 :ref:`Layout ViewHelper <f:layout> <t3viewhelper:typo3fluid-fluid-layout>`:
 
 ..  literalinclude:: _codesnippets/_include_layout.diff
-    :caption: Resources/Private/Templates/Pages/Subpage.html (difference)
+    :caption: Resources/Private/PageView/Pages/Subpage.html (difference)
 
 Save the extracted layout to a file called
-:file:`Resources/Private/Templates/Layouts/Layout.html`. This file now contains
+:file:`Resources/Private/PageView/Layouts/Layout.html`. This file now contains
 the following:
 
 ..  include:: /CodeSnippets/Fluid/Layout.rst.txt
 
-Repeat the same for file :file:`Resources/Private/Templates/Pages/Default.html`.
+Repeat the same for file :file:`Resources/Private/PageView/Pages/Default.html`.
 
 ..  directory-tree::
     :level: 3
     :show-file-icons: true
 
-    *   EXT:my_sitepackage/Resources/Private/Templates
+    *   EXT:my_sitepackage/Resources/Private/PageView
 
         *   Layouts
 
@@ -300,7 +301,7 @@ Repeat the same for file :file:`Resources/Private/Templates/Pages/Default.html`.
 
             *   Footer.html
             *   Header.html
-            *   Jumbotron.html
+            *   Stage.html
 
 You can finde the complete site package extension at this step at branch
 `main-step/fluid <https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-SitePackage-Code/tree/main-step/fluid>`__.
diff --git a/Documentation/FluidTemplates/_codesnippets/_DefaultWithPartials.html b/Documentation/FluidTemplates/_codesnippets/_DefaultWithPartials.html
index e4c3f6c4..fd6961e6 100644
--- a/Documentation/FluidTemplates/_codesnippets/_DefaultWithPartials.html
+++ b/Documentation/FluidTemplates/_codesnippets/_DefaultWithPartials.html
@@ -2,7 +2,7 @@
 <f:asset.css identifier="main" href="EXT:my_site_package/Resources/Public/Css/main.css" />
 <main>
     <f:render partial="Header" arguments="{_all}"/>
-    <f:render partial="Jumbotron" arguments="{records: content.jumbotron.records}"/>
+    <f:render partial="Stage" arguments="{records: content.stage.records}"/>
     <div class="container">
         <h2>Start page content</h2>
         <p>The content of the start page is displayed here. This content should be generated from the content element of the startpage </p>
diff --git a/Documentation/FluidTemplates/_codesnippets/_DefaultWithSection.html b/Documentation/FluidTemplates/_codesnippets/_DefaultWithSection.html
index 6d8f1cc2..24598aa8 100644
--- a/Documentation/FluidTemplates/_codesnippets/_DefaultWithSection.html
+++ b/Documentation/FluidTemplates/_codesnippets/_DefaultWithSection.html
@@ -9,7 +9,7 @@
 <f:asset.script identifier="main" src="EXT:my_site_package/Resources/Public/JavaScript/main.js" />
 
 <f:section name="Main">
-    <f:render partial="Jumbotron" arguments="{records: content.jumbotron.records}"/>
+    <f:render partial="Stage" arguments="{records: content.stage.records}"/>
     <div class="container">
         <h2>Start page content</h2>
         <p>The content of the start page is displayed here. This content should be generated from the content element of the startpage </p>
diff --git a/Documentation/FluidTemplates/_codesnippets/_DefaultWithoutHead.html b/Documentation/FluidTemplates/_codesnippets/_DefaultWithoutHead.html
index 7ef93efb..791baaed 100644
--- a/Documentation/FluidTemplates/_codesnippets/_DefaultWithoutHead.html
+++ b/Documentation/FluidTemplates/_codesnippets/_DefaultWithoutHead.html
@@ -24,8 +24,8 @@
     <div class="container">
         <div class="p-5 mb-4 bg-body-tertiary">
             <div class="container-fluid py-5">
-                <h1 class="display-5 fw-bold">Custom jumbotron</h1>
-                <p class="col-md-8 fs-4">This jumbotron contains a button to demonstrate that JavaScript is working: </p>
+                <h1 class="display-5 fw-bold">Custom stage</h1>
+                <p class="col-md-8 fs-4">This stage contains a button to demonstrate that JavaScript is working: </p>
                 <button class="btn btn-dark btn-lg" role="button" href="#" id="exampleButton">Example button</button>
             </div>
         </div>
diff --git a/Documentation/FluidTemplates/_codesnippets/_SectionMain.html b/Documentation/FluidTemplates/_codesnippets/_SectionMain.html
index b388d41d..71c0a040 100644
--- a/Documentation/FluidTemplates/_codesnippets/_SectionMain.html
+++ b/Documentation/FluidTemplates/_codesnippets/_SectionMain.html
@@ -1,5 +1,5 @@
 <f:section name="Main">
-    <f:render partial="Jumbotron" arguments="{records: content.jumbotron.records}"/>
+    <f:render partial="Stage" arguments="{records: content.stage.records}"/>
     <div class="container">
         <h2>Start page content</h2>
         <p>The content of the start page is displayed here. [...] </p>
diff --git a/Documentation/FluidTemplates/_codesnippets/_Step3Default.html b/Documentation/FluidTemplates/_codesnippets/_Step3Default.html
index ef349c58..e06318ca 100644
--- a/Documentation/FluidTemplates/_codesnippets/_Step3Default.html
+++ b/Documentation/FluidTemplates/_codesnippets/_Step3Default.html
@@ -3,7 +3,7 @@
     <f:render partial="Navigation/MainNavigation.html" arguments="{_all}"/>
 
     <main role="main">
-        <f:render partial="Jumbotron" />
+        <f:render partial="Stage" />
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md-6">
diff --git a/Documentation/FluidTemplates/_codesnippets/_SubpageWithSection.html b/Documentation/FluidTemplates/_codesnippets/_SubpageWithSection.html
index 3d7c4193..8b7e20ec 100644
--- a/Documentation/FluidTemplates/_codesnippets/_SubpageWithSection.html
+++ b/Documentation/FluidTemplates/_codesnippets/_SubpageWithSection.html
@@ -9,7 +9,7 @@
 <f:asset.script identifier="main" src="EXT:my_site_package/Resources/Public/JavaScript/main.js" />
 
 <f:section name="Main">
-    <f:render partial="Jumbotron" arguments="{_all}"/>
+    <f:render partial="Stage" arguments="{_all}"/>
     <f:render partial="Navigation/Breadcrumb" arguments="{_all}"/>
     <div class="container">
         <div class="row">
diff --git a/Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff b/Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff
index 2e06248d..042d54c9 100644
--- a/Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff
+++ b/Documentation/FluidTemplates/_codesnippets/_move_content_to_section.diff
@@ -2,7 +2,7 @@
  <f:asset.css identifier="main" href="EXT:my_site_package/Resources/Public/Css/main.css" />
  <main>
      <f:render partial="Header" arguments="{_all}"/>
--    <f:render partial="Jumbotron" arguments="{records: content.jumbotron.records}"/>
+-    <f:render partial="Stage" arguments="{records: content.stage.records}"/>
 -    <div class="container">
 -        <h2>Start page content</h2>
 -        <p>The content of the start page is displayed here. This content should be generated from the content element of the startpage </p>
@@ -14,7 +14,7 @@
  <f:asset.script identifier="main" src="EXT:my_site_package/Resources/Public/JavaScript/main.js" />
 
 +<f:section name="Main">
-+    <f:render partial="Jumbotron" arguments="{_all}"/>
++    <f:render partial="Stage" arguments="{_all}"/>
 +    <div class="container">
 +        <h2>Start page content</h2>
 +        <p>The content of the start page is displayed here. This content should be generated from the content element of the startpage </p>
diff --git a/Documentation/MainMenuCreation/Index.rst b/Documentation/MainMenuCreation/Index.rst
index 26a093be..e9ca5ab8 100644
--- a/Documentation/MainMenuCreation/Index.rst
+++ b/Documentation/MainMenuCreation/Index.rst
@@ -33,7 +33,7 @@ Update the Fluid partial for the menu
 =====================================
 
 Until now we had static HTML in the file
-:file:`Resources/Private/Templates/Partials/Navigation/Menu.html`.
+:file:`Resources/Private/PageView/Partials/Navigation/Menu.html`.
 
 We created that file in section :ref:`create_partial_header`.
 
@@ -51,7 +51,7 @@ You can use the :ref:`t3viewhelper:typo3-fluid-debug` to debug what kind of
 data the variable contains like this:
 
 ..  code-block:: diff
-    :caption: EXT:site_package/Resources/Private/Templates/Partials/Navigation/Menu.html (changed for debug output)
+    :caption: EXT:site_package/Resources/Private/PageView/Partials/Navigation/Menu.html (changed for debug output)
 
      <ul class="navbar-nav mr-auto">
          <f:for each="{menu}" as="menuItem">
diff --git a/Documentation/MinimalExample/Index.rst b/Documentation/MinimalExample/Index.rst
index cbfd23bd..b1b93393 100644
--- a/Documentation/MinimalExample/Index.rst
+++ b/Documentation/MinimalExample/Index.rst
@@ -334,17 +334,17 @@ By searching for the hash `bddd8a816bda3` in the log file you will find such an
     Tried resolving a template file for controller action "Default->Pages/Default"
     in format ".html", but none of the paths contained the expected template file
     (Default/Pages/Default.html).
-    The following paths were checked: /var/www/html/vendor/myvendor/my-site-package/Resources/Private/Templates/
+    The following paths were checked: /var/www/html/vendor/myvendor/my-site-package/Resources/Private/PageView/
 
 This error message also tells you the path where TYPO3 expects to find the file. If no path
 is listed here, the path defined in line 6 of the TypoScript above is incorrect,
 for example if you mistyped the extension name or part of the path.
 
 Create a file named :file:`Default.html` in folder
-:path:`packages/my-site-package/Resources/Private/Templates/Pages`.
+:path:`packages/my-site-package/Resources/Private/PageView/Pages`.
 
 .. code-block:: html
-   :caption: packages/my-site-package/Resources/Private/Templates/Pages/Default.html
+   :caption: packages/my-site-package/Resources/Private/PageView/Pages/Default.html
 
    Hello Fluid World!
 
diff --git a/Documentation/MinimalExample/_pageview.typoscript b/Documentation/MinimalExample/_pageview.typoscript
index ad45a43f..1f61b287 100644
--- a/Documentation/MinimalExample/_pageview.typoscript
+++ b/Documentation/MinimalExample/_pageview.typoscript
@@ -3,7 +3,7 @@ page {
     10 = PAGEVIEW
     10 {
         paths {
-            100 = EXT:my_site_package/Resources/Private/Templates/
+            100 = EXT:my_site_package/Resources/Private/PageView/
         }
     }
 }
diff --git a/Documentation/NextSteps/Index.rst b/Documentation/NextSteps/Index.rst
index b655c02a..19747916 100644
--- a/Documentation/NextSteps/Index.rst
+++ b/Documentation/NextSteps/Index.rst
@@ -33,9 +33,9 @@ these.
 
     Learn more about the menu data processor :ref:`menu data processor <t3tsref:MenuProcessor>`
 
-#.  Jumbotron has no background image
+#.  Stage has no background image
 
-    The Jumbotron stands as a place holder for various options in our example.
+    The Stage stands as a place holder for various options in our example.
     Some readers may like to implement a banner with rotating images, some prefer a
     text content element or a video player instead. All this and much more is
     possible with TYPO3, but beyond the scope of this tutorial.