diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@0/psu@59.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@1/psu@58.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@2/psu@58.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@3/psu@59.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4c.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4c.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4e.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4e.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf
similarity index 100%
rename from meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp75@4f.conf
rename to meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@80/tmp75@4f.conf
diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 577fa64..cc05c01 100644
--- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -9,7 +9,7 @@
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_PWM_BASE', 'Q71L_PWM')}"
 
 Q71L_TEMPS = "tmp75@4c tmp75@4e tmp75@4f"
-Q71L_TEMPBASE = "ahb/apb/i2c@1e78a000/i2c-bus@80/{0}.conf"
+Q71L_TEMPBASE = "ahb/apb/bus@1e78a000/i2c-bus@80/{0}.conf"
 
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_TEMPBASE', 'Q71L_TEMPS')}"
 
@@ -17,7 +17,7 @@
 Q71L_ITEMS += "iio-hwmon-battery.conf"
 
 Q71L_PSUS = "0/psu@59 1/psu@58 2/psu@58 3/psu@59"
-Q71L_PSUBASE = "ahb/apb/i2c@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf"
+Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf"
 Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}"
 
 ENVS = "obmc/hwmon/{0}"