diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index c691f73..f50fea5 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -52,20 +52,20 @@
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
 BR2_RAINIER_2U_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
-BR2_RAINIER_2U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
-BR2_RAINIER_2U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
+BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
+BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
 BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
 BR2_RAINIER_4U_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
-BR2_RAINIER_4U_XML_SYSTEM_FILENAME="RAINIER_hb.system.xml"
-BR2_RAINIER_4U_XML_TARGETING_FILENAME="RAINIER_hb.mrw.xml"
+BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
+BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_EVEREST_XML=y
 BR2_EVEREST_XML_CUSTOM_GIT=y
 BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
 BR2_EVEREST_XML_VERSION="b788d5ea3e435f46d2a7334c82690290afc357bd"
 BR2_EVEREST_XML_FILENAME="Rainier-2U-MRW.xml"
-BR2_EVEREST_XML_SYSTEM_FILENAME="EVEREST_hb.system.xml"
-BR2_EVEREST_XML_TARGETING_FILENAME="EVEREST_hb.mrw.xml"
+BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
+BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
 BR2_PACKAGE_OPENPOWER_PNOR_P10=y
 BR2_OPENPOWER_P10_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
 BR2_OPENPOWER_PNOR_P10_LEGACY_PNOR_TARGET="rainier"