diff --git a/meta-ohos-blueprints/README.md b/meta-oniro-blueprints/README.md
similarity index 83%
rename from meta-ohos-blueprints/README.md
rename to meta-oniro-blueprints/README.md
index 5a5dfc6700c2b87d9e7cf11f97794477b236ffac..b1167d3ad3c41a22bb1df0f1c8273138366ef335 100644
--- a/meta-ohos-blueprints/README.md
+++ b/meta-oniro-blueprints/README.md
@@ -6,14 +6,14 @@
 
 ## Description
 
-This layer, `meta-ohos-blueprints`, contains build metadata for Oniro Project
+This layer, `meta-oniro-blueprints`, contains build metadata for Oniro Project
 blueprints.
 
 ## Layer dependencies
 
-The `meta-ohos-blueprints` layer depends on the following layers:
+The `meta-oniro-blueprints` layer depends on the following layers:
 
-* meta-ohos
+* meta-oniro
   * URI: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos.git
 * meta-homeassistant
   * URI: https://github.com/meta-homeassistant/meta-homeassistant.git
diff --git a/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
similarity index 100%
rename from meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
rename to meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-dashboard.conf
diff --git a/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
similarity index 100%
rename from meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
rename to meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-gateway.conf
diff --git a/meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
similarity index 100%
rename from meta-ohos-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
rename to meta-oniro-blueprints/conf/distro/oniro-linux-blueprint-vending-machine.conf
diff --git a/meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf b/meta-oniro-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
similarity index 100%
rename from meta-ohos-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
rename to meta-oniro-blueprints/conf/distro/oniro-linux-demo-dashboard.conf
diff --git a/meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf b/meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
similarity index 100%
rename from meta-ohos-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
rename to meta-oniro-blueprints/conf/distro/oniro-zephyr-blueprint-dashboard.conf
diff --git a/meta-ohos-blueprints/conf/layer.conf b/meta-oniro-blueprints/conf/layer.conf
similarity index 55%
rename from meta-ohos-blueprints/conf/layer.conf
rename to meta-oniro-blueprints/conf/layer.conf
index 8f713e5fa2a063e93d6cd99e70218e3d8fb75bdc..2abe65cd2f080655e22b8071ea27e6996ed7f09c 100644
--- a/meta-ohos-blueprints/conf/layer.conf
+++ b/meta-oniro-blueprints/conf/layer.conf
@@ -9,9 +9,9 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-ohos-blueprints"
-BBFILE_PATTERN_meta-ohos-blueprints = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-ohos-blueprints = "6"
+BBFILE_COLLECTIONS += "oniro-blueprints"
+BBFILE_PATTERN_oniro-blueprints = "^${LAYERDIR}/"
+BBFILE_PRIORITY_oniro-blueprints = "6"
 
-LAYERDEPENDS_meta-ohos-blueprints = "core"
-LAYERSERIES_COMPAT_meta-ohos-blueprints = "dunfell"
+LAYERDEPENDS_oniro-blueprints = "core"
+LAYERSERIES_COMPAT_oniro-blueprints = "dunfell"
diff --git a/meta-ohos-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend
rename to meta-oniro-blueprints/recipes-connectivity/bluez5/bluez5_%.bbappend
diff --git a/meta-ohos-blueprints/recipes-connectivity/hostapd/files/hostapd.conf b/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.conf
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/hostapd/files/hostapd.conf
rename to meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.conf
diff --git a/meta-ohos-blueprints/recipes-connectivity/hostapd/files/hostapd.service b/meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.service
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/hostapd/files/hostapd.service
rename to meta-oniro-blueprints/recipes-connectivity/hostapd/files/hostapd.service
diff --git a/meta-ohos-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend
rename to meta-oniro-blueprints/recipes-connectivity/hostapd/hostapd_%.bbappend
diff --git a/meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf
rename to meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/60-otbr-ip-forward.conf
diff --git a/meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration
rename to meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration
diff --git a/meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service
rename to meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix/otbr-configuration.service
diff --git a/meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend b/meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend
rename to meta-oniro-blueprints/recipes-connectivity/openthread/ot-br-posix_%.bbappend
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb b/meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
rename to meta-oniro-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
diff --git a/meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb b/meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-core/images/blueprint-gateway-image.bb
rename to meta-oniro-blueprints/recipes-core/images/blueprint-gateway-image.bb
diff --git a/meta-ohos-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend b/meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
rename to meta-oniro-blueprints/recipes-core/packagegroups/packagegroup-connectivity.bbappend
diff --git a/meta-ohos-blueprints/recipes-core/systemd/files/80-wireless.network b/meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network
similarity index 100%
rename from meta-ohos-blueprints/recipes-core/systemd/files/80-wireless.network
rename to meta-oniro-blueprints/recipes-core/systemd/files/80-wireless.network
diff --git a/meta-ohos-blueprints/recipes-core/systemd/systemd-conf_%.bbappend b/meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
rename to meta-oniro-blueprints/recipes-core/systemd/systemd-conf_%.bbappend
diff --git a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb
rename to meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app.bb
diff --git a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop
similarity index 100%
rename from meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop
rename to meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/epiphany-HomeAssistant.desktop
diff --git a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf
similarity index 100%
rename from meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf
rename to meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/HomeAssistant/service-override.conf
diff --git a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service b/meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service
similarity index 100%
rename from meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service
rename to meta-oniro-blueprints/recipes-gnome/epiphany/epiphany-app/epiphany-app@.service
diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb
rename to meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb
diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc
rename to meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-config.inc
diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc
rename to meta-oniro-blueprints/recipes-homeassistant/homeassistant/homeassistant-useradd.inc
diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch
rename to meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant/0001-components-met-Use-API-v2.patch
diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend b/meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend
rename to meta-oniro-blueprints/recipes-homeassistant/homeassistant/python3-homeassistant_%.bbappend
diff --git a/meta-ohos-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb b/meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb
rename to meta-oniro-blueprints/recipes-homeassistant/ohsmarthome-py/ohsmarthome-py_git.bb
diff --git a/meta-ohos-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb b/meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb
rename to meta-oniro-blueprints/recipes-homeassistant/smart-home-homeassistant-plugin/smart-home-homeassistant-plugin_git.bb
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
rename to meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
rename to meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb b/meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb
similarity index 100%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb
rename to meta-oniro-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-switch.bb