diff --git a/openpower/configs/redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
similarity index 97%
rename from openpower/configs/redbud_defconfig
rename to openpower/configs/witherspoon-redbud_defconfig
index d8493e1..7a26177 100644
--- a/openpower/configs/redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -49,7 +49,7 @@
 BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
 BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
 BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="redbud.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon-redbud.pnor"
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
similarity index 97%
rename from openpower/configs/witherspoon_defconfig
rename to openpower/configs/witherspoon-sequoia_defconfig
index d41c2f0..d7580fb 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -48,7 +48,7 @@
 BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
 BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
 BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon-sequoia.pnor"
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"