diff --git a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
index 864cf0e..8383e30 100644
--- a/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
+++ b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend
@@ -25,14 +25,14 @@
 
 do_install:append:witherspoon() {
         DEST=${D}${inventory_envdir}
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a400.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+        printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a400.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
 do_install:append:witherspoon-tacoma() {
         DEST=${D}${inventory_envdir}
         printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory
         printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory
-        printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
+        printf "\nEEPROM=/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a600.i2c/i2c-11/11-0051/eeprom" >> ${DEST}/inventory
 }
 
 pkg_postinst:${PN}:p10bmc() {
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/occ-hwmon@50.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/occ-hwmon@50.conf
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/rtc@68.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@40/rtc@68.conf
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf
similarity index 100%
rename from meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@c0/tmp423@4c.conf
rename to meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@c0/tmp423@4c.conf
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 573c0b8..561da51 100644
--- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,11 +1,11 @@
 FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:"
 
 NAMES = " \
-        bus@1e78a000/i2c-bus@40/rtc@68 \
-        bus@1e78a000/i2c-bus@c0/tmp423@4c \
-        bus@1e78a000/i2c-bus@100/occ-hwmon@50 \
+        bus@1e78a000/i2c@40/rtc@68 \
+        bus@1e78a000/i2c@c0/tmp423@4c \
+        bus@1e78a000/i2c@100/occ-hwmon@50 \
         "
-ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}"
 
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
index 02bb3d8..156d1e5 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
+++ b/meta-ibm/meta-romulus/recipes-phosphor/logging/files/callouts.yaml
@@ -1,5 +1,5 @@
 # TODO: Add i2c devices like
-# /sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052: /system/chassis/motherboard
+# /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052: /system/chassis/motherboard
 /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw: /system/chassis/motherboard/cpu0
 /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/slave@01:00/raw: /system/chassis/motherboard/cpu1
 
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf
similarity index 100%
rename from meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf
rename to meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/w83773g@4c.conf
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf
similarity index 100%
rename from meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf
rename to meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb@1e780000/pwm-tacho-controller@1e786000.conf
diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 703cac2..67e0350 100644
--- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -3,10 +3,10 @@
 EXTRA_OEMESON:append:romulus = " -Dnegative-errno-on-fail=true"
 
 CHIPS = " \
-        bus@1e78a000/i2c-bus@440/w83773g@4c \
+        bus@1e78a000/i2c@440/w83773g@4c \
         pwm-tacho-controller@1e786000 \
         "
-ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
 
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 
diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
index c35a61b..e34d218 100644
--- a/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
+++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh
@@ -6,7 +6,7 @@
 status=0
 max_retries=3
 driver_path="/sys/bus/i2c/drivers/ir35221/"
-platform_path="/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/"
+platform_path="/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/"
 
 unbind_driver () {
     echo "$1" > $driver_path/unbind
@@ -58,22 +58,22 @@
     fi
 elif [ "$1" = "bind" ]
 then
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0070 ]
+    if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0070 ]
     then
         bind_driver "4-0070"
     fi
 
-    if [ -e $platform_path/1e78a140.i2c-bus/i2c-4/4-0071 ]
+    if [ -e $platform_path/1e78a140.i2c/i2c-4/4-0071 ]
     then
         bind_driver "4-0071"
     fi
 
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0070 ]
+    if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0070 ]
     then
         bind_driver "5-0070"
     fi
 
-    if [ -e $platform_path/1e78a180.i2c-bus/i2c-5/5-0071 ]
+    if [ -e $platform_path/1e78a180.i2c/i2c-5/5-0071 ]
     then
         bind_driver "5-0071"
     fi
diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml
index 20dc31c..adcb892 100644
--- a/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml
+++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml
@@ -3,7 +3,7 @@
   methods:
     - type: gpio
       key: 5
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -16,7 +16,7 @@
   methods:
     - type: gpio
       key: 6
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -29,7 +29,7 @@
   methods:
     - type: gpio
       key: 7
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -42,7 +42,7 @@
   methods:
     - type: gpio
       key: 8
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
     - type: tach
       sensors:
@@ -56,7 +56,7 @@
   methods:
     - type: gpio
       key: 9
-      physpath: /sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0060
+      physpath: /sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0060
       devpath: /dev/input/by-path/platform-gpio-keys-polled-event
   rpolicy:
     type: anyof
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
index 123aa6d..5da4886 100644
--- a/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
+++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json
@@ -9996,7 +9996,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-11/11-0064": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -10017,7 +10017,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -10038,70 +10038,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 0",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-11/11-0064": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0059F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the power sequencer chip on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 1",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
+        "xyz.openbmc_project.Common.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Common.Device.Error.ReadFailure",
@@ -17094,7 +17031,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17115,7 +17052,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0068": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17136,7 +17073,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0069": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17157,7 +17094,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0076": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17178,7 +17115,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0077": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17199,7 +17136,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0070": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17220,7 +17157,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-4/4-0071": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17241,7 +17178,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-5/5-0070": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -17262,196 +17199,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0056F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the PCIE temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0057F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the fan control device on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0068": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 1",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0069": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0060F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from power supply 0",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0076": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0053F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0077": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0052F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0070": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0054F",
-            "ComponentInstance": 0,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-4/4-0071": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0055F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-5/5-0070": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0054F",
-            "ComponentInstance": 1,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-9/9-004a": {
+        "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-9/9-004a": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.ReadFailure",
@@ -19572,28 +19320,7 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
-        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
-            "AffectedLEDs": null,
-            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
-            "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure",
-            "CallHomeCandidate": false,
-            "CommonEventID": "FQPSPCR0058F",
-            "ComponentInstance": null,
-            "DateAdded": null,
-            "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
-            "Internal": false,
-            "LengthyDescription": null,
-            "LogSource": "BMC",
-            "Message": "Failed to write to the fan control device on the system backplane",
-            "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
-            "RelatedEventIDs": {},
-            "Serviceable": false,
-            "Severity": "Warning",
-            "UserAction": null,
-            "VMMigrationFlag": null
-        },
-        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
+        "xyz.openbmc_project.Sensor.Device.Error.WriteFailure||/sys/devices/platform/ahb/1e780000.apb/1e780000.apb:bus@1e78a000/1e78a100.i2c/i2c-3/3-0052": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "xyz.openbmc_project.Sensor.Device.Error.WriteFailure",
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-005b.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-005b.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0068.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0068.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0068.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0069.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-0069.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-0069.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006b.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006b.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006d.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a200.i2c-bus/i2c-3/3-006d.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a200.i2c/i2c-3/3-006d.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0052.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a400.i2c-bus/i2c-7/7-0052.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a400.i2c/i2c-7/7-0052.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0052.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/1e78a780.i2c-bus/i2c-14/i2c-30/30-0052.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/p10bmc/obmc/hwmon/devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/1e78a780.i2c/i2c-14/i2c-30/30-0052.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/dps310@76.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/si7021a20@20.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/tmp275@48.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35219@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/ir35221@72.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35219@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@3c0/ir35221@72.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@48.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@440/tmp275@4a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/bmp280@77.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/dps310@76.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/max31785@52.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@68.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@200/power-supply@69.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@280/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@300/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@500/tmp275@4a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/bmp280@77.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/dps310@76.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/max31785@52.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@68.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@100/power-supply@69.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@140/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@70.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@180/ir35221@71.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf
similarity index 100%
rename from meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf
rename to meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb@1e780000/bus@1e78a000/i2c@380/tmp275@4a.conf
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 60b76d6..f86367a 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -5,45 +5,45 @@
            "
 
 CHIPS:witherspoon = " \
-               bus@1e78a000/i2c-bus@100/max31785@52 \
-               bus@1e78a000/i2c-bus@100/power-supply@68 \
-               bus@1e78a000/i2c-bus@100/power-supply@69 \
-               bus@1e78a000/i2c-bus@100/bmp280@77 \
-               bus@1e78a000/i2c-bus@100/dps310@76 \
-               bus@1e78a000/i2c-bus@140/ir35221@70 \
-               bus@1e78a000/i2c-bus@140/ir35221@71 \
-               bus@1e78a000/i2c-bus@180/ir35221@70 \
-               bus@1e78a000/i2c-bus@180/ir35221@71 \
-               bus@1e78a000/i2c-bus@380/tmp275@4a \
+               bus@1e78a000/i2c@100/max31785@52 \
+               bus@1e78a000/i2c@100/power-supply@68 \
+               bus@1e78a000/i2c@100/power-supply@69 \
+               bus@1e78a000/i2c@100/bmp280@77 \
+               bus@1e78a000/i2c@100/dps310@76 \
+               bus@1e78a000/i2c@140/ir35221@70 \
+               bus@1e78a000/i2c@140/ir35221@71 \
+               bus@1e78a000/i2c@180/ir35221@70 \
+               bus@1e78a000/i2c@180/ir35221@71 \
+               bus@1e78a000/i2c@380/tmp275@4a \
                "
 
 CHIPS:witherspoon-tacoma = " \
-               bus@1e78a000/i2c-bus@200/max31785@52 \
-               bus@1e78a000/i2c-bus@200/power-supply@68 \
-               bus@1e78a000/i2c-bus@200/power-supply@69 \
-               bus@1e78a000/i2c-bus@200/bmp280@77 \
-               bus@1e78a000/i2c-bus@200/dps310@76 \
-               bus@1e78a000/i2c-bus@280/ir35221@70 \
-               bus@1e78a000/i2c-bus@280/ir35221@71 \
-               bus@1e78a000/i2c-bus@300/ir35221@70 \
-               bus@1e78a000/i2c-bus@300/ir35221@71 \
-               bus@1e78a000/i2c-bus@500/tmp275@4a \
+               bus@1e78a000/i2c@200/max31785@52 \
+               bus@1e78a000/i2c@200/power-supply@68 \
+               bus@1e78a000/i2c@200/power-supply@69 \
+               bus@1e78a000/i2c@200/bmp280@77 \
+               bus@1e78a000/i2c@200/dps310@76 \
+               bus@1e78a000/i2c@280/ir35221@70 \
+               bus@1e78a000/i2c@280/ir35221@71 \
+               bus@1e78a000/i2c@300/ir35221@70 \
+               bus@1e78a000/i2c@300/ir35221@71 \
+               bus@1e78a000/i2c@500/tmp275@4a \
                "
 
 CHIPS:p10bmc = " \
-               1e78a200.i2c-bus/i2c-3/3-0068 \
-               1e78a200.i2c-bus/i2c-3/3-0069 \
-               1e78a200.i2c-bus/i2c-3/3-006a \
-               1e78a200.i2c-bus/i2c-3/3-006d \
-               1e78a200.i2c-bus/i2c-3/3-006b \
-               1e78a200.i2c-bus/i2c-3/3-005a \
-               1e78a200.i2c-bus/i2c-3/3-005b \
-               1e78a400.i2c-bus/i2c-7/7-0052 \
-               1e78a780.i2c-bus/i2c-14/i2c-30/30-0052 \
+               1e78a200.i2c/i2c-3/3-0068 \
+               1e78a200.i2c/i2c-3/3-0069 \
+               1e78a200.i2c/i2c-3/3-006a \
+               1e78a200.i2c/i2c-3/3-006d \
+               1e78a200.i2c/i2c-3/3-006b \
+               1e78a200.i2c/i2c-3/3-005a \
+               1e78a200.i2c/i2c-3/3-005b \
+               1e78a400.i2c/i2c-7/7-0052 \
+               1e78a780.i2c/i2c-14/i2c-30/30-0052 \
                "
 
-ITEMSFMT = "ahb/apb/{0}.conf"
-ITEMSFMT:p10bmc = "devices/platform/ahb/ahb--apb/ahb--apb--bus@1e78a000/{0}.conf"
+ITEMSFMT = "ahb/apb@1e780000/{0}.conf"
+ITEMSFMT:p10bmc = "devices/platform/ahb/1e780000.apb/1e780000.apb--bus@1e78a000/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
 
 OCCS = " \