diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
similarity index 100%
copy from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend
copy to meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend
rename to meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend