diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf
index 1361965..000e643 100644
--- a/meta-amd/conf/layer.conf
+++ b/meta-amd/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "amd-layer"
 BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_amd-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_amd-layer = "kirkstone langdale"
diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf
index 2cd49ff..54d3515 100644
--- a/meta-amd/meta-ethanolx/conf/layer.conf
+++ b/meta-amd/meta-ethanolx/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_ethanolx-layer = "6"
 
-LAYERSERIES_COMPAT_ethanolx-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_ethanolx-layer = "kirkstone langdale"
diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf
index dd0027f..d6bce1e 100644
--- a/meta-ampere/conf/layer.conf
+++ b/meta-ampere/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "ampere-layer"
 BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ampere-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_ampere-layer = "kirkstone langdale"
diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf
index 55d3397..1797275 100644
--- a/meta-ampere/meta-jade/conf/layer.conf
+++ b/meta-ampere/meta-jade/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "jade-layer"
 BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_jade-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_jade-layer = "kirkstone langdale"
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index d6be18b..f08c442 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,4 +7,4 @@
 BBFILE_COLLECTIONS += "aspeed-layer"
 BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
 LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_aspeed-layer = "kirkstone langdale"
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf
index 61fc90f..1992e6f 100644
--- a/meta-asrock/conf/layer.conf
+++ b/meta-asrock/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "asrock-layer"
 BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/"
 LAYERVERSION_asrock-layer = "1"
-LAYERSERIES_COMPAT_asrock-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_asrock-layer = "kirkstone langdale"
diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf
index 18b064c..c1914eb 100644
--- a/meta-asrock/meta-e3c246d4i/conf/layer.conf
+++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "e3c246d4i-layer"
 BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_e3c246d4i-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_e3c246d4i-layer = "kirkstone langdale"
diff --git a/meta-asrock/meta-romed8hm3/conf/layer.conf b/meta-asrock/meta-romed8hm3/conf/layer.conf
index 213af85..43ca5d9 100644
--- a/meta-asrock/meta-romed8hm3/conf/layer.conf
+++ b/meta-asrock/meta-romed8hm3/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "romed8hm3-layer"
 BBFILE_PATTERN_romed8hm3-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romed8hm3-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_romed8hm3-layer = "kirkstone langdale"
diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf
index 044cb64..0e1f56b 100644
--- a/meta-bytedance/conf/layer.conf
+++ b/meta-bytedance/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "bytedance-layer"
 BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_bytedance-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_bytedance-layer = "kirkstone langdale"
diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf
index 67facaa..2176f20e 100644
--- a/meta-bytedance/meta-g220a/conf/layer.conf
+++ b/meta-bytedance/meta-g220a/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "g220a-layer"
 BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_g220a-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_g220a-layer = "kirkstone langdale"
diff --git a/meta-evb/conf/layer.conf b/meta-evb/conf/layer.conf
index ddb76fb..debc7fc 100644
--- a/meta-evb/conf/layer.conf
+++ b/meta-evb/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb"
 BBFILE_PATTERN_evb = ""
-LAYERSERIES_COMPAT_evb = "honister kirkstone"
+LAYERSERIES_COMPAT_evb = "kirkstone langdale"
diff --git a/meta-evb/meta-evb-aspeed/conf/layer.conf b/meta-evb/meta-evb-aspeed/conf/layer.conf
index 9a36f2e..6cecf5d 100644
--- a/meta-evb/meta-evb-aspeed/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "evb-aspeed"
 BBFILE_PATTERN_evb-aspeed = ""
 
-LAYERSERIES_COMPAT_evb-aspeed = "honister kirkstone"
+LAYERSERIES_COMPAT_evb-aspeed = "kirkstone langdale"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
index f6954ba..79d5c9f 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/layer.conf
@@ -4,4 +4,4 @@
 BBFILE_COLLECTIONS += "evb-ast2500"
 BBFILE_PATTERN_evb-ast2500 = ""
 
-LAYERSERIES_COMPAT_evb-ast2500 = "honister kirkstone"
+LAYERSERIES_COMPAT_evb-ast2500 = "kirkstone langdale"
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
index 359b479..70aa23c 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "meta-evb-ast2600"
 BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_meta-evb-ast2600 = "honister kirkstone"
+LAYERSERIES_COMPAT_meta-evb-ast2600 = "kirkstone langdale"
diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf
index e9f894e..314bde1 100644
--- a/meta-evb/meta-evb-nuvoton/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb-nuvoton"
 BBFILE_PATTERN_evb-nuvoton = ""
-LAYERSERIES_COMPAT_evb-nuvoton = "honister kirkstone"
+LAYERSERIES_COMPAT_evb-nuvoton = "kirkstone langdale"
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
index 3ac4141..1193c7c 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "evb-npcm750"
 BBFILE_PATTERN_evb-npcm750 = ""
-LAYERSERIES_COMPAT_evb-npcm750 = "honister kirkstone"
+LAYERSERIES_COMPAT_evb-npcm750 = "kirkstone langdale"
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf
index e24a899..dfb68fb 100644
--- a/meta-facebook/conf/layer.conf
+++ b/meta-facebook/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "facebook-layer"
 BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_facebook-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_facebook-layer := "kirkstone langdale"
diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf
index 118ee30..f5c684a 100644
--- a/meta-facebook/meta-bletchley/conf/layer.conf
+++ b/meta-facebook/meta-bletchley/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "bletchley-layer"
 BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_bletchley-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_bletchley-layer := "kirkstone langdale"
diff --git a/meta-facebook/meta-greatlakes/conf/layer.conf b/meta-facebook/meta-greatlakes/conf/layer.conf
index abee71c..40d0f10 100644
--- a/meta-facebook/meta-greatlakes/conf/layer.conf
+++ b/meta-facebook/meta-greatlakes/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "greatlakes-layer"
 BBFILE_PATTERN_greatlakes-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_greatlakes-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_greatlakes-layer := "kirkstone langdale"
diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf
index b8b221a..88486e6 100644
--- a/meta-facebook/meta-tiogapass/conf/layer.conf
+++ b/meta-facebook/meta-tiogapass/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "tiogapass-layer"
 BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_tiogapass-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_tiogapass-layer := "kirkstone langdale"
diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf
index ff1dd57..e4c114b 100644
--- a/meta-facebook/meta-yosemitev2/conf/layer.conf
+++ b/meta-facebook/meta-yosemitev2/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "yosemitev2-layer"
 BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_yosemitev2-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_yosemitev2-layer := "kirkstone langdale"
diff --git a/meta-fii/conf/layer.conf b/meta-fii/conf/layer.conf
index 9e5d696..6fea782 100644
--- a/meta-fii/conf/layer.conf
+++ b/meta-fii/conf/layer.conf
@@ -5,4 +5,4 @@
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILE_COLLECTIONS += "fii-layer"
 BBFILE_PATTERN_fii-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fii-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_fii-layer = "kirkstone langdale"
diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index 5e1a6e5..b236eec 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "kudo-layer"
 BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_kudo-layer = "kirkstone langdale"
 LAYERDEPENDS_kudo-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-fii/meta-mori/conf/layer.conf b/meta-fii/meta-mori/conf/layer.conf
index 35a1530..5473f40 100644
--- a/meta-fii/meta-mori/conf/layer.conf
+++ b/meta-fii/meta-mori/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "mori-layer"
 BBFILE_PATTERN_mori-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_mori-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_mori-layer = "kirkstone langdale"
 LAYERDEPENDS_mori-layer = "core phosphor-layer google-layer fii-layer"
diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf
index e4f0f19..a5e1469 100644
--- a/meta-google/conf/layer.conf
+++ b/meta-google/conf/layer.conf
@@ -14,5 +14,5 @@
 BBFILE_COLLECTIONS += "google-layer"
 BBFILE_PATTERN_google-layer := "^${LAYERDIR}/"
 LAYERVERSION_google-layer = "1"
-LAYERSERIES_COMPAT_google-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_google-layer = "kirkstone langdale"
 LAYERDEPENDS_google-layer += "core phosphor-layer"
diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf
index dfacc8f..8ce2d69 100644
--- a/meta-hpe/conf/layer.conf
+++ b/meta-hpe/conf/layer.conf
@@ -7,7 +7,7 @@
 
 BBFILE_COLLECTIONS += "hpe-layer"
 BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/meta-common/"
-LAYERSERIES_COMPAT_hpe-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_hpe-layer = "kirkstone langdale"
 
 # Provide a variable that points the base of the hpe layer.
 HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf
index a086d3c..ab69842 100644
--- a/meta-hpe/meta-dl360poc/conf/layer.conf
+++ b/meta-hpe/meta-dl360poc/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "dl360poc-layer"
 BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_dl360poc-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_dl360poc-layer = "kirkstone langdale"
diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf
index 567fe84..f36f030 100644
--- a/meta-hpe/meta-gxp/conf/layer.conf
+++ b/meta-hpe/meta-gxp/conf/layer.conf
@@ -7,6 +7,6 @@
 BBFILE_COLLECTIONS += "gxp-layer"
 BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/"
 LAYERVERSION_gxp-layer = "1"
-LAYERSERIES_COMPAT_gxp-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_gxp-layer = "kirkstone langdale"
 
 GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf
index 7853684..3067adc 100644
--- a/meta-ibm/conf/layer.conf
+++ b/meta-ibm/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "ibm-layer"
 BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ibm-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_ibm-layer = "kirkstone langdale"
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index a9050c4..f03e22d 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "palmetto-layer"
 BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_palmetto-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_palmetto-layer = "kirkstone langdale"
diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf
index 5d85212..ccab18a 100644
--- a/meta-ibm/meta-romulus/conf/layer.conf
+++ b/meta-ibm/meta-romulus/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "romulus-layer"
 BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_romulus-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_romulus-layer = "kirkstone langdale"
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf
index 48868ba..31ebacd 100644
--- a/meta-ingrasys/conf/layer.conf
+++ b/meta-ingrasys/conf/layer.conf
@@ -3,4 +3,4 @@
 
 BBFILE_COLLECTIONS += "ingrasys"
 BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ingrasys = "honister kirkstone"
+LAYERSERIES_COMPAT_ingrasys = "kirkstone langdale"
diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf
index e482731..505b39d 100644
--- a/meta-ingrasys/meta-zaius/conf/layer.conf
+++ b/meta-ingrasys/meta-zaius/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "zaius"
 BBFILE_PATTERN_zaius := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_zaius = "honister kirkstone"
+LAYERSERIES_COMPAT_zaius = "kirkstone langdale"
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf
index 05f4651..f637efa 100644
--- a/meta-inspur/conf/layer.conf
+++ b/meta-inspur/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "inspur-layer"
 BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inspur-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_inspur-layer = "kirkstone langdale"
diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf
index c4e12f2..daf2265 100644
--- a/meta-inspur/meta-fp5280g2/conf/layer.conf
+++ b/meta-inspur/meta-fp5280g2/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "fp5280g2-layer"
 BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_fp5280g2-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_fp5280g2-layer = "kirkstone langdale"
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf
index ba1ebdd..3f24e1f 100644
--- a/meta-inspur/meta-on5263m5/conf/layer.conf
+++ b/meta-inspur/meta-on5263m5/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "on5263m5-layer"
 BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_on5263m5-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_on5263m5-layer = "kirkstone langdale"
diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf
index 356a581..95ad092 100644
--- a/meta-intel-openbmc/conf/layer.conf
+++ b/meta-intel-openbmc/conf/layer.conf
@@ -8,5 +8,5 @@
 BBFILE_COLLECTIONS += "intel"
 BBFILE_PATTERN_intel = "^${LAYERDIR}/"
 LAYERVERSION_intel = "1"
-LAYERSERIES_COMPAT_intel = "honister kirkstone"
+LAYERSERIES_COMPAT_intel = "kirkstone langdale"
 LAYERDEPENDS_intel = "phosphor-layer"
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
index 46d4935..8d36bd7 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
+++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s2600wf"
 BBFILE_PATTERN_s2600wf = ""
 BBFILE_PRIORITY_s2600wf = "5"
-LAYERSERIES_COMPAT_s2600wf = "honister kirkstone"
+LAYERSERIES_COMPAT_s2600wf = "kirkstone langdale"
diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf
index ff581a4..16a56c1 100644
--- a/meta-inventec/conf/layer.conf
+++ b/meta-inventec/conf/layer.conf
@@ -7,7 +7,7 @@
 
 BBFILE_COLLECTIONS += "inventec"
 BBFILE_PATTERN_inventec := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_inventec = "honister kirkstone"
+LAYERSERIES_COMPAT_inventec = "kirkstone langdale"
 BBFILE_PRIORITY_inventec = "6"
 
 # Provide a variable that points the base of the hpe layer.
diff --git a/meta-inventec/meta-common/conf/layer.conf b/meta-inventec/meta-common/conf/layer.conf
index 6511a3e..acd0b17 100644
--- a/meta-inventec/meta-common/conf/layer.conf
+++ b/meta-inventec/meta-common/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "common"
 BBFILE_PATTERN_common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_common = "10"
-LAYERSERIES_COMPAT_common = "honister kirkstone"
+LAYERSERIES_COMPAT_common = "kirkstone langdale"
diff --git a/meta-inventec/meta-transformers/conf/layer.conf b/meta-inventec/meta-transformers/conf/layer.conf
index 93d7000..6fd96b2 100755
--- a/meta-inventec/meta-transformers/conf/layer.conf
+++ b/meta-inventec/meta-transformers/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "transformers"
 BBFILE_PATTERN_transformers = "^${LAYERDIR}/"
 BBFILE_PRIORITY_transformers = "7"
-LAYERSERIES_COMPAT_transformers = "honister kirkstone"
+LAYERSERIES_COMPAT_transformers = "kirkstone langdale"
diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf
index 2ce294c..e74562d 100644
--- a/meta-nuvoton/conf/layer.conf
+++ b/meta-nuvoton/conf/layer.conf
@@ -7,7 +7,7 @@
 BBFILE_COLLECTIONS += "nuvoton-layer"
 BBFILE_PATTERN_nuvoton-layer = ""
 LAYERVERSION_nuvoton-layer = "1"
-LAYERSERIES_COMPAT_nuvoton-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_nuvoton-layer = "kirkstone langdale"
 LAYERDEPENDS_nuvoton-layer:append:npcm8xx = " meta-arm"
 
 BBFILES_DYNAMIC += " \
diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf
index 7f17f30..ef36835 100644
--- a/meta-openpower/conf/layer.conf
+++ b/meta-openpower/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/"
 LAYERVERSION_openpower-layer = "1"
 LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer"
-LAYERSERIES_COMPAT_openpower-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_openpower-layer = "kirkstone langdale"
diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf
index a11ff8a..8b5a2b1 100644
--- a/meta-phosphor/conf/layer.conf
+++ b/meta-phosphor/conf/layer.conf
@@ -12,7 +12,7 @@
 LAYERDEPENDS_phosphor-layer += "openembedded-layer"
 LAYERDEPENDS_phosphor-layer += "meta-python"
 LAYERDEPENDS_phosphor-layer += "networking-layer"
-LAYERSERIES_COMPAT_phosphor-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_phosphor-layer = "kirkstone langdale"
 
 IMAGE_FEATURES[validitems] += "tools-profile"
 
diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf
index 3dcb65c..7fddf4a 100644
--- a/meta-qualcomm/conf/layer.conf
+++ b/meta-qualcomm/conf/layer.conf
@@ -8,6 +8,6 @@
 BBFILE_COLLECTIONS += "qualcomm-layer"
 BBFILE_PATTERN_qualcomm-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_qualcomm-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_qualcomm-layer = "kirkstone langdale"
 
 QCOMBASE = '${@os.path.normpath("${LAYERDIR}/")}'
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf
index 9773b5a..44f21a4 100644
--- a/meta-quanta/conf/layer.conf
+++ b/meta-quanta/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "quanta-layer"
 BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_quanta-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_quanta-layer = "kirkstone langdale"
 LAYERDEPENDS_quanta-layer = "phosphor-layer"
diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf
index ed048aa..c2bc534 100644
--- a/meta-quanta/meta-f0b/conf/layer.conf
+++ b/meta-quanta/meta-f0b/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "f0b-layer"
 BBFILE_PATTERN_f0b-layer = ""
-LAYERSERIES_COMPAT_f0b-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_f0b-layer = "kirkstone langdale"
diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf
index 6773198..18f671b 100644
--- a/meta-quanta/meta-gbs/conf/layer.conf
+++ b/meta-quanta/meta-gbs/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "gbs-layer"
 BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gbs-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_gbs-layer = "kirkstone langdale"
 LAYERDEPENDS_gbs-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf
index 4254a7a..807437a 100644
--- a/meta-quanta/meta-gsj/conf/layer.conf
+++ b/meta-quanta/meta-gsj/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "gsj-layer"
 BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_gsj-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_gsj-layer = "kirkstone langdale"
 LAYERDEPENDS_gsj-layer = "core phosphor-layer google-layer quanta-layer"
diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
index 0cffd89..3add400 100644
--- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
+++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "olympus-nuvoton-layer"
 BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_olympus-nuvoton-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_olympus-nuvoton-layer = "kirkstone langdale"
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 180d4fa..d0f57d6 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "q71l"
 BBFILE_PATTERN_q71l = ""
-LAYERSERIES_COMPAT_q71l = "honister kirkstone"
+LAYERSERIES_COMPAT_q71l = "kirkstone langdale"
diff --git a/meta-quanta/meta-s6q/conf/layer.conf b/meta-quanta/meta-s6q/conf/layer.conf
index 0236823..390431e 100644
--- a/meta-quanta/meta-s6q/conf/layer.conf
+++ b/meta-quanta/meta-s6q/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s6q-layer"
 BBFILE_PATTERN_s6q-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_s6q-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_s6q-layer := "kirkstone langdale"
diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf
index 435f64b..b8df29d 100644
--- a/meta-supermicro/conf/layer.conf
+++ b/meta-supermicro/conf/layer.conf
@@ -8,6 +8,6 @@
 BBFILE_COLLECTIONS += "supermicro"
 BBFILE_PATTERN_supermicro = "^${LAYERDIR}/"
 LAYERVERSION_supermicro = "1"
-LAYERSERIES_COMPAT_supermicro = "honister kirkstone"
+LAYERSERIES_COMPAT_supermicro = "kirkstone langdale"
 LAYERDEPENDS_supermicro = "phosphor-layer"
 
diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf
index b4ebb00..2609cab 100644
--- a/meta-supermicro/meta-x11spi/conf/layer.conf
+++ b/meta-supermicro/meta-x11spi/conf/layer.conf
@@ -9,5 +9,5 @@
 BBFILE_PATTERN_x11spi = ""
 
 BBFILE_PRIORITY_x11spi = "5"
-LAYERSERIES_COMPAT_x11spi = "honister kirkstone"
+LAYERSERIES_COMPAT_x11spi = "kirkstone langdale"
 
diff --git a/meta-tyan/conf/layer.conf b/meta-tyan/conf/layer.conf
index 47e9405..86161c5 100644
--- a/meta-tyan/conf/layer.conf
+++ b/meta-tyan/conf/layer.conf
@@ -7,5 +7,5 @@
 
 BBFILE_COLLECTIONS += "tyan-layer"
 BBFILE_PATTERN_tyan-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_tyan-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_tyan-layer = "kirkstone langdale"
 
diff --git a/meta-tyan/meta-s7106/conf/layer.conf b/meta-tyan/meta-s7106/conf/layer.conf
index 86fde96..925960e 100644
--- a/meta-tyan/meta-s7106/conf/layer.conf
+++ b/meta-tyan/meta-s7106/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s7106-layer"
 BBFILE_PATTERN_s7106-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s7106-layer = "5"
-LAYERSERIES_COMPAT_s7106-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_s7106-layer = "kirkstone langdale"
diff --git a/meta-tyan/meta-s8036/conf/layer.conf b/meta-tyan/meta-s8036/conf/layer.conf
index 474eafa..ba06c94 100644
--- a/meta-tyan/meta-s8036/conf/layer.conf
+++ b/meta-tyan/meta-s8036/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "s8036-layer"
 BBFILE_PATTERN_s8036-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_s8036-layer = "5"
-LAYERSERIES_COMPAT_s8036-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_s8036-layer = "kirkstone langdale"
diff --git a/meta-wistron/conf/layer.conf b/meta-wistron/conf/layer.conf
index 4538fcf..f62cf1b 100644
--- a/meta-wistron/conf/layer.conf
+++ b/meta-wistron/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "wistron-layer"
 BBFILE_PATTERN_wistron-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_wistron-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_wistron-layer = "kirkstone langdale"
diff --git a/meta-wistron/meta-lannister/conf/layer.conf b/meta-wistron/meta-lannister/conf/layer.conf
index 005b995..2eb3c35 100644
--- a/meta-wistron/meta-lannister/conf/layer.conf
+++ b/meta-wistron/meta-lannister/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "lannister"
 BBFILE_PATTERN_lannister = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_lannister = "honister kirkstone"
+LAYERSERIES_COMPAT_lannister = "kirkstone langdale"
diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf
index 45d1182..252e334 100644
--- a/meta-yadro/conf/layer.conf
+++ b/meta-yadro/conf/layer.conf
@@ -9,4 +9,4 @@
 BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/"
 BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1"
 
-LAYERSERIES_COMPAT_yadro-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_yadro-layer = "kirkstone langdale"
diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf
index 412223b..734746f 100644
--- a/meta-yadro/meta-nicole/conf/layer.conf
+++ b/meta-yadro/meta-nicole/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "nicole-layer"
 BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_nicole-layer = "honister kirkstone"
+LAYERSERIES_COMPAT_nicole-layer = "kirkstone langdale"
diff --git a/meta-yadro/meta-vegman/conf/layer.conf b/meta-yadro/meta-vegman/conf/layer.conf
index 22efbe3..997c9b1 100644
--- a/meta-yadro/meta-vegman/conf/layer.conf
+++ b/meta-yadro/meta-vegman/conf/layer.conf
@@ -8,4 +8,4 @@
 BBFILE_COLLECTIONS += "vegman-layer"
 BBFILE_PATTERN_vegman-layer := "^${LAYERDIR}/"
 
-LAYERSERIES_COMPAT_vegman-layer := "honister kirkstone"
+LAYERSERIES_COMPAT_vegman-layer := "kirkstone langdale"