diff --git a/docs/build-flavours/build-flavours.rst b/docs/build-flavours/build-flavours.rst
index b4c932cbe3c283e0e63b2ee465e6c3ff36eb1fc7..2d998d232c02e91d4973cf8264df02bb0abb22d3 100644
--- a/docs/build-flavours/build-flavours.rst
+++ b/docs/build-flavours/build-flavours.rst
@@ -18,14 +18,14 @@ initialization time for a specific kernel by passing the associated
 ``TEMPLATECONF`` configuration.
 
 All the available ``flavours`` are available as subdirectories of the
-``flavours`` directory in the root of the ``meta-ohos`` repository.
+``flavours`` directory in the root of the ``oniro`` repository.
 
 Generically, when configuring a new build, one should pass the flavour as
 ``TEMPLATECONF`` to the ``oe-init-build-env`` script:
 
 .. code-block:: console
 
-    $ TEMPLATECONF=../sources/meta-ohos/flavours/<FLAVOUR_NAME> . ./sources/poky/oe-init-build-env <BUILD_NAME>
+    $ TEMPLATECONF=../oniro/flavours/<FLAVOUR_NAME> . ./oe-core/oe-init-build-env <BUILD_NAME>
 
 Notes:
 
diff --git a/docs/build-flavours/freertos-flavour.rst b/docs/build-flavours/freertos-flavour.rst
index 74d17940f935a80b73bf5bdc545ff280277a38c1..eae9aa57fce7331e559f3b3f0b12b8a84931352d 100644
--- a/docs/build-flavours/freertos-flavour.rst
+++ b/docs/build-flavours/freertos-flavour.rst
@@ -23,7 +23,7 @@ Build steps example:
 
 .. code-block:: console
 
-    $ TEMPLATECONF=../sources/meta-ohos/flavours/freertos . ./sources/poky/oe-init-build-env build-ohos-freertos
+    $ TEMPLATECONF=../oniro/flavours/freertos . ./oe-core/oe-init-build-env build-ohos-freertos
     $ bitbake freertos-demo
 
 You can test the image built for the qemuarmv5 target by issuing:
diff --git a/docs/build-flavours/linux-flavour.rst b/docs/build-flavours/linux-flavour.rst
index 40638bd249399f792fd9ee4c8a5872afc1e6ca82..ea01895196e6f1965ced6618599d1ce9fd4ca003 100644
--- a/docs/build-flavours/linux-flavour.rst
+++ b/docs/build-flavours/linux-flavour.rst
@@ -32,7 +32,7 @@ Build steps example:
 
 .. code-block:: console
 
-    $ TEMPLATECONF=../sources/meta-ohos/flavours/linux . ./sources/poky/oe-init-build-env build-ohos-linux
+    $ TEMPLATECONF=../oniro/flavours/linux . ./oe-core/oe-init-build-env build-ohos-linux
     $ bitbake allscenarios-image-base
 
 You can test the image built for the qemux86-64 target by issuing:
diff --git a/docs/build-flavours/zephyr-flavour.rst b/docs/build-flavours/zephyr-flavour.rst
index d2dc85583b86696f1be1d9fd2f4faa737e0143ac..4bad933f8d8b6453769b10f6b35fa4031c782934 100644
--- a/docs/build-flavours/zephyr-flavour.rst
+++ b/docs/build-flavours/zephyr-flavour.rst
@@ -31,7 +31,7 @@ Build steps example:
 
 .. code-block:: console
 
-    $ TEMPLATECONF=../sources/meta-ohos/flavours/zephyr . ./sources/poky/oe-init-build-env build-ohos-zephyr
+    $ TEMPLATECONF=../oniro/flavours/zephyr . ./oe-core/oe-init-build-env build-ohos-zephyr
     $ bitbake zephyr-philosophers
 
 You can test the image built for the qemu-x86 target by issuing:
diff --git a/docs/ci/hidden-jobs/bitbake-workspace.rst b/docs/ci/hidden-jobs/bitbake-workspace.rst
index a31a504127ed73833ea28c7614669c09f9e60bf7..463fb1f27a5d50548dc24b676263e870e2dff0cd 100644
--- a/docs/ci/hidden-jobs/bitbake-workspace.rst
+++ b/docs/ci/hidden-jobs/bitbake-workspace.rst
@@ -22,7 +22,7 @@ CI_ONIRO_BUILD_FLAVOUR
 
 The name of the *flavour* of All Scenarios OS, which effectively picks the kernel
 type. This is used to select the initial BitBake configuration template.
-Templates are stored in the **meta-ohos** repository.
+Templates are stored in the **oniro** repository.
 
 Available values are ``linux``, ``zephyr`` and ``freertos``. There is no
 default value. This variable must be set by a derivative job, it is usually set
diff --git a/docs/ci/hidden-jobs/build-recipe.rst b/docs/ci/hidden-jobs/build-recipe.rst
index a4827566aa3716473539e05085fd09d617e244cc..e6406f86a2690563c14abc650eb6977b8270649b 100644
--- a/docs/ci/hidden-jobs/build-recipe.rst
+++ b/docs/ci/hidden-jobs/build-recipe.rst
@@ -39,5 +39,5 @@ Pick the desired ``CI_ONIRO_BUILD_FLAVOUR``, ``CI_ONIRO_RECIPE_NAME`` and
 ``MACHINE``.  For discussion of ``CI_ONIRO_BUILD_FLAVOUR`` refer to the
 :doc:`bitbake-workspace` job.  ``CI_ONIRO_RECIPE_NAME`` is any BitBake recipe
 available in the selected flavour. ``MACHINE`` is desired machine name.
-Supported values are documented alongside each flavour in the *meta-ohos*
+Supported values are documented alongside each flavour in the *oniro*
 repository.
diff --git a/docs/hardware-support/boards/96b-nitrogen.rst b/docs/hardware-support/boards/96b-nitrogen.rst
index 1968ad42f0bff4b6036f7177a1e4f0168dda020b..c2a28f54a95ae7ddaece8c07b102a8d555a3411b 100644
--- a/docs/hardware-support/boards/96b-nitrogen.rst
+++ b/docs/hardware-support/boards/96b-nitrogen.rst
@@ -46,7 +46,7 @@ Building an application
 
 .. code-block:: console
 
-   $ TEMPLATECONF=../sources/meta-ohos/flavours/zephyr . ./sources/poky/oe-init-build-env build-ohos-zephyr
+   $ TEMPLATECONF=../oniro/flavours/zephyr . ./oe-core/oe-init-build-env build-ohos-zephyr
 
 * You will find yourself in the newly created build directory. Call bitbake to build the image. The supported image name is zephyr-philosophers.
 
diff --git a/docs/hardware-support/virtual-boards/qemux86.rst b/docs/hardware-support/virtual-boards/qemux86.rst
index 4b85c44184271e0c454d6b5bb678ee90a53323c2..a91253b815fe4d723e4d4b46d0735ec33a01d735 100644
--- a/docs/hardware-support/virtual-boards/qemux86.rst
+++ b/docs/hardware-support/virtual-boards/qemux86.rst
@@ -34,7 +34,7 @@ Build steps
 
 .. code-block:: console
 
-   $ TEMPLATECONF=../sources/meta-ohos/flavours/linux . ./sources/poky/oe-init-build-env build-ohos-linux
+   $ TEMPLATECONF=../oniro/flavours/linux . ./oe-core/oe-init-build-env build-ohos-linux
 
 2. You will find yourself in the newly created build directory. Call *bitbake*
    to build the image. For example, if you are using *allscenarios-image-base*