diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
index 9e7bd18..3a530db 100644
--- a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
@@ -4,6 +4,6 @@
 BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
             ${LAYERDIR}/common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "aspeed"
-BBFILE_PATTERN_aspeed = ""
-LAYERVERSION_aspeed = "1"
+BBFILE_COLLECTIONS += "aspeed-layer"
+BBFILE_PATTERN_aspeed-layer = ""
+LAYERVERSION_aspeed-layer = "1"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
index a24ac97..2ce719c 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_PATTERN_ast2400 = "^${LAYERDIR}/"
-BBFILE_COLLECTIONS += "ast2400"
-LAYERVERSION_ast2400 = "1"
+BBFILE_PATTERN_ast2400-layer = "^${LAYERDIR}/"
+BBFILE_COLLECTIONS += "ast2400-layer"
+LAYERVERSION_ast2400-layer = "1"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf
index ad1858a..00dd677 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_PATTERN_ast2500 = "^${LAYERDIR}/"
-BBFILE_COLLECTIONS += "ast2500"
-LAYERVERSION_ast2500 = "1"
+BBFILE_PATTERN_ast2500-layer = "^${LAYERDIR}/"
+BBFILE_COLLECTIONS += "ast2500-layer"
+LAYERVERSION_ast2500-layer = "1"