diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
index 61a7f35..c437fa5 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@70.conf
@@ -1,2 +1,2 @@
-LABEL_temp1_input = "p0_vdd_temp"
-LABEL_temp2_input = "p0_vcs_temp"
+LABEL_temp1 = "p0_vdd_temp"
+LABEL_temp2 = "p0_vcs_temp"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
index d1b8f09..ac8f742 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@140/ir35221@71.conf
@@ -1,2 +1,2 @@
-LABEL_temp1_input = "p0_vdn_temp"
-LABEL_temp2_input = "p0_vddr_temp"
+LABEL_temp1 = "p0_vdn_temp"
+LABEL_temp2 = "p0_vddr_temp"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
index 5dd1e52..6089f43 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@70.conf
@@ -1,2 +1,2 @@
-LABEL_temp1_input = "p1_vdd_temp"
-LABEL_temp2_input = "p1_vcs_temp"
+LABEL_temp1 = "p1_vdd_temp"
+LABEL_temp2 = "p1_vcs_temp"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
index a23873e..23cd969 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir35221@71.conf
@@ -1,2 +1,2 @@
-LABEL_temp1_input = "p1_vdn_temp"
-LABEL_temp2_input = "p1_vddr_temp"
+LABEL_temp1 = "p1_vdn_temp"
+LABEL_temp2 = "p1_vddr_temp"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf
index 51d9157..5b55e3c 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf
@@ -1,35 +1,35 @@
-MODE_temp1_input = "label"
-MODE_temp2_input = "label"
-MODE_temp3_input = "label"
-MODE_temp4_input = "label"
-MODE_temp5_input = "label"
-MODE_temp6_input = "label"
-MODE_temp7_input = "label"
-MODE_temp8_input = "label"
-MODE_temp9_input = "label"
-MODE_temp10_input = "label"
-MODE_temp11_input = "label"
-MODE_temp12_input = "label"
-MODE_temp13_input = "label"
-MODE_temp14_input = "label"
-MODE_temp15_input = "label"
-MODE_temp16_input = "label"
-MODE_temp17_input = "label"
-MODE_temp18_input = "label"
-MODE_temp19_input = "label"
-MODE_temp20_input = "label"
-MODE_temp21_input = "label"
-MODE_temp22_input = "label"
-MODE_temp23_input = "label"
-MODE_temp24_input = "label"
-MODE_temp25_input = "label"
-MODE_temp26_input = "label"
-MODE_temp27_input = "label"
-MODE_temp28_input = "label"
-MODE_temp29_input = "label"
-MODE_temp30_input = "label"
-MODE_temp31_input = "label"
-MODE_temp32_input = "label"
+MODE_temp1 = "label"
+MODE_temp2 = "label"
+MODE_temp3 = "label"
+MODE_temp4 = "label"
+MODE_temp5 = "label"
+MODE_temp6 = "label"
+MODE_temp7 = "label"
+MODE_temp8 = "label"
+MODE_temp9 = "label"
+MODE_temp10 = "label"
+MODE_temp11 = "label"
+MODE_temp12 = "label"
+MODE_temp13 = "label"
+MODE_temp14 = "label"
+MODE_temp15 = "label"
+MODE_temp16 = "label"
+MODE_temp17 = "label"
+MODE_temp18 = "label"
+MODE_temp19 = "label"
+MODE_temp20 = "label"
+MODE_temp21 = "label"
+MODE_temp22 = "label"
+MODE_temp23 = "label"
+MODE_temp24 = "label"
+MODE_temp25 = "label"
+MODE_temp26 = "label"
+MODE_temp27 = "label"
+MODE_temp28 = "label"
+MODE_temp29 = "label"
+MODE_temp30 = "label"
+MODE_temp31 = "label"
+MODE_temp32 = "label"
 LABEL_temp17 = "p0_core0_temp"
 LABEL_temp20 = "p0_core1_temp"
 LABEL_temp23 = "p0_core2_temp"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf
index b94b83f..03b424a 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf
@@ -1,35 +1,35 @@
-MODE_temp1_input = "label"
-MODE_temp2_input = "label"
-MODE_temp3_input = "label"
-MODE_temp4_input = "label"
-MODE_temp5_input = "label"
-MODE_temp6_input = "label"
-MODE_temp7_input = "label"
-MODE_temp8_input = "label"
-MODE_temp9_input = "label"
-MODE_temp10_input = "label"
-MODE_temp11_input = "label"
-MODE_temp12_input = "label"
-MODE_temp13_input = "label"
-MODE_temp14_input = "label"
-MODE_temp15_input = "label"
-MODE_temp16_input = "label"
-MODE_temp17_input = "label"
-MODE_temp18_input = "label"
-MODE_temp19_input = "label"
-MODE_temp20_input = "label"
-MODE_temp21_input = "label"
-MODE_temp22_input = "label"
-MODE_temp23_input = "label"
-MODE_temp24_input = "label"
-MODE_temp25_input = "label"
-MODE_temp26_input = "label"
-MODE_temp27_input = "label"
-MODE_temp28_input = "label"
-MODE_temp29_input = "label"
-MODE_temp30_input = "label"
-MODE_temp31_input = "label"
-MODE_temp32_input = "label"
+MODE_temp1 = "label"
+MODE_temp2 = "label"
+MODE_temp3 = "label"
+MODE_temp4 = "label"
+MODE_temp5 = "label"
+MODE_temp6 = "label"
+MODE_temp7 = "label"
+MODE_temp8 = "label"
+MODE_temp9 = "label"
+MODE_temp10 = "label"
+MODE_temp11 = "label"
+MODE_temp12 = "label"
+MODE_temp13 = "label"
+MODE_temp14 = "label"
+MODE_temp15 = "label"
+MODE_temp16 = "label"
+MODE_temp17 = "label"
+MODE_temp18 = "label"
+MODE_temp19 = "label"
+MODE_temp20 = "label"
+MODE_temp21 = "label"
+MODE_temp22 = "label"
+MODE_temp23 = "label"
+MODE_temp24 = "label"
+MODE_temp25 = "label"
+MODE_temp26 = "label"
+MODE_temp27 = "label"
+MODE_temp28 = "label"
+MODE_temp29 = "label"
+MODE_temp30 = "label"
+MODE_temp31 = "label"
+MODE_temp32 = "label"
 LABEL_temp91 = "p1_core0_temp"
 LABEL_temp94 = "p1_core1_temp"
 LABEL_temp97 = "p1_core2_temp"