diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ina219@40.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ina219@40.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@40.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ina219@41.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ina219@41.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ina219@41.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53622@67.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53622@67.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@67.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53622@77.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53622@77.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53622@77.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@62.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@62.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@62.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@64.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@64.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@64.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@72.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@72.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@72.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@74.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53659@74.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53659@74.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53679@60.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53679@60.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@60.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53679@70.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/tps53679@70.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/tps53679@70.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4c.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/tmp421@4c.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4c.conf b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf
similarity index 100%
rename from meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4c.conf
rename to meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp421@4c.conf
diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index b9d7fb3..e41607a 100644
--- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -3,16 +3,16 @@
 EXTRA_OECONF_append_f0b = " --enable-negative-errno-on-fail"
 
 NAME = " \
-        i2c@1e78a000/i2c-bus@80/tmp421@4c \
-        i2c@1e78a000/i2c-bus@1c0/tmp421@4c \
-        i2c@1e78a000/i2c-bus@180/tps53679@60\
-        i2c@1e78a000/i2c-bus@180/tps53659@62\
-        i2c@1e78a000/i2c-bus@180/tps53659@64\
-        i2c@1e78a000/i2c-bus@180/tps53679@70\
-        i2c@1e78a000/i2c-bus@180/tps53659@72\
-        i2c@1e78a000/i2c-bus@180/tps53659@74\
-        i2c@1e78a000/i2c-bus@180/ina219@40\
-        i2c@1e78a000/i2c-bus@180/ina219@41\
+        bus@1e78a000/i2c-bus@80/tmp421@4c \
+        bus@1e78a000/i2c-bus@1c0/tmp421@4c \
+        bus@1e78a000/i2c-bus@180/tps53679@60\
+        bus@1e78a000/i2c-bus@180/tps53659@62\
+        bus@1e78a000/i2c-bus@180/tps53659@64\
+        bus@1e78a000/i2c-bus@180/tps53679@70\
+        bus@1e78a000/i2c-bus@180/tps53659@72\
+        bus@1e78a000/i2c-bus@180/tps53659@74\
+        bus@1e78a000/i2c-bus@180/ina219@40\
+        bus@1e78a000/i2c-bus@180/ina219@41\
         "
 ITEMSFMT = "ahb/apb/{0}.conf"