diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc/palmetto.cfg
rename to meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed/palmetto.cfg
diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 0000000..6cdb951
--- /dev/null
+++ b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:"
+SRC_URI += "file://palmetto.cfg"
diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index a49c239..0000000
--- a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://palmetto.cfg"
diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc/romulus.cfg b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg
similarity index 100%
rename from meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc/romulus.cfg
rename to meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed/romulus.cfg
diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 0000000..fd0a149
--- /dev/null
+++ b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:"
+SRC_URI += "file://romulus.cfg"
diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index 5d48028..0000000
--- a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://romulus.cfg"
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/witherspoon.cfg b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg
similarity index 100%
rename from meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc/witherspoon.cfg
rename to meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 0000000..cad9140
--- /dev/null
+++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_witherspoon := "${THISDIR}/${PN}:"
+SRC_URI += "file://witherspoon.cfg"
diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index 3d0b856..0000000
--- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://witherspoon.cfg"
diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/zaius.cfg b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc/zaius.cfg
rename to meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed/zaius.cfg
diff --git a/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
similarity index 100%
rename from meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
rename to meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg
similarity index 100%
rename from meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc/barreleye.cfg
rename to meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed/barreleye.cfg
diff --git a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend
new file mode 100644
index 0000000..8a12f92
--- /dev/null
+++ b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend_barreleye := "${THISDIR}/${PN}:"
+SRC_URI += "file://barreleye.cfg"
diff --git a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
deleted file mode 100644
index 9e74ab4..0000000
--- a/meta-rackspace/meta-barreleye/recipes-kernel/linux/linux-obmc_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://barreleye.cfg"