diff --git a/flavours/linux/conf-notes.txt b/flavours/linux/conf-notes.txt
index 4e774eb22a1876f6a946d6717c511d0ba0546bdb..650ef72779ed00c06ff0ad93d95de1ac971ca0a2 100644
--- a/flavours/linux/conf-notes.txt
+++ b/flavours/linux/conf-notes.txt
@@ -4,10 +4,10 @@
 You can now run 'bitbake <target>'
 
 Supported targets:
-- openharmony-image-base
-- openharmony-image-base-tests
-- openharmony-image-extra
-- openharmony-image-extra-tests
+- allscenarios-image-base
+- allscenarios-image-base-tests
+- allscenarios-image-extra
+- allscenarios-image-extra-tests
 
 Supported machines (first is the default):
 - qemux86-64
diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index 6f26fd1e1e014e9c9cbb476f1da3980e9a892e5d..1f42f95bfad123d1698848453d915a32863dc565 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -75,7 +75,7 @@ MACHINE ??= "qemux86-64"
 #
 # Default policy config
 #
-DISTRO ?= "openharmony-linux"
+DISTRO ?= "allscenarios-linux"
 
 #
 # Package Management configuration
diff --git a/flavours/zephyr/local.conf.sample b/flavours/zephyr/local.conf.sample
index d0b40715183914ae0f15c41ad78c44da8438e33f..664eb64e1f39ce8db25454da37c63a42fc0e8850 100644
--- a/flavours/zephyr/local.conf.sample
+++ b/flavours/zephyr/local.conf.sample
@@ -76,7 +76,7 @@ MACHINE ??= "qemu-x86"
 #
 # Default policy config
 #
-DISTRO ?= "openharmony-zephyr"
+DISTRO ?= "allscenarios-zephyr"
 
 #
 # Package Management configuration
diff --git a/meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
similarity index 85%
rename from meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
index 82e5727b773feb5eb38a4e0925c2b3cd2269c6bf..b765538423ede759a67429bad5719d1563f44af2 100644
--- a/meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-blueprint-dashboard.conf
@@ -4,11 +4,11 @@
 
 # Distro configuration for the dashboard blueprint
 
-require conf/distro/openharmony-linux.conf
+require conf/distro/allscenarios-linux.conf
 include conf/distro/include/ha-versions.inc
 
-DISTRO = "openharmony-linux-blueprint-dashboard"
-DISTRO_NAME = "OpenHarmony Dashboard Blueprint Linux Distro"
+DISTRO = "allscenarios-linux-blueprint-dashboard"
+DISTRO_NAME = "AllScenariOS Dashboard Blueprint Linux Distro"
 
 # Custom hostnames for easy DNS resolution for this blueprint.
 # The gateway would run on a stm32mp1-av96 machine.
diff --git a/meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf b/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf
similarity index 56%
rename from meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf
index eaa84b44fac11a951b961a8d9d3885f2bb29f0e0..e178c7fa6e56eff272969087d4ec2eb5e300c9bf 100644
--- a/meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/allscenarios-linux-demo-dashboard.conf
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Deprecated distro configuration in favour of
-# openharmony-linux-blueprint-dashboard
+# allscenarios-linux-blueprint-dashboard
 
-require conf/distro/openharmony-linux-blueprint-dashboard.conf
+require conf/distro/allscenarios-linux-blueprint-dashboard.conf
 
 # We keep the old distro name to sanity check this deprecation.
-DISTRO = "openharmony-linux-demo-dashboard"
+DISTRO = "allscenarios-linux-demo-dashboard"
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
index 43f12f73e3a22c783d82873a0590d782a57ad6dc..9eed84e516717cbc8a947c98b9a5faca439cfb14 100644
--- a/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require recipes-core/images/openharmony-image-base.bb
+require recipes-core/images/allscenarios-image-base.bb
 
 SUMMARY = "Dashboard blueprint image: gateway"
 DESCRIPTION = "Home Assistant based image targeting a gateway device"
diff --git a/meta-ohos-core/classes/ohos-sanity.bbclass b/meta-ohos-core/classes/ohos-sanity.bbclass
index 2ffd0bb9a85df39796b18fe9aedfc70c1d5837f7..e0e77938c227ec3d6af1ab0334fd34415791db2a 100644
--- a/meta-ohos-core/classes/ohos-sanity.bbclass
+++ b/meta-ohos-core/classes/ohos-sanity.bbclass
@@ -13,7 +13,7 @@ OHOS_DEPRECATED_COLLECTIONS = " \
 
 # Same format as for OHOS_DEPRECATED_COLLECTIONS but for DISTRO configurations.
 OHOS_DEPRECATED_DISTROS = " \
-    openharmony-linux-demo-dashboard:openharmony-linux-blueprint-dashboard \
+    allscenarios-linux-demo-dashboard:allscenarios-linux-blueprint-dashboard \
     "
 
 def unpack_deprecation(elem) -> 'Tuple[str, str]':
@@ -21,7 +21,7 @@ def unpack_deprecation(elem) -> 'Tuple[str, str]':
     return (elem_split[0], elem_split[1] if len(elem_split) == 2 else '')
 
 def ohos_is_valid_config() -> bool:
-    """Handles OpenHarmony build configuration sanity checks."""
+    """Handles AllScenariOS build configuration sanity checks."""
 
     # By default assume no fatal errors
     success = True
@@ -66,10 +66,10 @@ def ohos_is_valid_config() -> bool:
 
 python ohos_sanity_handler() {
     if d.getVar('OHOS_SANITY_SKIP', True) == "1":
-        bb.warn('OpenHarmony-specific sanity checks were skipped.')
+        bb.warn('AllScenariOS-specific sanity checks were skipped.')
         return
     if not ohos_is_valid_config():
-        bb.fatal("OpenHarmony sanity checks included fatal errors. See above.")
+        bb.fatal("AllScenariOS sanity checks included fatal errors. See above.")
 }
 
 addhandler ohos_sanity_handler
diff --git a/meta-ohos-core/conf/distro/openharmony-linux.conf b/meta-ohos-core/conf/distro/allscenarios-linux.conf
similarity index 73%
rename from meta-ohos-core/conf/distro/openharmony-linux.conf
rename to meta-ohos-core/conf/distro/allscenarios-linux.conf
index a3eb513b4bb0c2b500ef918d2316258ea27ecb9d..b832cb390423f877fbb22dfeec834fc41d9edca8 100644
--- a/meta-ohos-core/conf/distro/openharmony-linux.conf
+++ b/meta-ohos-core/conf/distro/allscenarios-linux.conf
@@ -2,11 +2,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require conf/distro/include/openharmony.inc
+require conf/distro/include/allscenarios.inc
 require conf/distro/poky.conf
 
-DISTRO = "openharmony-linux"
-DISTRO_NAME = "OpenHarmony Base Linux Distro"
+DISTRO = "allscenarios-linux"
+DISTRO_NAME = "AllScenariOS Base Linux Distro"
 DISTRO_VERSION = "0.1.99"
 
 TCLIBC ?= "musl"
diff --git a/meta-ohos-core/conf/distro/openharmony-zephyr.conf b/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
similarity index 52%
rename from meta-ohos-core/conf/distro/openharmony-zephyr.conf
rename to meta-ohos-core/conf/distro/allscenarios-zephyr.conf
index 076b7281488b45ea654ade8a22b3398fbf02c866..6b72d65a48542e5dc92dfbfc5f26edb0718adb2d 100644
--- a/meta-ohos-core/conf/distro/openharmony-zephyr.conf
+++ b/meta-ohos-core/conf/distro/allscenarios-zephyr.conf
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require conf/distro/include/openharmony.inc
+require conf/distro/include/allscenarios.inc
 require conf/distro/zephyr.conf
 
-DISTRO = "openharmony-zephyr"
-DISTRO_NAME = "OpenHarmony Base Zephyr Distro"
+DISTRO = "allscenarios-zephyr"
+DISTRO_NAME = "AllScenariOS Base Zephyr Distro"
 DISTRO_VERSION = "0.1.99"
diff --git a/meta-ohos-core/conf/distro/include/openharmony.inc b/meta-ohos-core/conf/distro/include/allscenarios.inc
similarity index 100%
rename from meta-ohos-core/conf/distro/include/openharmony.inc
rename to meta-ohos-core/conf/distro/include/allscenarios.inc
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
new file mode 100644
index 0000000000000000000000000000000000000000..70b01382f4a8faca11094c3cc5401c279cd4f7da
--- /dev/null
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require recipes-core/images/allscenarios-image-base.bb
+
+SUMMARY = "AllScenariOS image including the base OS software stack and tests"
+
+IMAGE_INSTALL_append = "\
+    packagegroup-allscenarios-tests \
+"
diff --git a/meta-ohos-core/recipes-core/images/openharmony-image-base.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
similarity index 54%
rename from meta-ohos-core/recipes-core/images/openharmony-image-base.bb
rename to meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
index 768905d76b6a55d0b28046d47888fe8305c27a2a..de4a94d3067c40fe5b725fb0878063ab607d1342 100644
--- a/meta-ohos-core/recipes-core/images/openharmony-image-base.bb
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require recipes-core/images/core-image-base.bb
-require openharmony-image-common.inc
+require allscenarios-image-common.inc
 
-SUMMARY = "OpenHarmony image including the base OS software stack"
+SUMMARY = "AllScenariOS image including the base OS software stack"
diff --git a/meta-ohos-core/recipes-core/images/openharmony-image-common.inc b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
similarity index 89%
rename from meta-ohos-core/recipes-core/images/openharmony-image-common.inc
rename to meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
index 1af03cf06d1baf65a70940f99d0c1aabdd0b55a6..2d05efe8c0dd8edfc395c507e5712bee110e8517 100644
--- a/meta-ohos-core/recipes-core/images/openharmony-image-common.inc
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Common settings for all OpenHarmony images
+# Common settings for all AllScenariOS images
 
 inherit ohos-image
 
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
new file mode 100644
index 0000000000000000000000000000000000000000..6e950f0fef807669fd6e88883b7dd17935e9df6a
--- /dev/null
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require recipes-core/images/allscenarios-image-extra.bb
+
+SUMMARY = "AllScenariOS Wayland image including the base OS \
+software stack and tests"
+
+IMAGE_INSTALL_append = "\
+    packagegroup-allscenarios-tests \
+"
diff --git a/meta-ohos-core/recipes-core/images/openharmony-image-extra.bb b/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
similarity index 59%
rename from meta-ohos-core/recipes-core/images/openharmony-image-extra.bb
rename to meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
index 66f71305c99cf68504eeb3b5cac3c2c047939c92..07320c84d7258bae0ca64e714765d083caa3fe05 100644
--- a/meta-ohos-core/recipes-core/images/openharmony-image-extra.bb
+++ b/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require recipes-graphics/images/core-image-weston.bb
-require openharmony-image-common.inc
+require allscenarios-image-common.inc
 
-SUMMARY = "OpenHarmony Wayland image including the base OS \
+SUMMARY = "AllScenariOS Wayland image including the base OS \
 software stack"
diff --git a/meta-ohos-core/recipes-core/images/openharmony-image-base-tests.bb b/meta-ohos-core/recipes-core/images/openharmony-image-base-tests.bb
deleted file mode 100644
index d8ef8cc5cc1893c65ed808c1abe826adc70757c8..0000000000000000000000000000000000000000
--- a/meta-ohos-core/recipes-core/images/openharmony-image-base-tests.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require recipes-core/images/openharmony-image-base.bb
-
-SUMMARY = "OpenHarmony image including the base OS software stack and tests"
-
-IMAGE_INSTALL_append = "\
-    packagegroup-openharmony-tests \
-"
diff --git a/meta-ohos-core/recipes-core/images/openharmony-image-extra-tests.bb b/meta-ohos-core/recipes-core/images/openharmony-image-extra-tests.bb
deleted file mode 100644
index bfd40c75a20944e6fffd8156ee10aac942610ebb..0000000000000000000000000000000000000000
--- a/meta-ohos-core/recipes-core/images/openharmony-image-extra-tests.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-require recipes-core/images/openharmony-image-extra.bb
-
-SUMMARY = "OpenHarmony Wayland image including the base OS \
-software stack and tests"
-
-IMAGE_INSTALL_append = "\
-    packagegroup-openharmony-tests \
-"
diff --git a/meta-ohos-core/recipes-core/packagegroups/packagegroup-openharmony-tests.bb b/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb
similarity index 51%
rename from meta-ohos-core/recipes-core/packagegroups/packagegroup-openharmony-tests.bb
rename to meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb
index 94030a33b10a9e5131719e3f76ca728b7fea8da7..24cf34c721ec9edc9422df14c56700f7eaef9779 100644
--- a/meta-ohos-core/recipes-core/packagegroups/packagegroup-openharmony-tests.bb
+++ b/meta-ohos-core/recipes-core/packagegroups/packagegroup-allscenarios-tests.bb
@@ -2,14 +2,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-DESCRIPTION = "OpenHarmony tests package group"
+DESCRIPTION = "AllScenariOS tests package group"
 
 inherit packagegroup
 
 PACKAGES = "\
-	packagegroup-openharmony-tests \
+	packagegroup-allscenarios-tests \
 	"
 
-RDEPENDS_packagegroup-openharmony-tests = "\
+RDEPENDS_packagegroup-allscenarios-tests = "\
 	ohos-xts-acts \
 	"