diff --git a/meta-ohos-blueprints/README.md b/meta-ohos-blueprints/README.md
index aeb105aa39e6ff06de96939d98b163df59c80569..a928c4bbd76062f20b1a0429f1da4163c4d58021 100644
--- a/meta-ohos-blueprints/README.md
+++ b/meta-ohos-blueprints/README.md
@@ -6,11 +6,12 @@
 
 ## Description
 
-This layer, `meta-ohos-demo`, contains build metadata for OpenHarmony demos.
+This layer, `meta-ohos-blueprints`, contains build metadata for OpenHarmony
+blueprints.
 
 ## Layer dependencies
 
-The `meta-ohos-demo` layer depends on the following layers:
+The `meta-ohos-blueprints` layer depends on the following layers:
 
 * meta-ohos
   * URI: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos.git
diff --git a/meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf b/meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf
similarity index 73%
rename from meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf
rename to meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf
index 8b289a027e3e6f9bed1810209dc0c721611c2cfe..82e5727b773feb5eb38a4e0925c2b3cd2269c6bf 100644
--- a/meta-ohos-blueprints/conf/distro/openharmony-linux-demo-dashboard.conf
+++ b/meta-ohos-blueprints/conf/distro/openharmony-linux-blueprint-dashboard.conf
@@ -2,17 +2,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Distro configuration for the dashboard demo
+# Distro configuration for the dashboard blueprint
 
 require conf/distro/openharmony-linux.conf
 include conf/distro/include/ha-versions.inc
 
-DISTRO = "openharmony-linux-demo-dashboard"
-DISTRO_NAME = "OpenHarmony Dashboard Demo Linux Distro"
+DISTRO = "openharmony-linux-blueprint-dashboard"
+DISTRO_NAME = "OpenHarmony Dashboard Blueprint Linux Distro"
 
-# Custom hostnames for easy DNS resolution for this demo.
+# Custom hostnames for easy DNS resolution for this blueprint.
 # The gateway would run on a stm32mp1-av96 machine.
-hostname_base-files_stm32mp1-av96 = "demo-dashboard-gateway"
+hostname_base-files_stm32mp1-av96 = "blueprint-dashboard-gateway"
 
 # Avoid build warning(s) for ununsed extra partitions.
 ST_VENDORFS = "0"
diff --git a/meta-ohos-blueprints/conf/layer.conf b/meta-ohos-blueprints/conf/layer.conf
index 66de0806c54ef4b78d77dda11bd8497edc7c9343..8f713e5fa2a063e93d6cd99e70218e3d8fb75bdc 100644
--- a/meta-ohos-blueprints/conf/layer.conf
+++ b/meta-ohos-blueprints/conf/layer.conf
@@ -9,9 +9,9 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "meta-ohos-demos"
-BBFILE_PATTERN_meta-ohos-demos = "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-ohos-demos = "6"
+BBFILE_COLLECTIONS += "meta-ohos-blueprints"
+BBFILE_PATTERN_meta-ohos-blueprints = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-ohos-blueprints = "6"
 
-LAYERDEPENDS_meta-ohos-demos = "core"
-LAYERSERIES_COMPAT_meta-ohos-demos = "dunfell"
+LAYERDEPENDS_meta-ohos-blueprints = "core"
+LAYERSERIES_COMPAT_meta-ohos-blueprints = "dunfell"
diff --git a/meta-ohos-blueprints/recipes-core/images/demo-dashboard-gateway-image.bb b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
similarity index 92%
rename from meta-ohos-blueprints/recipes-core/images/demo-dashboard-gateway-image.bb
rename to meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
index 70f88dcd1caab39647c6b8ade01361c84716cf83..43f12f73e3a22c783d82873a0590d782a57ad6dc 100644
--- a/meta-ohos-blueprints/recipes-core/images/demo-dashboard-gateway-image.bb
+++ b/meta-ohos-blueprints/recipes-core/images/blueprint-dashboard-gateway-image.bb
@@ -4,7 +4,7 @@
 
 require recipes-core/images/openharmony-image-base.bb
 
-SUMMARY = "Dashboard demo image: gateway"
+SUMMARY = "Dashboard blueprint image: gateway"
 DESCRIPTION = "Home Assistant based image targeting a gateway device"
 LICENSE = "Apache-2.0"
 
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-base.bb b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
similarity index 93%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-base.bb
rename to meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
index e1e2a30df2ab26313ea3a8715dabdbb6adae7d18..d9f2369d58cf093ca492028f6b69e008943f3503 100644
--- a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-base.bb
+++ b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-base.bb
@@ -4,7 +4,7 @@
 
 require recipes-kernel/zephyr-kernel/zephyr-sample.inc
 
-SUMMARY = "SmartHome demo image: IOT endpoint"
+SUMMARY = "SmartHome blueprint image: IOT endpoint"
 DESCRIPTION = "Zephyr based image targeting IOT endpoints"
 LICENSE = "Apache-2.0"
 
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-led.bb b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-led.bb
similarity index 86%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-led.bb
rename to meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-led.bb
index 2b6a6efad76beefba963c04e4ced48363aa567f4..8c5d323e92e714cea1ecdece03b3e841ae371bf0 100644
--- a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-led.bb
+++ b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-led.bb
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require zephyr-demo-smarthome-base.bb
+require zephyr-blueprint-smarthome-base.bb
 
-SUMMARY = "SmartHome demo image: smart LED"
+SUMMARY = "SmartHome blueprint image: smart LED"
 DESCRIPTION = "Zephyr based image targeting smart LED board"
 LICENSE = "Apache-2.0"
 
diff --git a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-sensors.bb b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
similarity index 77%
rename from meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-sensors.bb
rename to meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
index ebcadfba467a8fb211ab172fdcfa97ffc3ebdfeb..f464826159b6e64ab1b2ee62df83427d9a7123bd 100644
--- a/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-demo-smarthome-sensors.bb
+++ b/meta-ohos-blueprints/recipes-kernel/zephyr-kernel/zephyr-blueprint-smarthome-sensors.bb
@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require zephyr-demo-smarthome-base.bb
+require zephyr-blueprint-smarthome-base.bb
 
-SUMMARY = "SmartHome demo image: sensors"
+SUMMARY = "SmartHome blueprint image: sensors"
 DESCRIPTION = "Zephyr based image targeting sensors board"
 LICENSE = "Apache-2.0"