diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@40/ucd90160@64.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
diff --git a/meta-zaius/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-zaius/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-zaius/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-zaius/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-zaius/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-zaius/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-zaius/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-zaius/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-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon-battery.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/iio-hwmon.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire0.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire0.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire1.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire1.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire2.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire2.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/onewire3.conf
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/onewire3.conf
diff --git a/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
similarity index 100%
rename from meta-zaius/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
rename to meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend