diff --git a/configurations/sbp1_baseboard.json b/configurations/sbp1_baseboard.json
index 81cd1b3..18ee045 100644
--- a/configurations/sbp1_baseboard.json
+++ b/configurations/sbp1_baseboard.json
@@ -382,7 +382,7 @@
             ],
             "Name": "P1V8_PCH_AUX",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -559,7 +559,7 @@
             ],
             "Name": "PVCORE_NIC2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -625,7 +625,7 @@
             ],
             "Name": "PVCORE_NIC1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -691,7 +691,7 @@
             ],
             "Name": "P3V3_NIC",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -757,7 +757,7 @@
             ],
             "Name": "P1V2_NIC",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -823,7 +823,7 @@
             ],
             "Name": "P1V8_NIC",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -889,7 +889,7 @@
             ],
             "Name": "P1V05_PCH_AUX",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3218,7 +3218,7 @@
             "Name": "PVCCFA_EHV_CPU0",
             "Name1": "PVCCINFAON_CPU0",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3311,7 +3311,7 @@
             "Name": "PVCCFA_EHV_CPU1",
             "Name1": "PVCCINFAON_CPU1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3404,7 +3404,7 @@
             "Name": "PVCCFA_EHV_CPU2",
             "Name1": "PVCCINFAON_CPU2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3497,7 +3497,7 @@
             "Name": "PVCCFA_EHV_CPU3",
             "Name1": "PVCCINFAON_CPU3",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3590,7 +3590,7 @@
             "Name": "PVCCIN_CPU0",
             "Name1": "PVCCFA_EHV_FIVRA_CPU0",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3683,7 +3683,7 @@
             "Name": "PVCCIN_CPU1",
             "Name1": "PVCCFA_EHV_FIVRA_CPU1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3776,7 +3776,7 @@
             "Name": "PVCCIN_CPU2",
             "Name1": "PVCCFA_EHV_FIVRA_CPU2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3869,7 +3869,7 @@
             "Name": "PVCCIN_CPU3",
             "Name1": "PVCCFA_EHV_FIVRA_CPU3",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -3958,7 +3958,7 @@
             ],
             "Name": "PVNN_MAIN_CPU0",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4026,7 +4026,7 @@
             ],
             "Name": "PVNN_MAIN_CPU3",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4094,7 +4094,7 @@
             ],
             "Name": "PVNN_MAIN_CPU1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4162,7 +4162,7 @@
             ],
             "Name": "PVNN_MAIN_CPU2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4230,7 +4230,7 @@
             ],
             "Name": "PVPP_HBM_CPU3",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4284,7 +4284,7 @@
             ],
             "Name": "PVPP_HBM_CPU1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4338,7 +4338,7 @@
             ],
             "Name": "PVPP_HBM_CPU2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4392,7 +4392,7 @@
             ],
             "Name": "PVPP_HBM_CPU0",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4446,7 +4446,7 @@
             ],
             "Name": "PVCCD_HV_CPU3",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4509,7 +4509,7 @@
             ],
             "Name": "PVCCD_HV_CPU1",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4572,7 +4572,7 @@
             ],
             "Name": "PVCCD_HV_CPU2",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -4635,7 +4635,7 @@
             ],
             "Name": "PVCCD_HV_CPU0",
             "PollRate": 5.0,
-            "PowerState": "Always",
+            "PowerState": "On",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/sbp1_psu.json b/configurations/sbp1_psu.json
index a1bee42..83cb470 100644
--- a/configurations/sbp1_psu.json
+++ b/configurations/sbp1_psu.json
@@ -82,7 +82,7 @@
                 "Name": "BCM1_TEMP",
                 "Name1": "BCM1",
                 "PollRate": 5.0,
-                "PowerState": "Always",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -148,7 +148,7 @@
                 "Name": "BCM2_TEMP",
                 "Name1": "BCM2",
                 "PollRate": 5.0,
-                "PowerState": "Always",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "greater than",
@@ -214,7 +214,7 @@
                 "Name": "BCM3_TEMP",
                 "Name1": "BCM3",
                 "PollRate": 5.0,
-                "PowerState": "Always",
+                "PowerState": "On",
                 "Thresholds": [
                     {
                         "Direction": "greater than",