diff --git a/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
index 40472a6..ee556b4 100644
--- a/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
+++ b/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml
@@ -349,28 +349,28 @@
 0x40:
   <<: *voltage
   entityInstance: 0x10
-  path: /xyz/openbmc_project/sensors/voltage/vddq_abcd_out
+  path: /xyz/openbmc_project/sensors/voltage/vddio_abcd_out
   multiplierM: 78
   rExp: -4
 
 0x41:
   <<: *voltage_13v5_in
   entityInstance: 0x11
-  path: /xyz/openbmc_project/sensors/voltage/vddq_abcd_in
+  path: /xyz/openbmc_project/sensors/voltage/vddio_abcd_in
   multiplierM: 55
   rExp: -3
 
 0x55:
   <<: *current
   entityInstance: 0x19
-  path: /xyz/openbmc_project/sensors/current/vddq_abcd_in
+  path: /xyz/openbmc_project/sensors/current/vddio_abcd_in
   multiplierM: 353
   rExp: -4
 
 0x54:
   <<: *current
   entityInstance: 0x18
-  path: /xyz/openbmc_project/sensors/current/vddq_abcd_out
+  path: /xyz/openbmc_project/sensors/current/vddio_abcd_out
   multiplierM: 345
   rExp: -3
 
@@ -378,28 +378,28 @@
 0x42:
   <<: *voltage
   entityInstance: 0x12
-  path: /xyz/openbmc_project/sensors/voltage/vddq_efgh_out
+  path: /xyz/openbmc_project/sensors/voltage/vddio_efgh_out
   multiplierM: 78
   rExp: -4
 
 0x43:
   <<: *voltage_13v5_in
   entityInstance: 0x13
-  path: /xyz/openbmc_project/sensors/voltage/vddq_efgh_in
+  path: /xyz/openbmc_project/sensors/voltage/vddio_efgh_in
   multiplierM: 55
   rExp: -3
 
 0x57:
   <<: *current
   entityInstance: 0x1b
-  path: /xyz/openbmc_project/sensors/current/vddq_efgh_in
+  path: /xyz/openbmc_project/sensors/current/vddio_efgh_in
   multiplierM: 353
   rExp: -4
 
 0x56:
   <<: *current
   entityInstance: 0x1a
-  path: /xyz/openbmc_project/sensors/current/vddq_efgh_out
+  path: /xyz/openbmc_project/sensors/current/vddio_efgh_out
   multiplierM: 345
   rExp: -3
 
@@ -407,28 +407,28 @@
 0x47:
   <<: *voltage
   entityInstance: 0x20
-  path: /xyz/openbmc_project/sensors/voltage/p12v_1_out
+  path: /xyz/openbmc_project/sensors/voltage/p12v_mobo_out
   multiplierM: 55
   rExp: -3
 
 0x48:
   <<: *voltage_13v5_in
   entityInstance: 0x21
-  path: /xyz/openbmc_project/sensors/voltage/p12v_1_in
+  path: /xyz/openbmc_project/sensors/voltage/p12v_mobo_in
   multiplierM: 255
   rExp: -3
 
 0x5A:
   <<: *current
   entityInstance: 0x25
-  path: /xyz/openbmc_project/sensors/current/p12v_1_in
+  path: /xyz/openbmc_project/sensors/current/p12v_mobo_in
   multiplierM: 137
   rExp: -3
 
 0x59:
   <<: *current
   entityInstance: 0x24
-  path: /xyz/openbmc_project/sensors/current/p12v_1_out
+  path: /xyz/openbmc_project/sensors/current/p12v_mobo_out
   multiplierM: 59
   rExp: -2
 
@@ -436,28 +436,28 @@
 0x49:
   <<: *voltage
   entityInstance: 0x22
-  path: /xyz/openbmc_project/sensors/voltage/p12v_2_out
+  path: /xyz/openbmc_project/sensors/voltage/p12v_fan_out
   multiplierM: 55
   rExp: -3
 
 0x4A:
   <<: *voltage_13v5_in
   entityInstance: 0x23
-  path: /xyz/openbmc_project/sensors/voltage/p12v_2_in
+  path: /xyz/openbmc_project/sensors/voltage/p12v_fan_in
   multiplierM: 255
   rExp: -3
 
 0x5C:
   <<: *current
   entityInstance: 0x27
-  path: /xyz/openbmc_project/sensors/current/p12v_2_in
+  path: /xyz/openbmc_project/sensors/current/p12v_fan_in
   multiplierM: 137
   rExp: -3
 
 0x5B:
   <<: *current
   entityInstance: 0x26
-  path: /xyz/openbmc_project/sensors/current/p12v_2_out
+  path: /xyz/openbmc_project/sensors/current/p12v_fan_out
   multiplierM: 59
   rExp: -2
 
diff --git a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
index 757e699..6fb8563 100644
--- a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
+++ b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "vddq_efgh_in"
+LABEL_in1 = "vddio_efgh_in"
 CRITHI_in1 = "12600"
 CRITLO_in1 = "11400"
 WARNHI_in1 = "12600"
@@ -9,7 +9,7 @@
 GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "vddq_efgh_out"
+LABEL_in2 = "vddio_efgh_out"
 CRITHI_in2 = "1320"
 CRITLO_in2 = "800"
 WARNHI_in2 = "1320"
@@ -18,7 +18,7 @@
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "vddq_efgh_in"
+LABEL_curr1 = "vddio_efgh_in"
 CRITHI_curr1 = "8400"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "8400"
@@ -27,7 +27,7 @@
 MAXVALUE_curr1 = "9"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "vddq_efgh_out"
+LABEL_curr2 = "vddio_efgh_out"
 CRITHI_curr2 = "84000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "84000"
diff --git a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
index df12a20..5c484c5 100644
--- a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
+++ b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "vddq_abcd_in"
+LABEL_in1 = "vddio_abcd_in"
 CRITHI_in1 = "12600"
 CRITLO_in1 = "11400"
 WARNHI_in1 = "12600"
@@ -9,7 +9,7 @@
 GAIN_in1 = "10.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "vddq_abcd_out"
+LABEL_in2 = "vddio_abcd_out"
 CRITHI_in2 = "1320"
 CRITLO_in2 = "800"
 WARNHI_in2 = "1320"
@@ -18,7 +18,7 @@
 MAXVALUE_in2 = "2"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "vddq_abcd_in"
+LABEL_curr1 = "vddio_abcd_in"
 CRITHI_curr1 = "8400"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "8400"
@@ -27,7 +27,7 @@
 MAXVALUE_curr1 = "9"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "vddq_abcd_out"
+LABEL_curr2 = "vddio_abcd_out"
 CRITHI_curr2 = "84000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "84000"
diff --git a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
index 530d36f..c5f694a 100644
--- a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
+++ b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "p12v_2_in"
+LABEL_in1 = "p12v_fan_in"
 CRITHI_in1 = "60000"
 CRITLO_in1 = "40000"
 WARNHI_in1 = "60000"
@@ -9,7 +9,7 @@
 GAIN_in1 = "100.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "p12v_2_out"
+LABEL_in2 = "p12v_fan_out"
 CRITHI_in2 = "12600"
 CRITLO_in2 = "11400"
 WARNHI_in2 = "12600"
@@ -20,7 +20,7 @@
 GAIN_in2 = "5.02"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "p12v_2_in"
+LABEL_curr1 = "p12v_fan_in"
 CRITHI_curr1 = "22000"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "22000"
@@ -29,7 +29,7 @@
 MAXVALUE_curr1 = "35"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "p12v_2_out"
+LABEL_curr2 = "p12v_fan_out"
 CRITHI_curr2 = "88000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "88000"
diff --git a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
index 59bf255..a8e92ef 100644
--- a/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
+++ b/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
@@ -1,4 +1,4 @@
-LABEL_in1 = "p12v_1_in"
+LABEL_in1 = "p12v_mobo_in"
 CRITHI_in1 = "60000"
 CRITLO_in1 = "40000"
 WARNHI_in1 = "60000"
@@ -9,7 +9,7 @@
 GAIN_in1 = "100.0"
 PWRONMON_in1 = "ON"
 
-LABEL_in2 = "p12v_1_out"
+LABEL_in2 = "p12v_mobo_out"
 CRITHI_in2 = "12600"
 CRITLO_in2 = "11400"
 WARNHI_in2 = "12600"
@@ -20,7 +20,7 @@
 GAIN_in2 = "5.02"
 PWRONMON_in2 = "ON"
 
-LABEL_curr1 = "p12v_1_in"
+LABEL_curr1 = "p12v_mobo_in"
 CRITHI_curr1 = "30000"
 CRITLO_curr1 = "0"
 WARNHI_curr1 = "30000"
@@ -29,7 +29,7 @@
 MAXVALUE_curr1 = "35"
 PWRONMON_curr1 = "ON"
 
-LABEL_curr2 = "p12v_1_out"
+LABEL_curr2 = "p12v_mobo_out"
 CRITHI_curr2 = "100000"
 CRITLO_curr2 = "0"
 WARNHI_curr2 = "100000"