diff --git a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index b1ced75..b06da50 100644
--- a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
@@ -1,4 +1,4 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " witherspoon-events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " fan-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " thermal-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " power-supply-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " events-policy"
diff --git a/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy.bb b/meta-witherspoon/recipes-phosphor/events/events-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy.bb
rename to meta-witherspoon/recipes-phosphor/events/events-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml b/meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/events/witherspoon-events-policy/config.yaml
rename to meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy.bb b/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy.bb
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/air-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/air-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/air-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/fan-errors.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/fan-errors.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/fan-errors.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/water-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-policy/water-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/water-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy.bb b/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy.bb
rename to meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml b/meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/witherspoon-thermal-policy/thermal-policy.yaml
rename to meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb b/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy.bb
rename to meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
diff --git a/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
rename to meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml