diff --git a/code_samples/front/render_content/config/packages/views.yaml b/code_samples/front/render_content/config/packages/views.yaml
index 3fa8a3946a..f08c6c91f1 100644
--- a/code_samples/front/render_content/config/packages/views.yaml
+++ b/code_samples/front/render_content/config/packages/views.yaml
@@ -5,7 +5,7 @@ ibexa_design_engine:
 ibexa:
     system:
         site_group:
-            pagelayout: '@ibexadesign/pagelayout.html.twig'
+            page_layout: '@ibexadesign/pagelayout.html.twig'
             design: my_design
             content_view:
                 full:
diff --git a/docs/release_notes/ibexa_dxp_v5.0_deprecations.md b/docs/release_notes/ibexa_dxp_v5.0_deprecations.md
index bd868db074..5c3fd12266 100644
--- a/docs/release_notes/ibexa_dxp_v5.0_deprecations.md
+++ b/docs/release_notes/ibexa_dxp_v5.0_deprecations.md
@@ -647,6 +647,7 @@ The following service definitions have been removed:
 | Old name | New name |
 |:----|:----|
 | `ibexa.system.*.database.*` | `ibexa.repositories` |
+| `ibexa.system.*.pagelayout` | `ibexa.system.*.page_layout` |
 | `ibexa.system.*.session_name` | `ibexa.system.*.session.name` |
 | `ibexa.site_access.config.default.user_registration.group_id` | `ibexa.site_access.config.default.user_registration.group_remote_id` |
 | `ezpublish_http_basic` | Use `http_basic` in `security.yml` directly. |
diff --git a/docs/templating/templates/template_configuration.md b/docs/templating/templates/template_configuration.md
index b12bf09ea3..bd4f410754 100644
--- a/docs/templating/templates/template_configuration.md
+++ b/docs/templating/templates/template_configuration.md
@@ -21,7 +21,7 @@ It may be a SiteAccess, a SiteAccess group, or one of the [generic configuration
 
 ## Page layout
 
-`pagelayout` defines the general layout of the whole site.
+`page_layout` defines the general layout of the whole site.
 Other templates can [extend the page layout](#page-layout).
 
 ``` yaml
diff --git a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
index e56ec05f7a..36e3cd4371 100644
--- a/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
+++ b/docs/tutorials/page_and_form_tutorial/5_create_newsletter_form.md
@@ -77,7 +77,7 @@ Create a `form_field.html.twig` file in `templates/fields/`:
 ```
 
 Next, assign the template to the page.
-In `config/packages/views.yaml`, at the same level as `pagelayout`, add:
+In `config/packages/views.yaml`, at the same level as `page_layout`, add:
 
 ``` yaml
 [[= include_file('code_samples/tutorials/page_tutorial/config/packages/views.yaml', 7, 9) =]]