diff --git a/docs/ci/hidden-jobs/aggregate-docs.rst b/docs/ci/hidden-jobs/aggregate-docs.rst
index ba7f00c20dd5a8335d7c9a6adae0f40e45c83cb1..bb7538117d5562c5f85abc7ba5736daa4aa5933e 100644
--- a/docs/ci/hidden-jobs/aggregate-docs.rst
+++ b/docs/ci/hidden-jobs/aggregate-docs.rst
@@ -7,9 +7,9 @@
 ===============
 
 The ``.aggregate-docs`` job triggers a build of the aggregated documentation of
-All Scenarios OS.
+Oniro OS.
 
-All Scenarios OS documentation is maintained in an unusual way. Individual
+Oniro OS documentation is maintained in an unusual way. Individual
 repositories contain dedicated documentation that can be built with
 :doc`build-docs` job. A special *centralized* documentation project aggregates
 documentation from multiple git repositories, as checked out by *git-repo* based
@@ -37,7 +37,7 @@ To use this job in your pipeline include the generic build definition file,
     build-docs:
       extends: .build-docs
 
-    # Trigger aggregation of All Scenarios OS documentation.
+    # Trigger aggregation of Oniro OS documentation.
     aggregate-docs:
       extends: .aggregate-docs
       needs: [build-docs]
diff --git a/docs/ci/hidden-jobs/bitbake-workspace.rst b/docs/ci/hidden-jobs/bitbake-workspace.rst
index 463fb1f27a5d50548dc24b676263e870e2dff0cd..5c3e38a31a1e72f3567eaace55578b1ddc3b23ea 100644
--- a/docs/ci/hidden-jobs/bitbake-workspace.rst
+++ b/docs/ci/hidden-jobs/bitbake-workspace.rst
@@ -20,7 +20,7 @@ the way BitBake is configured.
 CI_ONIRO_BUILD_FLAVOUR
 ----------------------
 
-The name of the *flavour* of All Scenarios OS, which effectively picks the kernel
+The name of the *flavour* of Oniro OS, which effectively picks the kernel
 type. This is used to select the initial BitBake configuration template.
 Templates are stored in the **oniro** repository.
 
diff --git a/docs/ci/hidden-jobs/build-image.rst b/docs/ci/hidden-jobs/build-image.rst
index f7b0ae21a96afd5890d1401e310169580a30bc76..dbc7fea2501bf868a8148ce13cd68d99c79003a7 100644
--- a/docs/ci/hidden-jobs/build-image.rst
+++ b/docs/ci/hidden-jobs/build-image.rst
@@ -19,6 +19,6 @@ Implementation Details
 ======================
 
 The job handles differences between the name of the temporary build directory
-between various All Scenarios OS flavours. Internally BitBake is interrogated for
+between various Oniro OS flavours. Internally BitBake is interrogated for
 the value of ``TMPDIR`` and the image is copied back to a subdirectory
 of ``$CI_PROJECT_DIR`` for delivery to the GitLab runner.