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"
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 45eeae6..712476f 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -52,13 +52,13 @@
 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="610e8d51ff2bdd4afa62d23c578825923fe455dd"
-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="610e8d51ff2bdd4afa62d23c578825923fe455dd"
-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_OPENPOWER_PNOR_P10=y
 BR2_OPENPOWER_P10_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
 BR2_OPENPOWER_PNOR_P10_LEGACY_PNOR_TARGET="rainier"
diff --git a/openpower/package/everest-xml/everest-xml.mk b/openpower/package/everest-xml/everest-xml.mk
index 29cdb8c..b6c369d 100644
--- a/openpower/package/everest-xml/everest-xml.mk
+++ b/openpower/package/everest-xml/everest-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(EVEREST_XML_MRW_HB_TOOLS) \
         $(EVEREST_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_FILENAME))
+            $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_FILENAME)) \
+            -o $(call qstrip,$(EVEREST_XML_MRW_SCRATCH)/$(BR2_EVEREST_XML_TARGETING_FILENAME))
 
 	$(if $(BR2_EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES), $(call EVEREST_XML_FILTER_UNWANTED_ATTRIBUTES))
 
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index 29170de..61070e3 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -71,7 +71,8 @@
 
         # generate the system mrw xml
         perl -I $(MRW_HB_TOOLS) \
-        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/$(BR2_OPENPOWER_MACHINE_XML_FILENAME)
+        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/$(BR2_OPENPOWER_MACHINE_XML_FILENAME) \
+        -o $(MRW_SCRATCH)/$(BR2_OPENPOWER_MRW_XML_FILENAME)$
 
 	$(if $(BR2_OPENPOWER_MACHINE_XML_FILTER_UNWANTED_ATTRIBUTES), $(call MACHINE_XML_FILTER_UNWANTED_ATTRIBUTES))
 
diff --git a/openpower/package/rainier-2u-xml/rainier-2u-xml.mk b/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
index 88bcaa6..9b07cde 100644
--- a/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
+++ b/openpower/package/rainier-2u-xml/rainier-2u-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(RAINIER_2U_XML_MRW_HB_TOOLS) \
         $(RAINIER_2U_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_FILENAME))
+            $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_FILENAME)) \
+            -o $(call qstrip,$(RAINIER_2U_XML_MRW_SCRATCH)/$(BR2_RAINIER_2U_XML_TARGETING_FILENAME))$
 
 	$(if $(BR2_RAINIER_2U_XML_FILTER_UNWANTED_ATTRIBUTES), $(call RAINIER_2U_XML_FILTER_UNWANTED_ATTRIBUTES))
 
diff --git a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
index 9d1f6f7..abdb1eb 100644
--- a/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
+++ b/openpower/package/rainier-4u-xml/rainier-4u-xml.mk
@@ -70,7 +70,8 @@
         # generate the system mrw xml
         perl -I $(RAINIER_4U_XML_MRW_HB_TOOLS) \
         $(RAINIER_4U_XML_MRW_HB_TOOLS)/processMrw.pl -x \
-            $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_FILENAME))
+            $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_FILENAME)) \
+            -o $(call qstrip,$(RAINIER_4U_XML_MRW_SCRATCH)/$(BR2_RAINIER_4U_XML_TARGETING_FILENAME))
 
 	$(if $(BR2_RAINIER_4U_XML_FILTER_UNWANTED_ATTRIBUTES), $(call RAINIER_4U_XML_FILTER_UNWANTED_ATTRIBUTES))