diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
index 896679a..73de9bc 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf
@@ -1,5 +1,5 @@
-INVENTORY=/system/chassis/power_supply0
+INVENTORY=/system/chassis/powersupply0
 DEVPATH=/dev/input/by-path/platform-gpio-keys-event
 KEY=127
-NAME=power_supply0
+NAME=powersupply0
 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
index 0f46495..facbd08 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf
@@ -1,5 +1,5 @@
-INVENTORY=/system/chassis/power_supply1
+INVENTORY=/system/chassis/powersupply1
 DEVPATH=/dev/input/by-path/platform-gpio-keys-event
 KEY=104
-NAME=power_supply1
+NAME=powersupply1
 DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
index a55828d..1a8c7c9 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-0.conf
@@ -1,4 +1,4 @@
 DEVPATH=/sys/bus/i2c/devices/3-0068
 INSTANCE=0
-INVENTORY=/system/chassis/power_supply0
+INVENTORY=/system/chassis/powersupply0
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
index fea2ad0..fe29da3 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/obmc/power-supply-monitor/power-supply-monitor-1.conf
@@ -1,4 +1,4 @@
 DEVPATH=/sys/bus/i2c/devices/3-0069
 INSTANCE=1
-INVENTORY=/system/chassis/power_supply1
+INVENTORY=/system/chassis/powersupply1
 
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
index 0e8f9d0..5de65df 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis/witherspoon-power-supply-monitor@.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Witherspoon Power Supply %I Monitor
-Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service
-After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-power_supply%i.service
+Wants=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
+After=mapper-wait@-xyz-openbmc_project-inventory-system-chassis-powersupply%i.service
 Wants=mapper-wait@-org-openbmc-control-power0.service
 After=mapper-wait@-org-openbmc-control-power0.service
 ConditionPathExists={envfiledir}/obmc/power-supply-monitor/power-supply-monitor-%i.conf
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
index 9d57404..9309015 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-policy/power-supply-policy.yaml
@@ -7,14 +7,14 @@
   group: path
   members:
     - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/power_supply0
+      path: /xyz/openbmc_project/inventory/system/chassis/powersupply0
 
 - name: power supply1
   class: group
   group: path
   members:
     - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/power_supply1
+      path: /xyz/openbmc_project/inventory/system/chassis/powersupply1
 
 - name: power supplies
   description: >
@@ -23,9 +23,9 @@
   group: path
   members:
     - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/power_supply0
+      path: /xyz/openbmc_project/inventory/system/chassis/powersupply0
     - meta: POWER SUPPLY
-      path: /xyz/openbmc_project/inventory/system/chassis/power_supply1
+      path: /xyz/openbmc_project/inventory/system/chassis/powersupply1
 
 - name: chassis state
   description: >
@@ -142,7 +142,7 @@
   error: xyz::openbmc_project::Inventory::Error::NotPresent
   metadata:
     - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/power_supply0
+      value: /xyz/openbmc_project/inventory/system/chassis/powersupply0
       type: string
 
 - name: notpresent power supply1 error
@@ -153,5 +153,5 @@
   error: xyz::openbmc_project::Inventory::Error::NotPresent
   metadata:
     - name: xyz::openbmc_project::Inventory::NotPresent::CALLOUT_INVENTORY_PATH
-      value: /xyz/openbmc_project/inventory/system/chassis/power_supply1
+      value: /xyz/openbmc_project/inventory/system/chassis/powersupply1
       type: string