diff --git a/docs/api/rest_api_extension_media_type.md b/docs/api/rest_api_extension_media_type.md
index d34e6baa80..db2a04175d 100644
--- a/docs/api/rest_api_extension_media_type.md
+++ b/docs/api/rest_api_extension_media_type.md
@@ -16,7 +16,7 @@ You need the following elements:
 
 !!! note
 
-    You can change the vendor name (from default `vnd.ez.api` to new `app.api` like in this example), or you can create a new media type in the default vendor (like `vnd.ez.api.Greeting` in the [Creating a new REST resource](#creating-a-new-rest-resource) example).
+    You can change the vendor name (from default `vnd.ez.api` to new `app.api` like in this example), or you can create a new media type in the default vendor (like `vnd.ez.api.Greeting` in the [Creating a new REST resource](rest_api_extension_resource.md) example).
     To do so, tag your new ValueObjectVisitor with `ezpublish_rest.output.value_object_visitor` to add it to the existing `ValueObjectVisitorDispatcher`, and a new one will not be needed.
     This way, the `media-type` attribute is also easier to create, because the default `Output\Generator` uses this default vendor.
     This example presents creating a new vendor as a good practice, to highlight that this is custom extensions that isn't available in a regular Ibexa DXP installation.
diff --git a/docs/guide/admin_panel.md b/docs/guide/admin_panel.md
index c443b35830..7b491f78c3 100644
--- a/docs/guide/admin_panel.md
+++ b/docs/guide/admin_panel.md
@@ -132,7 +132,7 @@ Content Types are organized into groups.
 
 You can add your own groups here to keep your Content Types in better order.
 
-For a full tutorial, see [Create a Content Type](first_steps.md#create-a-content-type) or follow [user documentation]([[= user_doc =]]/site_organization/organizing_the_site/#content-types).
+For a full tutorial, see [Create a Content Type](first_steps.md#add-a-content-type) or follow [user documentation]([[= user_doc =]]/site_organization/organizing_the_site/#content-types).
 For a detailed overview of the content model, see [Content model overview](content_model.md).
 
 ## Object States
diff --git a/docs/guide/architecture.md b/docs/guide/architecture.md
index d66167e133..8458566ed7 100644
--- a/docs/guide/architecture.md
+++ b/docs/guide/architecture.md
@@ -31,5 +31,5 @@ The architecture of [[= product_name =]] is layered and uses clearly defined API
 | [Solr Storage Engine](search/solr.md)                                                      | Transparent drop-in replacement for the SQL-based Legacy search engine.                                                                                                                        |
 | [IO](file_management/file_management.md#native-io-handler)                                 | The IO API is organized around two types of handlers, both used by the IOService.                                                                                                              |
 | [IO Handler](clustering.md#dfs-io-handler)                                                 | The IO Handler manipulates metadata, making up for the potential inconsistency of network-based filesystems.                                                                                   |
-| [Recommendation](personalization/recommendation_client.md#enabling-recommendations)        | Recommendation API.                                                                                                                                                                            |
-| [Recommendation Engine](personalization/recommendation_client.md#enabling-recommendations) | Recommendation Engine allows displaying recommendations on your website.                                                                                                                       |
+| [Recommendation](personalization/recommendation_client.md)        | Recommendation API.                                                                                                                                                                            |
+| [Recommendation Engine](personalization/recommendation_client.md) | Recommendation Engine allows displaying recommendations on your website.                                                                                                                       |
diff --git a/docs/guide/clustering.md b/docs/guide/clustering.md
index e84f03b68c..4b71ae68f5 100644
--- a/docs/guide/clustering.md
+++ b/docs/guide/clustering.md
@@ -56,7 +56,7 @@ On [[= product_name_cloud =]] (and Platform.sh) Redis is preferred and supported
 
 ### Shared binary files
 
-[[= product_name =]] supports multi-server setups by means of [custom IO handlers](file_management/file_management.md#the-dfs-cluster-handler).
+[[= product_name =]] supports multi-server setups by means of [custom IO handlers](file_management.md#dfs-cluster-handler).
 They make sure that files are correctly synchronized among the multiple clients using the data.
 
 ## DFS IO handler
diff --git a/docs/guide/content_rendering/queries_and_controllers/content_queries.md b/docs/guide/content_rendering/queries_and_controllers/content_queries.md
index eed4c2b97e..c74324120d 100644
--- a/docs/guide/content_rendering/queries_and_controllers/content_queries.md
+++ b/docs/guide/content_rendering/queries_and_controllers/content_queries.md
@@ -8,7 +8,7 @@ With content queries you can find and render specific content according to crite
 
 You can use queries to list or embed Content items, such as:
 
-- [children in a folder](../embed_and_list_content/list_content.md#children-query-type)
+- [children in a folder](../embed_and_list_content/list_content.md#list-children-with-query-type)
 - related articles
 - [most recent blog posts](custom_query_type.md)
 - recommended products
@@ -154,4 +154,4 @@ The identifier of the Content query Field must be matched by
 using the `'@EzSystems\EzPlatformQueryFieldType\eZ\ContentView\FieldDefinitionIdentifierMatcher'` matcher.
 
 Query results are provided to the template in the `items` variable.
-See [List content](../embed_and_list_content/list_content.md#content-query-field) for an example of using the Content query Field.
+See [List content](../embed_and_list_content/list_content.md#list-children-in-content-query-field) for an example of using the Content query Field.
diff --git a/docs/guide/content_rendering/queries_and_controllers/controllers.md b/docs/guide/content_rendering/queries_and_controllers/controllers.md
index 3f85037eb3..b358e0c996 100644
--- a/docs/guide/content_rendering/queries_and_controllers/controllers.md
+++ b/docs/guide/content_rendering/queries_and_controllers/controllers.md
@@ -16,7 +16,7 @@ You indicate which controller to use in the [content view configuration](../temp
 [[= include_file('code_samples/front/embed_content/src/Controller/RelationController.php', 2, 9) =]]
 ```
 
-For a full example of using a custom controller, see [Embed content](../embed_and_list_content/embed_content.md#custom-controller).
+For a full example of using a custom controller, see [Embed content](embed_content.md#embed-relations-with-a-custom-controller).
 
 If you do not want to use the default view controller and only use a custom one,
 use the same configuration, but do not provide the `template` key.
diff --git a/docs/guide/devops.md b/docs/guide/devops.md
index 17c801be46..f1a5f5093f 100644
--- a/docs/guide/devops.md
+++ b/docs/guide/devops.md
@@ -58,7 +58,7 @@ include Symfony cache use, and a [persistence cache](persistence_cache.md#persis
 
 !!! tip
 
-    For long-running scripts, see [Executing long-running console commands](performance.md#executing-long-running-console-commands).
+    For long-running scripts, see [Long-running console commands](performance.md#long-running-console-commands).
 
 If you are running out of memory and don't need to keep track of cache hits and misses, you can disable persistence cache logging, represented by the setting `parameters.ezpublish.spi.persistence.cache.persistenceLogger.enableCallLogging`. In `config_dev.yaml`:
 
diff --git a/docs/guide/file_management/binary_media_download.md b/docs/guide/file_management/binary_media_download.md
index ff9b95a810..5d9f05e28d 100644
--- a/docs/guide/file_management/binary_media_download.md
+++ b/docs/guide/file_management/binary_media_download.md
@@ -17,17 +17,17 @@ It accepts optional query parameters:
 - `version`: The content version number that the file is downloaded for. Requires the `content / read` permission for a published version and additionally `content / versionread` permission for an unpublished version. If not specified, uses the published version.
 - `inLanguage`: The language the file should be downloaded in. If not specified, the most prioritized language for the SiteAccess is used.
 
-The [`ibexa_render_field`](../content_rendering/twig_function_reference/field_twig_functions.md#ibexa_render_field) Twig helper by default generates a working link.
+The [`ez_render_field`](field_twig_functions.md#ez_render_field) Twig helper by default generates a working link.
 
 ## Download link generation
 
 To generate a direct download link for the `File` Field Type you have to create
-a [RouteReference](../content_rendering/urls_and_routes.md#routereference) with the `ibexa_route` helper, passing `content` and `File` Field identifier as parameters.
+a [RouteReference](../content_rendering/urls_and_routes.md#routereference) with the `ez_route` helper, passing `content` and `File` Field identifier as parameters.
 Optional parameter `inLanguage` may be used to specify File content translation.
 
 ```html+twig
-{% set routeReference = ibexa_route( 'ibexa.content.download', {'content': content, 'fieldIdentifier': 'file', 'inLanguage': content.prioritizedFieldLanguageCode  } ) %}
-<a href="{{ ibexa_path( routeReference ) }}">Download</a>
+{% set routeReference = ez_route( 'ez_content_download', {'content': content, 'fieldIdentifier': 'file', 'inLanguage': content.prioritizedFieldLanguageCode  } ) %}
+<a href="{{ ez_path( routeReference ) }}">Download</a>
 ```
 
 ## REST API: `uri` property
diff --git a/docs/guide/limitations.md b/docs/guide/limitations.md
index 3c9796e0b2..e806d3f484 100644
--- a/docs/guide/limitations.md
+++ b/docs/guide/limitations.md
@@ -126,7 +126,7 @@ Beyond that the following Limitations are available:
 `content/versionread`:
 
 - [Owner](limitation_reference.md#owner-limitation)
-- [Status](limitation_reference.md#status-limitation)
+- Status
 - [Location](limitation_reference.md#location-limitation)
 - [Subtree of Location](limitation_reference.md#subtree-of-location-limitation)
 - [State](limitation_reference.md#state-limitation)
@@ -134,7 +134,7 @@ Beyond that the following Limitations are available:
 `content/versionremove`:
 
 - [Owner](limitation_reference.md#owner-limitation)
-- [Status](limitation_reference.md#status-limitation)
+- Status
 - [Location](limitation_reference.md#location-limitation)
 - [Subtree of Location](limitation_reference.md#subtree-of-location-limitation)
 - [State](limitation_reference.md#state-limitation)
diff --git a/docs/guide/multisite/siteaccess_matching.md b/docs/guide/multisite/siteaccess_matching.md
index cb2b63a8b9..993f9f932c 100644
--- a/docs/guide/multisite/siteaccess_matching.md
+++ b/docs/guide/multisite/siteaccess_matching.md
@@ -60,7 +60,7 @@ The matching configuration is passed to `setMatchingConfiguration()`.
 - [`Map\Host`](#maphost)
 - [`Map\URI`](#mapuri)
 - [`Map\Port`](#mapport)
-- [`EzSystems\EzPlatformSiteFactory\SiteAccessMatcher`](#siteaccessmatcher)
+- [`EzSystems\EzPlatformSiteFactory\SiteAccessMatcher`](#ezsystemsezplatformsitefactorysiteaccessmatcher)
 
 ### `URIElement`
 
diff --git a/docs/guide/personalization/developer_guide/user_api.md b/docs/guide/personalization/developer_guide/user_api.md
index bf7bc3c72f..d88623216f 100644
--- a/docs/guide/personalization/developer_guide/user_api.md
+++ b/docs/guide/personalization/developer_guide/user_api.md
@@ -38,7 +38,7 @@ For the requests to function, you must provide the following parameters:
 
 |Parameter|Description|Value|
 |---|---|---|
-|`customerid`|Your customer ID, as defined when [enabling Personalization](../enabling_personalization.md#set-up-customer-credentials) (for example, "00000").|alphanumeric|
+|`customerid`|Your customer ID, as defined when [enabling Personalization](enabling_personalization.md#setting-up-customer-credentials) (for example, "00000").|alphanumeric|
 |`source`|An ID of the source of the specified user's metadata.|alphanumeric|
 |`userid`|An ID of the tracked user in the website (for example, an internal customer code, a session code or a cookie for anonymous users.|alphanumeric|
   
diff --git a/docs/guide/search/elastic.md b/docs/guide/search/elastic.md
index daa8109f73..b9805f5262 100644
--- a/docs/guide/search/elastic.md
+++ b/docs/guide/search/elastic.md
@@ -599,7 +599,7 @@ In your copy of the default template, change the pattern as follows:
 ```
 
 This pattern matches on English.
-For more information about specifying the pattern for your language, see [Define a template](#define-a-template).
+For more information about specifying the pattern for your language, see [Define a template](#create-config-for-language-specific-analyzer).
 
 ##### Create config for language specific analyzer
 
diff --git a/docs/migrating/migrating_from_ez_publish.md b/docs/migrating/migrating_from_ez_publish.md
index 26240b6c98..20a70e78ff 100644
--- a/docs/migrating/migrating_from_ez_publish.md
+++ b/docs/migrating/migrating_from_ez_publish.md
@@ -60,4 +60,4 @@ As eZ Platform introduced completely new user interfaces with greatly improved u
 - Write UI code for custom Field Types for the new JavaScript-based editorial interface, (see [Page blocks](../guide/content_rendering/render_content/render_page.md)
 - Adjust custom admin modules for the new Symfony-based admin interface
 
-For a detailed guide through these developments see [Upgrading from 5.4.x and 2014.11 to 16.xx](migrating_from_ez_publish_platform.md#upgrading-from-54x-and-201411-to-16xx) 
+For a detailed guide through these developments see [Upgrading from 5.4.x and 2014.11 to 16.xx](migrating_from_ez_publish_platform.md).
diff --git a/docs/migrating/migrating_from_ez_publish_platform.md b/docs/migrating/migrating_from_ez_publish_platform.md
index 99fc73ebab..073580e259 100644
--- a/docs/migrating/migrating_from_ez_publish_platform.md
+++ b/docs/migrating/migrating_from_ez_publish_platform.md
@@ -474,7 +474,7 @@ For date-based publisher and Form Builder, there are additional tables, you can
 
 ### Varnish *(optional)*
 
-If you use Varnish, the recommended Varnish (4 or higher) VCL configuration can be found in the [Using Varnish](../guide/cache/symfony_reverse_proxy.md#configure-varnish-or-fastly) page.
+If you use Varnish, the recommended Varnish (4 or higher) VCL configuration can be found in the [Using Varnish](symfony_reverse_proxy.md#configure-varnish-and-fastly) page.
 
 ### Web server configuration
 
diff --git a/docs/release_notes/ibexa_dxp_v3.3.md b/docs/release_notes/ibexa_dxp_v3.3.md
index 32feebf5b9..980bf7c330 100644
--- a/docs/release_notes/ibexa_dxp_v3.3.md
+++ b/docs/release_notes/ibexa_dxp_v3.3.md
@@ -87,4 +87,4 @@ See [list of changes in Symfony 5.2.](https://symfony.com/blog/symfony-5-2-curat
 ### Symfony 5.4
 
 The version v3.3.15 moves Ibexa DXP to Symfony 5.4.
-For more information, see [Symfony 5.4 documentation](https://symfony.com/releases/5.4) and [update documentation](../update_and_migration/from_3.3/update_from_3.3.md#3315).
\ No newline at end of file
+For more information, see [Symfony 5.4 documentation](https://symfony.com/releases/5.4) and [update documentation](../update_and_migration/from_3.3/update_from_3.3.md#v3315).
diff --git a/docs/tutorials/platform_beginner/3_customize_the_front_page.md b/docs/tutorials/platform_beginner/3_customize_the_front_page.md
index 7150d8dc21..b52b6f6d72 100644
--- a/docs/tutorials/platform_beginner/3_customize_the_front_page.md
+++ b/docs/tutorials/platform_beginner/3_customize_the_front_page.md
@@ -193,7 +193,7 @@ Before proceeding, ensure that the structure of the added files looks like this:
 
 In [[= product_name =]], you can add assets by using [Symfony Webpack Encore]([[= symfony_doc =]]/frontend.html#webpack-encore)
 — an integration of Webpack that enables you to build bundles of CSS stylesheets and JS scripts and add them to the project.
-For more details, see [importing assets from a bundle](../../guide/project_organization.md#importing-assets-from-a-bundle).
+For more details, see [importing assets from a bundle](import_assets_from_bundle.md).
 
 To create bundles, first, indicate which files to include in them.
 
diff --git a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
index ebe5f7cc57..ebbddce378 100644
--- a/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
+++ b/docs/update_and_migration/from_1.x_2.x/update_app_to_2.5.md
@@ -24,7 +24,7 @@ You need to install [Node.js](https://nodejs.org/en/) and [Yarn](https://yarnpkg
 In v2.5 it is still possible to use Assetic, like in earlier versions.
 However, if you are using the latest Bootstrap version, [`scssphp`](https://github.com/leafo/scssphp)
 will not compile correctly with Assetic.
-In this case, use Webpack Encore. See [Importing assets from a bundle](../../guide/project_organization.md#importing-assets-from-a-bundle) for more information.
+In this case, use Webpack Encore. See [Importing assets from a bundle](import_assets_from_bundle.md) for more information.
 
 If you experience issues during the update, see [Troubleshooting](../../getting_started/troubleshooting.md#cloning-failed-using-an-ssh-key).