diff --git a/conf/layer.conf b/conf/layer.conf
index a5c9082..72351f1 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "ibm"
-BBFILE_PATTERN_ibm = ""
-LAYERSERIES_COMPAT_ibm = "sumo"
+BBFILE_COLLECTIONS += "ibm-layer"
+BBFILE_PATTERN_ibm-layer = ""
+LAYERSERIES_COMPAT_ibm-layer = "sumo"
diff --git a/meta-fsp2/conf/layer.conf b/meta-fsp2/conf/layer.conf
index 11d9b6e..9c0cd0e 100644
--- a/meta-fsp2/conf/layer.conf
+++ b/meta-fsp2/conf/layer.conf
@@ -6,4 +6,4 @@
 
 BBFILE_PATTERN_fsp2-layer = "^${LAYERDIR}"
 BBFILE_COLLECTIONS += "fsp2-layer"
-LAYERVERSION_fsp2 = "1"
+LAYERVERSION_fsp2-layer = "1"
diff --git a/meta-palmetto/conf/layer.conf b/meta-palmetto/conf/layer.conf
index 17780a8..58de44f 100644
--- a/meta-palmetto/conf/layer.conf
+++ b/meta-palmetto/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "palmetto"
-BBFILE_PATTERN_palmetto = ""
-LAYERSERIES_COMPAT_palmetto = "sumo"
+BBFILE_COLLECTIONS += "palmetto-layer"
+BBFILE_PATTERN_palmetto-layer = ""
+LAYERSERIES_COMPAT_palmetto-layer = "sumo"
diff --git a/meta-romulus/conf/layer.conf b/meta-romulus/conf/layer.conf
index 3a29f43..fa58c44 100644
--- a/meta-romulus/conf/layer.conf
+++ b/meta-romulus/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "romulus"
-BBFILE_PATTERN_romulus = ""
-LAYERSERIES_COMPAT_romulus = "sumo"
+BBFILE_COLLECTIONS += "romulus-layer"
+BBFILE_PATTERN_romulus-layer = ""
+LAYERSERIES_COMPAT_romulus-layer = "sumo"
diff --git a/meta-witherspoon/conf/layer.conf b/meta-witherspoon/conf/layer.conf
index 6ea5041..7ace31d 100644
--- a/meta-witherspoon/conf/layer.conf
+++ b/meta-witherspoon/conf/layer.conf
@@ -5,6 +5,6 @@
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "witherspoon"
-BBFILE_PATTERN_witherspoon = ""
-LAYERSERIES_COMPAT_witherspoon = "sumo"
+BBFILE_COLLECTIONS += "witherspoon-layer"
+BBFILE_PATTERN_witherspoon-layer = ""
+LAYERSERIES_COMPAT_witherspoon-layer = "sumo"
diff --git a/meta-z/conf/layer.conf b/meta-z/conf/layer.conf
index 790dc69..252db1d 100644
--- a/meta-z/conf/layer.conf
+++ b/meta-z/conf/layer.conf
@@ -1,5 +1,5 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-BBFILE_COLLECTIONS += "ibm-z"
-BBFILE_PATTERN_ibm-z = ""
+BBFILE_COLLECTIONS += "ibm-z-layer"
+BBFILE_PATTERN_ibm-z-layer = ""