diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend b/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend
rename to meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control b/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control
rename to meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control
diff --git a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend
rename to meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend
similarity index 100%
copy from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend
copy to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml
rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml