diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-hwmon.rules b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-hwmon.rules
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-max31785-hwmon.rules b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/70-max31785-hwmon.rules
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/max31785-hwmon-helper@.service b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/max31785-hwmon-helper@.service
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/wspoon.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/wspoon.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/bmp280@77.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/dps310@76.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_air.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/max31785@52_water.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@68.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@100/power-supply@69.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@380/tmp275@4a.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/start_max31785_hwmon.sh b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/start_max31785_hwmon.sh
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend