diff --git a/docs/content_model.md b/docs/content_model.md
index 913e8bb9..f6769f62 100644
--- a/docs/content_model.md
+++ b/docs/content_model.md
@@ -1,10 +1,10 @@
 # Content Model
 
-At the heart of eZ Platform is a repository that stores all content.
-In eZ Platform everything is a Content item — not just the actual pages displayed in the website,
+At the heart of [[= product_name_oss =]] is a repository that stores all content.
+In [[= product_name_oss =]] everything is a Content item — not just the actual pages displayed in the website,
 but also all media (images, videos, etc.) and User accounts.
 
-eZ Platform lets you customize and adapt the content model depending on your needs and the type of website you create.
+[[= product_name_oss =]] lets you customize and adapt the content model depending on your needs and the type of website you create.
 
 Depending on your organization, if you are an editor or a content creator,
 it is possible that the content model for your installation has already been created by your administrator or content manager.
@@ -18,12 +18,9 @@ Whenever you create a new Content item, you must choose its Content Type.
 The Content Type defines what Fields will be available in the Content item.
 A Content item may only contain the Fields that are defined in the Content Type.
 
-eZ Platform allows you to create, edit, and delete Content Types and their Fields.
+[[= product_name_oss =]] allows you to create, edit, and delete Content Types and their Fields.
 A clean installation contains a few basic Content Types.
 
-To see what a larger set of Content Types and their Fields looks like in practice, you can take a look at the Demo Bundle.
-[Demo is a separate Enterprise installation with a sample website](https://github.com/ezsystems/ezplatform-ee-demo) in which you can preview different features of eZ Platform.
-
 ## Content items
 
 A **Content item** is a single piece of content: an article, a blog post, an image, a product, etc.
@@ -72,7 +69,7 @@ e.g. Text line, Rich text, Email, Author list, Content relation, Map location, F
 
 **Fields and Field Types:**
 
-- eZ Platform comes with a collection of essential Field Types.
+- [[= product_name_oss =]] comes with a collection of essential Field Types.
 - It is possible to extend the system by creating custom Field Types for special needs.
 
 ## Content and media
@@ -89,7 +86,7 @@ They represent three categories of Content Types that you can create
 
 ### Content browser
 
-During your work with eZ Platform you might need to select content from the Repository.
+During your work with [[= product_name_oss =]] you might need to select content from the Repository.
 This happens for example when you want to move or copy a Content item, embed an image, link two Content items, etc.
 In such cases you use the **Content Browser**.
 
diff --git a/docs/creating_content_advanced.md b/docs/creating_content_advanced.md
index 149cee43..7340a9d7 100644
--- a/docs/creating_content_advanced.md
+++ b/docs/creating_content_advanced.md
@@ -48,7 +48,7 @@ or different language versions to visitors from different countries.
 
 See [Site Factory](site_organization/site_factory.md) for more information about setting up sites.
 
-!!! enterprise
+!!! dxp
 
     ## Forms
 
diff --git a/docs/creating_content_basic.md b/docs/creating_content_basic.md
index f1e82168..98a054a9 100644
--- a/docs/creating_content_basic.md
+++ b/docs/creating_content_basic.md
@@ -16,9 +16,9 @@ In this way you can upload files such as images, videos, PDF documents, etc.
 If you choose the first three options, you have to select the Content Type first.
 When uploading files, the Content Type will be chosen automatically.
 
-!!! enterprise
+!!! dxp
 
-    If you are using eZ Enterprise Edition,
+    If you are using [[= product_name_ee =]],
     you will have the *Page* Content Type available for selection.
     Pages are edited in the Page Builder, see [working with Page](working_with_page.md) section.
 
@@ -33,7 +33,7 @@ A *Location* Field is a point on the map. You can type the place name, enter its
 
 !!! note "Autosave"
 
-    To help you preserve your work, eZ Platform saves drafts of Content items automatically.
+    To help you preserve your work, [[= product_name_oss =]] saves drafts of Content items automatically.
     For more information, see [Autosave](publishing/publishing.md#autosave).
 
 !!! caution "Draft and autosave limitation"
diff --git a/docs/css/custom.css b/docs/css/custom.css
index 9931b9ef..c199b880 100644
--- a/docs/css/custom.css
+++ b/docs/css/custom.css
@@ -221,8 +221,9 @@ html .md-footer-meta.md-typeset a {
     border: .4rem solid;
 }
 
-/* Enterprise */
+/* DXP */
 
+.admonition.dxp .admonition-title,
 .admonition.enterprise .admonition-title {
     padding-left: 1.2rem;
 }
@@ -231,6 +232,7 @@ html .md-footer-meta.md-typeset a {
     padding-left: 3.8rem;
 }
 
+.admonition.dxp, .admonition.dxp>.admonition-title, 
 .admonition.enterprise, .admonition.enterprise>.admonition-title {
     border-color: var(--enterprise-border);
     background-color: #ffffff;
@@ -258,7 +260,8 @@ html .md-footer-meta.md-typeset a {
 }
 
 .md-typeset .admonition.note>.admonition-title:before, .md-typeset .admonition.tip>.admonition-title:before,
-.md-typeset .admonition.caution>.admonition-title:before, .md-typeset .admonition.enterprise>.admonition-title:before,
+.md-typeset .admonition.caution>.admonition-title:before, .md-typeset .admonition.dxp>.admonition-title:before,
+.md-typeset .admonition.enterprise>.admonition-title:before,
 .md-typeset details.note>summary:before, .md-typeset details.tip>summary:before, .md-typeset details.caution>summary:before {
     content: "";
 }
@@ -276,7 +279,8 @@ html .md-footer-meta.md-typeset a {
 }
 
 .md-typeset .admonition.note>.admonition-title, .md-typeset .admonition.tip>.admonition-title,
-.md-typeset .admonition.caution>.admonition-title, .md-typeset .admonition.enterprise>.admonition-title,
+.md-typeset .admonition.caution>.admonition-title, .md-typeset .admonition.dxp>.admonition-title,
+.md-typeset .admonition.enterprise>.admonition-title,
 .md-typeset details.tip>summary, .md-typeset details.note>summary, .md-typeset details.caution>summary {
     background-repeat: no-repeat;
     background-size: 24px;
@@ -288,7 +292,8 @@ html .md-footer-meta.md-typeset a {
 /* General admonitions */
 
 .md-typeset .admonition.caution>.admonition-title, .md-typeset .admonition.note>.admonition-title,
-.md-typeset .admonition.tip>.admonition-title, .md-typeset .admonition.enterprise>.admonition-title,
+.md-typeset .admonition.tip>.admonition-title, .md-typeset .admonition.dxp>.admonition-title,
+.md-typeset .admonition.enterprise>.admonition-title,
 .md-typeset details.tip, .md-typeset details.tip>summary,
 .md-typeset details.note, .md-typeset details.note>summary {
     background-color: #ffffff;
diff --git a/docs/faq.md b/docs/faq.md
index 84751577..6fab666c 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -4,15 +4,15 @@
 
 ### Product
 
-**What is the difference between eZ Platform and eZ Enterprise Edition?**
+**What is the difference between [[= product_name_oss =]] and [[= product_name_ee =]]?**
 
-eZ Platform is open-source. eZ Enterprise bases on eZ Platform, but features new functionalities.
+[[= product_name_oss =]] is open-source. [[= product_name_ee =]] bases on [[= product_name_oss =]], but features new functionalities.
 
 **Which parts of eZ are open source and which are commercial?**
 
-eZ Platform is fully open-source and available at [GitHub](https://github.com/ezsystems/ezplatform).
+[[= product_name_oss =]] is fully open-source and available at [GitHub](https://github.com/ezsystems/ezplatform).
 
-eZ Enterprise is a commercial solution.
+[[= product_name_ee =]] is a commercial solution.
 
 **What technologies do I need to know to use eZ?**
 
@@ -20,12 +20,6 @@ If you are using eZ as an editor or content manager, you do not need to have any
 
 Installing and configuring eZ requires at least basic familiarity with web development. Some more advanced customization possibilities may require programming skills (such as knowledge of PHP or Twig).
 
-**What is Demo Bundle?**
-
-Demo Bundle is a sample website you can get with your installation of eZ. There are two different Demo Bundles: one for eZ Platform and one for eZ Enterprise.
-
-The Bundle contains a small number of initial preset Content Types. You can apply them directly to your website or use them as a starting point to create your own Content Types.
-
 **What are the technical requirements for installing eZ?**
 
 See [requirements](https://doc.ezplatform.com/en/latest/getting_started/requirements_and_system_configuration/) for the configuration required for installing eZ.
@@ -42,7 +36,7 @@ eZ offers two different work modes: **Content mode** and **Page mode**.
 
 **What is Content mode?**
 
-Content mode gives you the access to the content repository. It is mostly the role of eZ Platform, but for users of eZ Enterprise it is enriched with specific Studio functionalities.
+Content mode gives you the access to the content repository. It is mostly the role of [[= product_name_oss =]], but for users of [[= product_name_ee =]] it is enriched with specific Studio functionalities.
 
 Its focus is on creating, modifying, organizing, and publishing Content items. Content mode is an interface for the repository, a place in which eZ stores all the content.
 
@@ -52,7 +46,7 @@ You can preview any Content within the tree, but the Content mode does not allow
 
 **What is Page mode?**
 
-Page mode allows you to manage website pages and website content from the pages themselves. It is only available for eZ Enterprise users. It can be enriched by eZ Services functionalities for users subscribed to them.
+Page mode allows you to manage website pages and website content from the pages themselves. It is only available for [[= product_name_ee =]] users. It can be enriched by eZ Services functionalities for users subscribed to them.
 
 It provides the front-end editing, that is modifying pages directly from their preview. Using a special Timeline toolbar, you can also preview and modify the content of a page at a future date.
 
@@ -117,7 +111,7 @@ See [Design](https://doc.ezplatform.com/en/master/guide/design_engine/) for more
 
 **Where is the technical documentation?**
 
-Technical documentation for eZ Platform and eZ Enterprise is available in [eZ Developer documentation](https://doc.ezplatform.com).
+Technical documentation for [[= product_name_oss =]] and [[= product_name_ee =]] is available in [eZ Developer documentation](https://doc.ezplatform.com).
 
 You can find the technical documentation for eZ Publish 5.x (an earlier version) in [eZ Publish 5.x Developer Documentation](https://doc.ez.no/display/EZP/eZ+Publish+5.x+Developer+Documentation).
 
@@ -131,24 +125,24 @@ If you need more questions answered, have a look at our [Support and Maintenance
 
 If you would like to share your questions or ideas with other eZ users, you can do it on:
 
-- [eZ Platform portal](https://ezplatform.com/).
+- [[[= product_name_oss =]] portal](https://ezplatform.com/).
 - [eZ Community Slack channel](http://ez-community-on-slack.herokuapp.com/) where you can discuss the software and ask for help or support.
 
 **How can I contact eZ representatives?**
 
 If you would like to contact eZ or any of our offices, you can find the [contact information here](http://ez.no/About-eZ/Contact-Us).
 
-## eZ Platform
+## [[= product_name_oss =]]
 
 ### Product
 
-**Where can I get eZ Platform?**
+**Where can I get [[= product_name_oss =]]?**
 
-You can download the current version of eZ Platform from: <https://ezplatform.com>.
+You can download the current version of [[= product_name_oss =]] from: <https://ezplatform.com>.
 
-**How do I install eZ Platform?**
+**How do I install [[= product_name_oss =]]?**
 
-Here is a [guide to installing eZ products](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/) (covering both eZ Platform and eZ Enterprise).
+Here is a [guide to installing eZ products](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/) (covering both [[= product_name_oss =]] and [[= product_name_ee =]]).
 
 ### Content model
 
@@ -207,7 +201,7 @@ You can limit the visibility of a Content item by hiding the Location it is plac
 
 **How can I preview content?**
 
-In Content mode you cannot edit Content while previewing it (this option is available only in eZ Enterprise).
+In Content mode you cannot edit Content while previewing it (this option is available only in [[= product_name_ee =]]).
 
 You can preview your content while editing it by clicking one of the icons under **Preview** in the action bar.
 
@@ -221,17 +215,17 @@ on the website or through the API.
 
 The **Publish** function allows you to publish the final version of the content object. As a result, the working copy turns into the published version that is visible on the website and available through the API as a publish content.
 
-## eZ Enterprise
+## [[= product_name_ee =]]
 
 ### Product
 
-**Does eZ Enterprise contain all features of eZ Platform?**
+**Does [[= product_name_ee =]] contain all features of [[= product_name_oss =]]?**
 
-Yes, eZ Enterprise is based on eZ Platform and contains it with all of its functionalities.
+Yes, [[= product_name_ee =]] is based on [[= product_name_oss =]] and contains it with all of its functionalities.
 
-**What features does eZ Enterprise offer that are unavailable in eZ Platform?**
+**What features does [[= product_name_ee =]] offer that are unavailable in [[= product_name_oss =]]?**
 
-eZ Enterprise offers a number of additional features aside from what is available in eZ Platform.
+[[= product_name_ee =]] offers a number of additional features aside from what is available in [[= product_name_oss =]].
 
 The key of them are:
 
@@ -239,9 +233,9 @@ The key of them are:
 - Intuitive Page mode editing
 - Workflow functionality for managing the review process
 
-**How do I install eZ Enterprise?**
+**How do I install [[= product_name_ee =]]?**
 
-Here is a [guide to installing eZ products](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/) (covering both eZ Platform and eZ Enterprise).
+Here is a [guide to installing eZ products](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/) (covering both [[= product_name_oss =]] and [[= product_name_ee =]]).
 
 ### Editing
 
diff --git a/docs/getting_started.md b/docs/getting_started.md
index adf9c0fd..c5ffce27 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -1,21 +1,21 @@
 # Getting started
 
-eZ Platform is an open-source, Symfony-based CMS.
+[[= product_name_oss =]] is an open-source, Symfony-based CMS.
 
-eZ Platform consists of the technical platform for developers
+[[= product_name_oss =]] consists of the technical platform for developers
 (including a Web framework, APIs and a Content Repository)
 and provides a user interface to work with the content and administer the platform.
 
-!!! enterprise "eZ Platform Enterprise Edition"
+!!! dxp "[[= product_name_ee =]]"
 
-    eZ Platform Enterprise Edition is a commercial product built on top of the open-source eZ Platform.
+    [[= product_name_ee =]] is a commercial product built on top of the open-source [[= product_name_oss =]].
     It offers additional functionalities and enhancements to the editing experience.
 
-    eZ Enterprise provides advanced editorial capabilities such as [in-page editing](working_with_page.md), creation of [block-based Pages](working_with_page.md#adding-blocks), [editorial workflow](publishing/editorial_workflow.md), etc.
+    [[= product_name_ee =]] provides advanced editorial capabilities such as [in-page editing](working_with_page.md), creation of [block-based Pages](working_with_page.md#adding-blocks), [editorial workflow](publishing/editorial_workflow.md), etc.
 
 ## Quick start
 
-eZ Platform must be [installed by administrator](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/).
+[[= product_name_oss =]] must be [installed by administrator](https://doc.ezplatform.com/en/latest/getting_started/install_ez_platform/).
 They should provide you with the address of the installation.
 
 To access the Back Office (the editor interface), add `/admin` to this address.
@@ -43,8 +43,8 @@ The top bar allows you to move between important sections of the application.
 
 - **Content** gives you access to the content Repository.
 It lets you navigate the Content Tree, create, edit, move, copy, delete content, etc.
-- **Site** enables you to create and edit block-based Pages and manage multiple sites. It is only available for eZ Enterprise users.
-- **Forms** enables you to place a survey, questionnaire, sign-up form, etc. on your website. It is only available for eZ Enterprise users.
+- **Site** enables you to create and edit block-based Pages and manage multiple sites. It is only available for [[= product_name_ee =]] users.
+- **Forms** enables you to place a survey, questionnaire, sign-up form, etc. on your website. It is only available for [[= product_name_ee =]] users.
 - **Admin** is the administration panel where you can manage Users, Sections, permissions, etc.
 
 ### User settings
diff --git a/docs/index.md b/docs/index.md
index 5dd221e9..257ac504 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,9 +1,9 @@
-# eZ Platform user documentation
+# Ibexa user documentation
 
-This is the hub for eZ Platform documentation for editors and content managers.
-You can find here information on how to create, edit, manage, and publish content in eZ Platform.
+This is the hub for [[= product_name_oss =]] documentation for editors and content managers.
+You can find here information on how to create, edit, manage, and publish content in [[= product_name_oss =]].
 
-**New to eZ Platform? See [Getting Started](getting_started.md)**
+**New to [[= product_name_oss =]]? See [Getting Started](getting_started.md)**
 
 **Got a question? See the [FAQ](faq.md)**
 
diff --git a/docs/managing_shop_content/embed_product.md b/docs/managing_shop_content/embed_product.md
index b3b3f7e4..8f38b585 100644
--- a/docs/managing_shop_content/embed_product.md
+++ b/docs/managing_shop_content/embed_product.md
@@ -15,7 +15,7 @@ If you want to embed more than one product inside a RichText Field, use the Prod
 
 ### Box type
 
-eZ Commerce offers the following types of box designs:  
+[[= product_name_com =]] offers the following types of box designs:  
 
 - Slider
 
diff --git a/docs/managing_shop_content/landingpages.md b/docs/managing_shop_content/landingpages.md
index 52f81d6d..ede235bb 100644
--- a/docs/managing_shop_content/landingpages.md
+++ b/docs/managing_shop_content/landingpages.md
@@ -1,12 +1,12 @@
 # Pages in the shop
 
-eZ Commerce has at least one Landing Page which is the homepage. This document describes how to setup and modify Landing Pages. 
+[[= product_name_com =]] has at least one Landing Page which is the homepage. This document describes how to setup and modify Landing Pages. 
 
 ## Landing Page tool
 
 ![](img/landingpage_tool.png)
 
-eZ Commerce adds the following blocks to the blocks available in eZ Platform:
+[[= product_name_com =]] adds the following blocks to the blocks available in [[= product_name_oss =]]:
 
 - Last viewed
 - Bestsellers
diff --git a/docs/managing_shop_content/legal_documents.md b/docs/managing_shop_content/legal_documents.md
index 802f8051..06342a66 100644
--- a/docs/managing_shop_content/legal_documents.md
+++ b/docs/managing_shop_content/legal_documents.md
@@ -24,7 +24,7 @@ The cancellation policy text is added to the confirmation email from the shop.
 
 ## Adding identifier to "Terms & Conditions"
 
-eZ Commerce extends the built-in Article Content Type with the Identifier Field.
+[[= product_name_com =]] extends the built-in Article Content Type with the Identifier Field.
 With this identifier you can fetch the article and render the content using a controller.
 
 ### Controller
diff --git a/docs/publishing/advanced_publishing_options.md b/docs/publishing/advanced_publishing_options.md
index a82a4a76..ac7c4caa 100644
--- a/docs/publishing/advanced_publishing_options.md
+++ b/docs/publishing/advanced_publishing_options.md
@@ -1,6 +1,6 @@
 # Advanced publishing options
 
-!!! enterprise
+!!! dxp
 
     There are three ways in which you can schedule content to be published in the future:
 
diff --git a/docs/publishing/editorial_workflow.md b/docs/publishing/editorial_workflow.md
index 3f851d05..cf74f16a 100644
--- a/docs/publishing/editorial_workflow.md
+++ b/docs/publishing/editorial_workflow.md
@@ -1,6 +1,6 @@
 # Editorial workflow
 
-!!! enterprise
+!!! dxp
 
     Using editorial workflow you can pass content between different stages in a preconfigured flow.
     Typically, the stages correspond to different teams or departments that contribute to content
diff --git a/docs/publishing/publishing.md b/docs/publishing/publishing.md
index 2cc4d3ee..7cd23d16 100644
--- a/docs/publishing/publishing.md
+++ b/docs/publishing/publishing.md
@@ -29,7 +29,7 @@ Note that you cannot edit an unpublished draft created by another user.
 
 ### Autosave
 
-While you edit a Content item or product, eZ Platform saves your work automatically to help you preserve the progress in an event of a failure.
+While you edit a Content item or product, [[= product_name_oss =]] saves your work automatically to help you preserve the progress in an event of a failure.
 To recover your work, open the most recent draft in the **Versions** tab of the Content item.
 Alternatively, open the most recent draft of your work on the **My dashboard** page, the **Drafts** table.
 
@@ -58,7 +58,7 @@ You can view all versions of a Content item in the **Versions** tab.
 
 ![All versions of a Content item](img/content_item_versions.png "All versions of a Content item")
 
-!!! enterprise
+!!! dxp
 
     #### Comparing versions
 
diff --git a/docs/shop_administration/manage_orders.md b/docs/shop_administration/manage_orders.md
index 05d93e9e..85df1d9e 100644
--- a/docs/shop_administration/manage_orders.md
+++ b/docs/shop_administration/manage_orders.md
@@ -2,7 +2,7 @@
 
 ## Order management
 
-eZ Commerce provides a list of all orders in **eZ Commerce** > **Order Management**.
+[[= product_name_com =]] provides a list of all orders in **eCommerce** > **Order Management**.
 
 ![](img/order_management1.png)
 
@@ -50,7 +50,7 @@ but you can still check orders in this section.
 
 ### Lost orders
 
-If the ERP system is not running at the moment, eZ Commerce can store the orders and retransmit them when the ERP is working.
+If the ERP system is not running at the moment, [[= product_name_com =]] can store the orders and retransmit them when the ERP is working.
 The orders are stored in a database table and marked for retransmission. The shop records the number of retries.
 By default the maximum number is 3 (`siso_checkout.default.max_failed_order`).
 
diff --git a/docs/shop_administration/manage_prices_and_stock.md b/docs/shop_administration/manage_prices_and_stock.md
index 8c5ee1a8..a1722c98 100644
--- a/docs/shop_administration/manage_prices_and_stock.md
+++ b/docs/shop_administration/manage_prices_and_stock.md
@@ -21,7 +21,7 @@ In addition, prices can vary per customer group.
 Currency is configured per country in the [configuration settings](https://doc.ezplatform.com/en/master/guide/configuration/configuration.md#currencies-used-per-country).
 
 If a product has a price for a product and a currency, this price is displayed in the shop.
-If no price for a currency is set in a shop, eZ Commerce offers two possibilities, configured per shop:
+If no price for a currency is set in a shop, [[= product_name_com =]] offers two possibilities, configured per shop:
 
 - Calculate the price for the requested currency using the base price defined in the product
 (using the base currency setup for the installation) and an exchange rate defined in the configuration
diff --git a/docs/shop_administration/manage_products_and_categories_with_the_ez_dataprovider.md b/docs/shop_administration/manage_products_and_categories_with_the_ez_dataprovider.md
index ce926dd6..3b13a5bc 100644
--- a/docs/shop_administration/manage_products_and_categories_with_the_ez_dataprovider.md
+++ b/docs/shop_administration/manage_products_and_categories_with_the_ez_dataprovider.md
@@ -26,7 +26,7 @@ While editing a product the preview displays how the product looks on desktops o
 
 ## Product variants
 
-eZ Commerce offers one or two level variants. A variant can be added directly in the product view.
+[[= product_name_com =]] offers one or two level variants. A variant can be added directly in the product view.
 
 There are three preconfigured variant types: Color, Size, and Color and Size.
 
@@ -36,7 +36,7 @@ The list of variant types can be extended in the configuration.
 
 ## Product assets
 
-eZ Commerce supports assets per product (not per variant).
+[[= product_name_com =]] supports assets per product (not per variant).
 By default a product can have one main image and up to three additional images,
 one PDF, and one link to a video (e.g. YouTube).
 
diff --git a/docs/shop_administration/permissions.md b/docs/shop_administration/permissions.md
index 80a6d309..b8d2e453 100644
--- a/docs/shop_administration/permissions.md
+++ b/docs/shop_administration/permissions.md
@@ -1,6 +1,6 @@
 # Permissions
 
-By default eZ Commerce offers the following predefined Roles:
+By default [[= product_name_com =]] offers the following predefined Roles:
 
 | Role   | Functions   |
 | -------| ------------|
@@ -8,7 +8,7 @@ By default eZ Commerce offers the following predefined Roles:
 | Ecommerce checkout         | Allows the user to go through the checkout and place an order.|
 | Ecommerce registered users | Allows the user to manage the accounts of the registered users. |
 
-## List of available eZ Commerce modules and functions
+## List of available [[= product_name_com =]] modules and functions
 
 |Name|Description|
 |--- |--- |
diff --git a/docs/shop_administration/shop_administration.md b/docs/shop_administration/shop_administration.md
index 65e4955c..41f60505 100644
--- a/docs/shop_administration/shop_administration.md
+++ b/docs/shop_administration/shop_administration.md
@@ -1,6 +1,6 @@
 # Shop administration
 
-eZ Commerce provides the following eCommerce functions in the top menu of the backend.
+[[= product_name_com =]] provides the following eCommerce functions in the top menu of the backend.
 
 Depending on the chosen data provider and whether an ERP is connected, some tabs may contain no data.
 
diff --git a/docs/shop_administration/translations.md b/docs/shop_administration/translations.md
index 4d7ad64e..c3dbf64b 100644
--- a/docs/shop_administration/translations.md
+++ b/docs/shop_administration/translations.md
@@ -2,7 +2,7 @@
 
 ## Text modules
 
-Text module is a special Content item in eZ Commerce.
+Text module is a special Content item in [[= product_name_com =]].
 It enables the shop owner or editor to translate some of the text information in the shop using the Online Editor.
 
 Text modules are used for some short explanatory texts in the shop.
diff --git a/docs/site_organization/organizing_the_content.md b/docs/site_organization/organizing_the_content.md
index f8c4e2d9..e2a989e8 100644
--- a/docs/site_organization/organizing_the_content.md
+++ b/docs/site_organization/organizing_the_content.md
@@ -102,9 +102,9 @@ You can hide a Content item by clicking **Hide** in the menu.
 
 ![Hide content icon](img/hide_content_icon.png)
 
-!!! enterprise
+!!! dxp
 
-    When you click **Hide** in Enterprise, you can choose to **Hide later**
+    When you click **Hide** in [[= product_name_ee =]], you can choose to **Hide later**
     and select and date and time when the Content item will be hidden:
 
     ![Schedule hiding panel](img/schedule_hiding.png)
@@ -119,7 +119,7 @@ in all of its Locations.
 In your site, you can manage external URL addresses and URL wildcards.
 You do this in the Back Office, **Admin** tab, the **URL Management** node.
 
-For more information about URL management, see the [eZ Platform Developer Documentation.](https://doc.ezplatform.com/en/latest/guide/url_management).
+For more information about URL management, see the [Ibexa Developer Documentation.](https://doc.ezplatform.com/en/latest/guide/url_management).
 
 ### Link manager
 
diff --git a/docs/site_organization/organizing_the_site.md b/docs/site_organization/organizing_the_site.md
index 46a26c24..5f3688a7 100644
--- a/docs/site_organization/organizing_the_site.md
+++ b/docs/site_organization/organizing_the_site.md
@@ -70,7 +70,7 @@ to have relations only to Content items of a specific, or any Content Type.
 
 ## Users
 
-Users in eZ Platform are treated the same way as other Content items.
+Users in [[= product_name_oss =]] are treated the same way as other Content items.
 They are organized in groups, which helps you manage them and their permissions.
 
 You can view all User Groups and Users in the **Admin Panel** by selecting **Users**.
@@ -92,7 +92,7 @@ for example: `www.my-site.com/register`. By default, new Users created in this w
 
 ## Permissions
 
-Overview of the permission system in eZ Platform is best presented using an example.
+Overview of the permission system in [[= product_name_oss =]] is best presented using an example.
 
 ### Example of a permissions system
 
diff --git a/docs/site_organization/site_factory.md b/docs/site_organization/site_factory.md
index 552db8e8..e2402e92 100644
--- a/docs/site_organization/site_factory.md
+++ b/docs/site_organization/site_factory.md
@@ -1,6 +1,6 @@
 # Site Factory
 
-!!! enterprise
+!!! dxp
 
     The Site Factory enables you to easily create and manage multiple sites in different languages from one place.
     All the sites can be kept in the Repository of your installation.
diff --git a/docs/site_organization/working_with_page.md b/docs/site_organization/working_with_page.md
index d99b5f48..406d8b74 100644
--- a/docs/site_organization/working_with_page.md
+++ b/docs/site_organization/working_with_page.md
@@ -1,6 +1,6 @@
 # Working with Page
 
-!!! enterprise
+!!! dxp
 
     **Page** is a special Content Type that contains zones onto which you can drop different dynamic blocks.
     You can edit it to personalize the layout and contents of your website.
@@ -26,7 +26,7 @@
 
     !!! note "Autosave"
 
-        To help you preserve your work, eZ Platform saves drafts of Content items automatically.
+        To help you preserve your work, [[= product_name_oss =]] saves drafts of Content items automatically.
         For more information, see [Autosave](../publishing/publishing.md#autosave).
 
     ## Editing Page
@@ -72,12 +72,12 @@
     Do not worry about placing blocks in the proper place from the start.
     You can reorder them at any time by dragging and dropping them in the desired location.
 
-    eZ Enterprise comes with a set of ready-to-use Page blocks,
+    [[= product_name_ee =]] comes with a set of ready-to-use Page blocks,
     but [developers can add their own](https://doc.ezplatform.com/en/master/guide/extending_page/#creating-page-blocks).
 
     ![Elements menu](img/elements_menu.png "Elements menu")
 
-    The blocks provided with a clean installation of eZ Enterprise are:
+    The blocks provided with a clean installation of [[= product_name_ee =]] are:
 
     |Block|Description|
     |-----|-----------|
@@ -107,7 +107,7 @@
     The settings available in the **Basic** tab are tailored to the block's content.
 
 
-    The remaining tabs contain parameters common to all blocks provided with eZ Enterprise.
+    The remaining tabs contain parameters common to all blocks provided with [[= product_name_ee =]].
     Use them to modify the layout and visibility of a block. For details, see [Advanced publishing options](/publishing/advanced_publishing_options.md).
 
 
diff --git a/material/base.html b/material/base.html
index cbcd9935..172706dd 100644
--- a/material/base.html
+++ b/material/base.html
@@ -1,7 +1,7 @@
 {% import "partials/language.html" as lang with context %}
 
 {% set config = {
-  'site_name': 'eZ Platform User Documentation',
+  'site_name': 'Ibexa User Documentation',
   'repo_url': 'https://github.com/ezsystems/user-documentation',
   'copyright': 'Copyright 1999-2020 Ibexa AS and others',
   'plugins': config.plugins,
diff --git a/mkdocs.yml b/mkdocs.yml
index 4f6458ce..89966d5e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,8 +1,8 @@
-site_name: eZ Platform User Documentation
+site_name: Ibexa User Documentation
 repo_url: https://github.com/ezsystems/user-documentation
 copyright: "Copyright 1999-2020 Ibexa and others"
 nav:
-    - 'eZ Platform User Documentation': 'index.md'
+    - 'Ibexa User Documentation': 'index.md'
     - 'Getting started': 'getting_started.md'
     - 'Content model': 'content_model.md'
     - 'Creating content – basic': 'creating_content_basic.md'
@@ -81,10 +81,14 @@ extra:
   append_bootstrap: []
 
   related_docs:
-    - title: 'eZ Platform User Documentation'
+    - title: 'Ibexa User Documentation'
       url: '/projects/userguide'
-    - title: 'eZ Platform Developer Documentation'
+    - title: 'Ibexa Developer Documentation'
       url: '/'
+  # Global variables
+  product_name_oss: 'Ibexa Platform'
+  product_name_ee: 'Ibexa DXP'
+  product_name_com: 'Ibexa Commerce'
 
 extra_css:
   - fonts/MavenPro.css