diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@12.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@12.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@42.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@42.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@44.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@44.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@46.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@46.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@48.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir38163@48.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/pxm1310@02.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/pxm1310@02.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/pxm1310@04.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/pxm1310@04.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/nvt210@4c.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/nvt210@4c.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@1d.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@1d.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@1f.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@1f.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4d.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4d.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4f.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4f.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@10.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@10.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/adm1278@11.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@1c.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@1c.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@1e.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@1e.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@2a.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@2a.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4e.conf
similarity index 100%
rename from meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf
rename to meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4e.conf
diff --git a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 5d89e82..c6ccbf0 100644
--- a/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,27 +1,27 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-NAMES = " apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d \
-         apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f \
-         apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@42 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@44 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@46 \
-         apb/i2c@1e78a000/i2c-bus@180/ir38163@48 \
-         apb/i2c@1e78a000/i2c-bus@180/pxm1310@02 \
-         apb/i2c@1e78a000/i2c-bus@180/pxm1310@04 \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@1c \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@1e \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@2a \
-         apb/i2c@1e78a000/i2c-bus@80/tmp421@4e \
-         apb/i2c@1e78a000/i2c-bus@300/adm1278@10 \
-         apb/i2c@1e78a000/i2c-bus@300/adm1278@11 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23 \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d \
-         apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58 \
+NAMES = " apb/bus@1e78a000/i2c-bus@1c0/tmp421@1d \
+         apb/bus@1e78a000/i2c-bus@1c0/tmp421@1f \
+         apb/bus@1e78a000/i2c-bus@1c0/tmp421@4d \
+         apb/bus@1e78a000/i2c-bus@1c0/tmp421@4f \
+         apb/bus@1e78a000/i2c-bus@1c0/nvt210@4c \
+         apb/bus@1e78a000/i2c-bus@180/ir38163@42 \
+         apb/bus@1e78a000/i2c-bus@180/ir38163@44 \
+         apb/bus@1e78a000/i2c-bus@180/ir38163@46 \
+         apb/bus@1e78a000/i2c-bus@180/ir38163@48 \
+         apb/bus@1e78a000/i2c-bus@180/pxm1310@02 \
+         apb/bus@1e78a000/i2c-bus@180/pxm1310@04 \
+         apb/bus@1e78a000/i2c-bus@80/tmp421@1c \
+         apb/bus@1e78a000/i2c-bus@80/tmp421@1e \
+         apb/bus@1e78a000/i2c-bus@80/tmp421@2a \
+         apb/bus@1e78a000/i2c-bus@80/tmp421@4e \
+         apb/bus@1e78a000/i2c-bus@300/adm1278@10 \
+         apb/bus@1e78a000/i2c-bus@300/adm1278@11 \
+         apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12 \
+         apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20 \
+         apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23 \
+         apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d \
+         apb/bus@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58 \
          flash-controller@1e631000/spi2@0 \
 "