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 7f126225df8d770a4bc1b8f95c7fb20ac3b290db..2ed676154882272835cb4faa80013a8763706799 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/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
 
 SUMMARY = "Dashboard blueprint image: gateway"
 DESCRIPTION = "Home Assistant based image targeting a gateway device"
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
index 2c31d8e6b02337447f045af3df82af54b00f77d4..d93a1af51ded5c0d34eea42298b18dab6d570f3c 100644
--- a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require recipes-core/images/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
 
 SUMMARY = "Gateway blueprint image"
 DESCRIPTION = "Smart home gateway device"
diff --git a/meta-ohos-core/classes/ohos-image.bbclass b/meta-ohos-core/classes/oniro-image.bbclass
similarity index 99%
rename from meta-ohos-core/classes/ohos-image.bbclass
rename to meta-ohos-core/classes/oniro-image.bbclass
index 2a4fc7e5ee24c0fad27b98f0a62d8cc74e029599..50071c6a062597f44c2d859f3a4de6b0f7c3fada 100644
--- a/meta-ohos-core/classes/ohos-image.bbclass
+++ b/meta-ohos-core/classes/oniro-image.bbclass
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# All Scenarios OS functionality for images
+# Oniro Project functionality for images
 
 # List of tty to mask getty for
 SYSTEMD_MASK_GETTY ?= ""
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb b/meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
similarity index 70%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
index 7d98ae4ad873ea343451424b4abd58b56ff93542..3d15423bebddfb83b1b6d83a2907e43493bb8e8f 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base-dev.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base-dev.bb
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require recipes-core/images/core-image-base.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
 
-SUMMARY = "AllScenariOS development image including the base OS software stack"
+SUMMARY = "Oniro Project development image including the base OS software stack"
 
 IMAGE_INSTALL_append = "\
     packagegroup-net-tools \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb b/meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
similarity index 72%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
index 09f429647d62697e97e4ee90ee391c5460d6e1e0..d800797104a13f444484dd23ac3bec0c07c7701c 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base-tests.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base-tests.bb
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require recipes-core/images/allscenarios-image-base.bb
+require recipes-core/images/oniro-image-base.bb
 
-SUMMARY = "AllScenariOS image including the base OS software stack and tests"
+SUMMARY = "Oniro Project image including the base OS software stack and tests"
 
 IMAGE_INSTALL_append = "\
     packagegroup-oniro-tests \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb b/meta-ohos-core/recipes-core/images/oniro-image-base.bb
similarity index 54%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-base.bb
index de4a94d3067c40fe5b725fb0878063ab607d1342..84961f186c2350fde88cb1bf6f1691ad17580a74 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-base.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-base.bb
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require recipes-core/images/core-image-base.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
 
-SUMMARY = "AllScenariOS image including the base OS software stack"
+SUMMARY = "Oniro Project image including the base OS software stack"
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc b/meta-ohos-core/recipes-core/images/oniro-image-common.inc
similarity index 94%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
rename to meta-ohos-core/recipes-core/images/oniro-image-common.inc
index ef0968a0b108eb818f522c49ab52c2a61606e014..0a135517cae372ec2611fdf250bc6bd46eaaa889 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-common.inc
+++ b/meta-ohos-core/recipes-core/images/oniro-image-common.inc
@@ -4,7 +4,7 @@
 
 # Common settings for all Oniro images
 
-inherit ohos-image
+inherit oniro-image
 
 IMAGE_INSTALL_append = "\
 			packagegroup-oniro-core \
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
similarity index 73%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
index 40e5787fc09803e89f9c6feb998e65b142e0e8cf..2041dd1b2f1f0a120254f649d5c768ef7edd5a2e 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-dev.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra-dev.bb
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require recipes-core/images/allscenarios-image-extra.bb
+require recipes-core/images/oniro-image-extra.bb
 
-SUMMARY = "AllScenariOS Wayland development image including the base OS \
+SUMMARY = "Oniro Project Wayland development image including the base OS \
 software stack and tests"
 
 IMAGE_INSTALL_append = "\
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
similarity index 75%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
index 800bf8748f8a03d75b6987c4c38e256125100a61..9f9ee05cf83c67c9d13bb6fd593d56ed9e5be781 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra-tests.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra-tests.bb
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require recipes-core/images/allscenarios-image-extra.bb
+require recipes-core/images/oniro-image-extra.bb
 
-SUMMARY = "AllScenariOS Wayland image including the base OS \
+SUMMARY = "Oniro Project Wayland image including the base OS \
 software stack and tests"
 
 IMAGE_INSTALL_append = "\
diff --git a/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb b/meta-ohos-core/recipes-core/images/oniro-image-extra.bb
similarity index 78%
rename from meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
rename to meta-ohos-core/recipes-core/images/oniro-image-extra.bb
index 9245686bd1e4c1d62f2796fb122006d1b016a95d..d8751baaf7863811e6634b8673b7c44fd07d1013 100644
--- a/meta-ohos-core/recipes-core/images/allscenarios-image-extra.bb
+++ b/meta-ohos-core/recipes-core/images/oniro-image-extra.bb
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 require recipes-graphics/images/core-image-weston.bb
-require allscenarios-image-common.inc
+require oniro-image-common.inc
 
-SUMMARY = "AllScenariOS Wayland image including the base OS \
+SUMMARY = "Oniro Project Wayland image including the base OS \
 software stack"
 
 # The weston image pulls in package manager. We have a root filesystem that is