diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
index 72d991c..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
index 72d991c..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
index 72d991c..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
index 6d4804d..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend
@@ -1,2 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
index 72d991c..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
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
index 72d991c..fae8d4c 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
index f2878fb..e28bcb1 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,4 +1,6 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+# Machine specific files override shared files with the same name
+FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}-${PN}:"
 
 # Package configuration
 FAN_PACKAGES += " \
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-events-config-native/events.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
rename to meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-events-config-native/events.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-fan-config-native/fans.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml
rename to meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-fan-config-native/fans.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
rename to meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-zone-conditions-config-native/zone_conditions.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-zone-config-native/zones.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config-native/zones.yaml
rename to meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-control-zone-config-native/zones.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-monitor-config-native/monitor.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml
rename to meta-witherspoon/recipes-phosphor/fans/witherspoon-phosphor-fan-monitor-config-native/monitor.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml b/meta-witherspoon/recipes-phosphor/fans/witherspoon-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/witherspoon-phosphor-fan-presence-config-native/config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-witherspoon/recipes-phosphor/fans/witherspoon-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/witherspoon-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/witherspoon-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/witherspoon-phosphor-fan/phosphor-cooling-type@.service