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 b06da50..1bef6c3 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 = " fan-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " thermal-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " power-supply-policy"
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append = " events-policy"
+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"
diff --git a/meta-witherspoon/recipes-phosphor/events/events-policy.bb b/meta-witherspoon/recipes-phosphor/events/events-policy.bb
index cca184a..f456e42 100644
--- a/meta-witherspoon/recipes-phosphor/events/events-policy.bb
+++ b/meta-witherspoon/recipes-phosphor/events/events-policy.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Event policy for Witherspoon"
+SUMMARY = "Event policy configuration for meta-witherspoon machines"
 PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml b/meta-witherspoon/recipes-phosphor/events/events-policy/witherspoon/config.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/events/events-policy/config.yaml
rename to meta-witherspoon/recipes-phosphor/events/events-policy/witherspoon/config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb b/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
index 50c8c91..1219464 100644
--- a/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
+++ b/meta-witherspoon/recipes-phosphor/fans/fan-policy.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Fan policy for Witherspoon"
+SUMMARY = "Fan policy configurations for meta-witherspoon machines"
 PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/air-cooled.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/air-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/air-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/air-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/fan-errors.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/fan-errors.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/fan-errors.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/fan-errors.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/fan-policy/water-cooled.yaml b/meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/water-cooled.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/fan-policy/water-cooled.yaml
rename to meta-witherspoon/recipes-phosphor/fans/fan-policy/witherspoon/water-cooled.yaml
diff --git a/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb b/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
index ef395b1..9fb7d25 100644
--- a/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
+++ b/meta-witherspoon/recipes-phosphor/fans/thermal-policy.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Thermal policy for Witherspoon"
+SUMMARY = "Thermal policy configuration for meta-witherspoon machines"
 PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml b/meta-witherspoon/recipes-phosphor/fans/thermal-policy/witherspoon/thermal-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/fans/thermal-policy/thermal-policy.yaml
rename to meta-witherspoon/recipes-phosphor/fans/thermal-policy/witherspoon/thermal-policy.yaml
diff --git a/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb b/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
index 7746266..27d60fb 100644
--- a/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
+++ b/meta-witherspoon/recipes-phosphor/power/power-supply-policy.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Power supply policy for Witherspoon"
+SUMMARY = "Power supply policy configuration for meta-witherspoon machines"
 PR = "r1"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658"
diff --git a/meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml b/meta-witherspoon/recipes-phosphor/power/power-supply-policy/witherspoon/power-supply-policy.yaml
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/power/power-supply-policy/power-supply-policy.yaml
rename to meta-witherspoon/recipes-phosphor/power/power-supply-policy/witherspoon/power-supply-policy.yaml