diff --git a/README.md b/README.md
index 2e44a34..a85a1b8 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
 | "probe"   | "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'FFPANEL'})" | Statement which attempts to read from the hardware. The result determines if a configuration record should be applied. The value for probe can be set to “TRUE” in the case the record should always be applied, or set to more complex lookups, for instance a field in a FRU file. |
 | "exposes" | [{"Name" : "CPU fan"}, ...]              | An array of JSON objects which are valid if the probe result is successful. These objects describe the devices BMC can interact. |
 | "status"  | "disabled"                               | An indicator that allows for some records to be disabled by default. |
-| "bind_*"  | "2U System Fan connector 1"              | The record isn't complete and needs to be combined with another to be functional. The value is a unique reference to a record elsewhere. |
+| "Bind*"  | "2U System Fan connector 1"              | The record isn't complete and needs to be combined with another to be functional. The value is a unique reference to a record elsewhere. |
 
 Template strings in the form of "$identifier" may be used in configuration
 files. The following table describes the template strings currently defined.
@@ -153,7 +153,7 @@
 
 Although fan connectors are considered a part of a baseboard, the physical
 fans themselves are considered as a part of a chassis. In order for a fan to
-be matched with a fan connector, the keyword "bind_connector" is used. The
+be matched with a fan connector, the keyword "Bind" is used. The
 example below shows how a chassis fan named "Fan 1" is connected to the
 connector named "1U System Fan connector 1". When the probe command finds the
 correct product name in baseboard FRU, the fan and the connector are
@@ -163,7 +163,7 @@
 {
     "exposes": [
         {
-            "bind_connector": "1U System Fan connector 1",
+            "BindConnector": "1U System Fan connector 1",
             "Name": "Fan 1",
             "thresholds": [
                 [
diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index 81f2be2..5d5b840 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -1,53 +1,53 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x48",
-                "bus": "$bus",
+                "Address": "0x48",
+                "Bus": "$bus",
                 "Name": "Riser 1 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "0x72",
-                "bus": "$bus",
+                "Address": "0x72",
+                "Bus": "$bus",
                 "Name": "Riser 1 Mux",
                 "Type": "PCA9543Mux"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 1 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "1Ux16 Riser 1",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -56,54 +56,54 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x49",
-                "bus": "$bus",
+                "Address": "0x49",
+                "Bus": "$bus",
                 "Name": "Riser 2 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "0x73",
-                "bus": "$bus",
+                "Address": "0x73",
+                "Bus": "$bus",
                 "Name": "Riser 2 Mux",
                 "Type": "PCA9543Mux"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 2 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "1Ux16 Riser 2",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index cf2540b..94b8026 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -1,53 +1,53 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x48",
-                "bus": "$bus",
+                "Address": "0x48",
+                "Bus": "$bus",
                 "Name": "Riser 1 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "0x72",
-                "bus": "$bus",
+                "Address": "0x72",
+                "Bus": "$bus",
                 "Name": "Riser 1 Mux",
                 "Type": "PCA9545Mux"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 1 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "2Ux8 Riser 1",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -56,54 +56,54 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x49",
-                "bus": "$bus",
+                "Address": "0x49",
+                "Bus": "$bus",
                 "Name": "Riser 2 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "0x73",
-                "bus": "$bus",
+                "Address": "0x73",
+                "Bus": "$bus",
                 "Name": "Riser 2 Mux",
                 "Type": "PCA9545Mux"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 2 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "2Ux8 Riser 2",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25 HSBP.json
index ca7574f..c21a8be 100644
--- a/configurations/8X25 HSBP.json
+++ b/configurations/8X25 HSBP.json
@@ -1,7 +1,7 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "address": "0xEB",
+            "Address": "0xEB",
             "Name": "HSBP $index Drive Mux",
             "Type": "GenericSMBusMux"
         },
@@ -15,5 +15,5 @@
         }
     ],
     "Name": "1U_HSBP",
-    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})"
+    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME':'F1U8X25S3PHSBP'})"
 }
\ No newline at end of file
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index e22bb96..57887b3 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -1,21 +1,21 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x59",
-                "bus": "$bus",
+                "Address": "0x59",
+                "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Delta DPS-750XB PSU 2",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x58",
-                "bus": "$bus",
+                "Address": "0x58",
+                "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Delta DPS-750XB PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Delta DPS-750XB PSU 1",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index d412248..dc7846a 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -1,47 +1,47 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x48",
-                "bus": "$bus",
+                "Address": "0x48",
+                "Bus": "$bus",
                 "Name": "Riser1 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 1 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "2U12x35 Riser1",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -50,48 +50,48 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x49",
-                "bus": "$bus",
+                "Address": "0x49",
+                "Bus": "$bus",
                 "Name": "Riser2 Temp",
-                "thresholds": [
+                "Thresholds": [
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper critical",
-                        "severity": 1,
-                        "value": 80
+                        "Severity": 1,
+                        "Value": 80
                     },
                     {
-                        "direction": "greater than",
+                        "Direction": "greater than",
                         "Name": "upper non critical",
-                        "severity": 0,
-                        "value": 75
+                        "Severity": 0,
+                        "Value": 75
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower non critical",
-                        "severity": 0,
-                        "value": 5
+                        "Severity": 0,
+                        "Value": 5
                     },
                     {
-                        "direction": "less than",
+                        "Direction": "less than",
                         "Name": "lower critical",
-                        "severity": 1,
-                        "value": 0
+                        "Severity": 1,
+                        "Value": 0
                     }
                 ],
                 "Type": "TMP75"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Riser 2 Fru",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "2U12x35 Riser2",
-        "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index a96b4e6..82a3b6c 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -1,21 +1,21 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x59",
-                "bus": "$bus",
+                "Address": "0x59",
+                "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 2",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x58",
-                "bus": "$bus",
+                "Address": "0x58",
+                "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Flextronics S-1100ADU00-201 PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Flextronics S-1100ADU00-201 PSU 1",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 4e55cac..c4319e8 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -1,46 +1,46 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "address": "$address",
-            "bus": "$bus",
+            "Address": "$address",
+            "Bus": "$bus",
             "Name": "Front Panel FRU",
             "Type": "IntelFruDevice"
         },
         {
-            "address": "0x4D",
-            "bus": "$bus",
+            "Address": "0x4D",
+            "Bus": "$bus",
             "Name": "Front Panel Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 55
+                    "Severity": 1,
+                    "Value": 55
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 50
+                    "Severity": 0,
+                    "Value": 50
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         }
     ],
     "Name": "Intel Front Panel",
-    "probe": [
+    "Probe": [
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
         "OR",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2USTOPANEL'})"
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index 9ac9ce6..c2bf944 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -1,20 +1,20 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "address": "$address",
-            "bus": "$bus",
+            "Address": "$address",
+            "Bus": "$bus",
             "Name": "PCIE SSD Retimer FRU",
             "Type": "IntelFruDevice"
         },
         {
-            "address": "0x4F",
-            "bus": "$bus",
+            "Address": "0x4F",
+            "Bus": "$bus",
             "Name": "PCIE SSD Retimer Temp",
             "Type": "TMP75"
         }
     ],
     "Name": "PCIE SSD Retimer",
-    "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
+    "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
         "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
old mode 100755
new mode 100644
index 7182cfc..dcba8f0
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -1,21 +1,21 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x59",
-                "bus": "$bus",
+                "Address": "0x59",
+                "Bus": "$bus",
                 "Name": "Solum 1300W PSU 2 Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Solum 1300W PSU 2 FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Solum 1300W PSU 2",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
@@ -25,22 +25,22 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x58",
-                "bus": "$bus",
+                "Address": "0x58",
+                "Bus": "$bus",
                 "Name": "Solum 1300W PSU 1 Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "Solum 1300W PSU 1 FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "Solum 1300W PSU 1",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 9394579..99fff13 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -1,241 +1,241 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "bind_connector": "1U System Fan connector 1",
-            "index": 0,
+            "BindConnector": "1U System Fan connector 1",
+            "Index": 0,
             "Name": "Fan 1a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 1",
-            "index": 1,
+            "BindConnector": "1U System Fan connector 1",
+            "Index": 1,
             "Name": "Fan 1b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 2",
-            "index": 2,
+            "BindConnector": "1U System Fan connector 2",
+            "Index": 2,
             "Name": "Fan 2a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 2",
-            "index": 3,
+            "BindConnector": "1U System Fan connector 2",
+            "Index": 3,
             "Name": "Fan 2b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 3",
-            "index": 4,
+            "BindConnector": "1U System Fan connector 3",
+            "Index": 4,
             "Name": "Fan 3a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 3",
-            "index": 5,
+            "BindConnector": "1U System Fan connector 3",
+            "Index": 5,
             "Name": "Fan 3b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 4",
-            "index": 6,
+            "BindConnector": "1U System Fan connector 4",
+            "Index": 6,
             "Name": "Fan 4a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 4",
-            "index": 7,
+            "BindConnector": "1U System Fan connector 4",
+            "Index": 7,
             "Name": "Fan 4b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 5",
-            "index": 8,
+            "BindConnector": "1U System Fan connector 5",
+            "Index": 8,
             "Name": "Fan 5a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 5",
-            "index": 9,
+            "BindConnector": "1U System Fan connector 5",
+            "Index": 9,
             "Name": "Fan 5b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 6",
-            "index": 10,
+            "BindConnector": "1U System Fan connector 6",
+            "Index": 10,
             "Name": "Fan 6a",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1080
+                    "Severity": 1,
+                    "Value": 1080
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1260
+                    "Severity": 0,
+                    "Value": 1260
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "1U System Fan connector 6",
-            "index": 11,
+            "BindConnector": "1U System Fan connector 6",
+            "Index": 11,
             "Name": "Fan 6b",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1110
+                    "Severity": 1,
+                    "Value": 1110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1295
+                    "Severity": 0,
+                    "Value": 1295
                 }
             ],
             "Type": "AspeedFan"
@@ -405,7 +405,7 @@
         }
     ],
     "Name": "R1000 Chassis",
-    "probe": [
+    "Probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d'})",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index b4181ab..304e8c3 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -1,128 +1,128 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "bind_connector": "2U System Fan connector 1",
-            "index": 0,
+            "BindConnector": "2U System Fan connector 1",
+            "Index": 0,
             "Name": "Fan 1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "2U System Fan connector 2",
-            "index": 2,
+            "BindConnector": "2U System Fan connector 2",
+            "Index": 2,
             "Name": "Fan 2",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "2U System Fan connector 3",
-            "index": 4,
+            "BindConnector": "2U System Fan connector 3",
+            "Index": 4,
             "Name": "Fan 3",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "2U System Fan connector 4",
-            "index": 6,
+            "BindConnector": "2U System Fan connector 4",
+            "Index": 6,
             "Name": "Fan 4",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "2U System Fan connector 5",
-            "index": 8,
+            "BindConnector": "2U System Fan connector 5",
+            "Index": 8,
             "Name": "Fan 5",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "2U System Fan connector 6",
-            "index": 10,
+            "BindConnector": "2U System Fan connector 6",
+            "Index": 10,
             "Name": "Fan 6",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         }
     ],
     "Name": "R2000 Chassis",
-    "probe": [
+    "Probe": [
         "FOUND('WFP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL\\d+RISER\\d'})",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index 10363e9..2a1ad36 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -1,17 +1,17 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "bus": "$bus",
+            "Bus": "$bus",
             "Name": "SAS Module FRU",
             "Type": "IntelFruDevice"
         },
         {
-            "address": "0x98",
-            "bus": "$bus",
+            "Address": "0x98",
+            "Bus": "$bus",
             "Name": "SAS Module Temperature",
             "Type": "TMP75"
         }
     ],
     "Name": "SAS Module",
-    "probe": "FALSE"
+    "Probe": "FALSE"
 }
\ No newline at end of file
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 42be150..2730c24 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -1,21 +1,21 @@
 [
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x59",
-                "bus": "$bus",
+                "Address": "0x59",
+                "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 2",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -25,22 +25,22 @@
         }
     },
     {
-        "exposes": [
+        "Exposes": [
             {
-                "address": "0x58",
-                "bus": "$bus",
+                "Address": "0x58",
+                "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU Device",
                 "Type": "pmbus"
             },
             {
-                "address": "$address",
-                "bus": "$bus",
+                "Address": "$address",
+                "Bus": "$bus",
                 "Name": "SOLUM CO IS162F22 PSU FRU",
                 "Type": "IntelFruDevice"
             }
         ],
         "Name": "SOLUM CO IS162F22 PSU 1",
-        "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
+        "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
         "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 88d417e..c3d64b3 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -1,852 +1,844 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "fault_led": 0,
             "Name": "4U System Fan connector 1",
             "present": 0,
-            "pwm": 1,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
                 1
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 1,
             "Name": "4U System Fan connector 2",
             "present": 1,
-            "pwm": 2,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
                 2
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 2,
             "Name": "4U System Fan connector 3",
             "present": 2,
-            "pwm": 3,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
                 3
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 3,
             "Name": "4U System Fan connector 4",
             "present": 3,
-            "pwm": 4,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
                 4
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 4,
             "Name": "4U System Fan connector 5",
             "present": 4,
-            "pwm": 5,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
                 5
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 5,
             "Name": "4U System Fan connector 6",
             "present": 5,
-            "pwm": 6,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 6,
+            "Status": "disabled",
+            "Tachs": [
                 6
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 6,
             "Name": "4U CPU 0 fan connector",
-            "pwm": 7,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 7,
+            "Status": "disabled",
+            "Tachs": [
                 7
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "fault_led": 7,
             "Name": "4U CPU 1 fan connector",
-            "pwm": 8,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 8,
+            "Status": "disabled",
+            "Tachs": [
                 8
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "4U System Fan connector 7",
-            "pwm": 9,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 9,
+            "Status": "disabled",
+            "Tachs": [
                 9
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "address": "0x48",
-            "bus": 6,
+            "Address": "0x48",
+            "Bus": 6,
             "Name": "M_2 Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x4F",
-            "bus": 6,
+            "Address": "0x4F",
+            "Bus": 6,
             "Name": "Memory VRM Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x4E",
-            "bus": 6,
+            "Address": "0x4E",
+            "Bus": 6,
             "Name": "LR Memory Board Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x4C",
-            "bus": 6,
+            "Address": "0x4C",
+            "Bus": 6,
             "Name": "BMC Temp",
             "Name1": "TMP421 Internal Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP421"
         },
         {
-            "address": "0x49",
-            "bus": 6,
+            "Address": "0x49",
+            "Bus": 6,
             "Name": "CPU VR Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x4D",
-            "bus": 6,
+            "Address": "0x4D",
+            "Bus": 6,
             "Name": "Ambient Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "index": 0,
+            "Index": 0,
             "Name": "PSU 12 Volt",
-            "scale_factor": 0.1124,
-            "thresholds": [
+            "ScaleFactor": 0.1124,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 13.494
+                    "Severity": 1,
+                    "Value": 13.494
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 13.101
+                    "Severity": 0,
+                    "Value": 13.101
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 10.945
+                    "Severity": 0,
+                    "Value": 10.945
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 10.616
+                    "Severity": 1,
+                    "Value": 10.616
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 1,
+            "Index": 1,
             "Name": "P3V3",
-            "scale_factor": 0.4107,
-            "thresholds": [
+            "ScaleFactor": 0.4107,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 3.647
+                    "Severity": 1,
+                    "Value": 3.647
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 3.066
+                    "Severity": 0,
+                    "Value": 3.066
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 3.066
+                    "Severity": 0,
+                    "Value": 3.066
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 2.974
+                    "Severity": 1,
+                    "Value": 2.974
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 2,
+            "Index": 2,
             "Name": "PVNN_PCH_AUX",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.081
+                    "Severity": 1,
+                    "Value": 1.081
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.049
+                    "Severity": 0,
+                    "Value": 1.049
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.807
+                    "Severity": 0,
+                    "Value": 0.807
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.783
+                    "Severity": 1,
+                    "Value": 0.783
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 3,
+            "Index": 3,
             "Name": "P1V05_PCH_AUX",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.139
+                    "Severity": 1,
+                    "Value": 1.139
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.106
+                    "Severity": 0,
+                    "Value": 1.106
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.995
+                    "Severity": 0,
+                    "Value": 0.995
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.966
+                    "Severity": 1,
+                    "Value": 0.966
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 4,
+            "Index": 4,
             "Name": "P0V83_LAN_AUX",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 0.901
+                    "Severity": 1,
+                    "Value": 0.901
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 0.875
+                    "Severity": 0,
+                    "Value": 0.875
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.786
+                    "Severity": 0,
+                    "Value": 0.786
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.763
+                    "Severity": 1,
+                    "Value": 0.763
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 5,
+            "Index": 5,
             "Name": "P5V_STBY",
-            "scale_factor": 0.2717,
-            "thresholds": [
+            "ScaleFactor": 0.2717,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 13.494
+                    "Severity": 1,
+                    "Value": 13.494
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 13.101
+                    "Severity": 0,
+                    "Value": 13.101
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 10.945
+                    "Severity": 0,
+                    "Value": 10.945
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 10.616
+                    "Severity": 1,
+                    "Value": 10.616
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 6,
+            "Index": 6,
             "Name": "P1V8_PCH_AUX",
-            "scale_factor": 0.7505,
-            "thresholds": [
+            "ScaleFactor": 0.7505,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.961
+                    "Severity": 1,
+                    "Value": 1.961
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.904
+                    "Severity": 0,
+                    "Value": 1.904
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.699
+                    "Severity": 0,
+                    "Value": 1.699
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.648
+                    "Severity": 1,
+                    "Value": 1.648
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 7,
+            "Index": 7,
             "Name": "P3V_BAT",
-            "scale_factor": 0.3333,
-            "thresholds": [
+            "ScaleFactor": 0.3333,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 3.296
+                    "Severity": 1,
+                    "Value": 3.296
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 3.263
+                    "Severity": 0,
+                    "Value": 3.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2.457
+                    "Severity": 0,
+                    "Value": 2.457
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 2.138
+                    "Severity": 1,
+                    "Value": 2.138
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 8,
+            "Index": 8,
             "Name": "PVCCIN_CPU0",
-            "scale_factor": 0.7505,
-            "thresholds": [
+            "ScaleFactor": 0.7505,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 2.151
+                    "Severity": 1,
+                    "Value": 2.151
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 2.088
+                    "Severity": 0,
+                    "Value": 2.088
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.418
+                    "Severity": 0,
+                    "Value": 1.418
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.376
+                    "Severity": 1,
+                    "Value": 1.376
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 9,
+            "Index": 9,
             "Name": "PVCCIN_CPU1",
-            "scale_factor": 0.7505,
-            "thresholds": [
+            "ScaleFactor": 0.7505,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 2.151
+                    "Severity": 1,
+                    "Value": 2.151
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 2.088
+                    "Severity": 0,
+                    "Value": 2.088
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.418
+                    "Severity": 0,
+                    "Value": 1.418
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.376
+                    "Severity": 1,
+                    "Value": 1.376
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 10,
+            "Index": 10,
             "Name": "PVDDQ_ABC_CPU0",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 11,
+            "Index": 11,
             "Name": "PVDDQ_DEF_CPU0",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 12,
+            "Index": 12,
             "Name": "PVDDQ_ABC_CPU1",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 13,
+            "Index": 13,
             "Name": "PVDDQ_DEF_CPU1",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 14,
+            "Index": 14,
             "Name": "PVCCIO_CPU0",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.19
+                    "Severity": 1,
+                    "Value": 1.19
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.155
+                    "Severity": 0,
+                    "Value": 1.155
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.752
+                    "Severity": 0,
+                    "Value": 0.752
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.729
+                    "Severity": 1,
+                    "Value": 0.729
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 15,
+            "Index": 15,
             "Name": "PVCCIO_CPU1",
-            "scale_factor": 1.0,
-            "thresholds": [
+            "ScaleFactor": 1.0,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.19
+                    "Severity": 1,
+                    "Value": 1.19
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.155
+                    "Severity": 0,
+                    "Value": 1.155
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.752
+                    "Severity": 0,
+                    "Value": 0.752
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.729
+                    "Severity": 1,
+                    "Value": 0.729
                 }
             ],
             "Type": "ADC"
         },
         {
-            "address": "0x30",
-            "cpu_id": 0,
+            "Address": "0x30",
+            "CpuID": 0,
             "Name": "Skylake CPU 0",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 99
+                    "Severity": 1,
+                    "Value": 99
                 },
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 89
+                    "Severity": 0,
+                    "Value": 89
                 }
             ],
             "Type": "SkylakeCPU"
         },
         {
-            "address": "0x31",
-            "cpu_id": 1,
+            "Address": "0x31",
+            "CpuID": 1,
             "Name": "Skylake CPU 1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 99
+                    "Severity": 1,
+                    "Value": 99
                 },
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 89
+                    "Severity": 0,
+                    "Value": 89
                 }
             ],
             "Type": "SkylakeCPU"
         }
     ],
     "Name": "STP Baseboard",
-    "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
+    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP P4000 Chassis.json
index 110b916..cf67cdb 100644
--- a/configurations/STP P4000 Chassis.json
+++ b/configurations/STP P4000 Chassis.json
@@ -1,128 +1,128 @@
 {
-    "exposes": [
+    "Exposes": [
         {
-            "bind_connector": "4U System Fan connector 1",
-            "index": 0,
+            "BindConnector": "4U System Fan connector 1",
+            "Index": 0,
             "Name": "Fan 1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "4U System Fan connector 2",
-            "index": 1,
+            "BindConnector": "4U System Fan connector 2",
+            "Index": 1,
             "Name": "Fan 2",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "4U System Fan connector 3",
-            "index": 2,
+            "BindConnector": "4U System Fan connector 3",
+            "Index": 2,
             "Name": "Fan 3",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "4U System Fan connector 4",
-            "index": 3,
+            "BindConnector": "4U System Fan connector 4",
+            "Index": 3,
             "Name": "Fan 4",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "4U System Fan connector 5",
-            "index": 4,
+            "BindConnector": "4U System Fan connector 5",
+            "Index": 4,
             "Name": "Fan 5",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         },
         {
-            "bind_connector": "4U System Fan connector 6",
-            "index": 5,
+            "BindConnector": "4U System Fan connector 6",
+            "Index": 5,
             "Name": "Fan 6",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1750
+                    "Severity": 1,
+                    "Value": 1750
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2000
+                    "Severity": 0,
+                    "Value": 2000
                 }
             ],
             "Type": "AspeedFan"
         }
     ],
     "Name": "P4000 Chassis",
-    "probe": [
+    "Probe": [
         "FOUND('STP Baseboard')",
         "AND",
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})"
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 8e3a222..e7381bd 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,10 +1,10 @@
 {
-    "exposes": [
+    "Exposes": [
         {
             "Name": "1U System Fan connector 1",
-            "pwm": 0,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 0,
+            "Status": "disabled",
+            "Tachs": [
                 0,
                 1
             ],
@@ -12,9 +12,9 @@
         },
         {
             "Name": "1U System Fan connector 2",
-            "pwm": 1,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
                 2,
                 3
             ],
@@ -22,9 +22,9 @@
         },
         {
             "Name": "1U System Fan connector 3",
-            "pwm": 2,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
                 4,
                 5
             ],
@@ -32,9 +32,9 @@
         },
         {
             "Name": "1U System Fan connector 4",
-            "pwm": 3,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
                 6,
                 7
             ],
@@ -42,9 +42,9 @@
         },
         {
             "Name": "1U System Fan connector 5",
-            "pwm": 4,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
                 8,
                 9
             ],
@@ -52,9 +52,9 @@
         },
         {
             "Name": "1U System Fan connector 6",
-            "pwm": 5,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
                 10,
                 11
             ],
@@ -62,779 +62,779 @@
         },
         {
             "Name": "2U System Fan connector 1",
-            "pwm": 0,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 0,
+            "Status": "disabled",
+            "Tachs": [
                 0
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "2U System Fan connector 2",
-            "pwm": 1,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 1,
+            "Status": "disabled",
+            "Tachs": [
                 2
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "2U System Fan connector 3",
-            "pwm": 2,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 2,
+            "Status": "disabled",
+            "Tachs": [
                 4
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "2U System Fan connector 4",
-            "pwm": 3,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 3,
+            "Status": "disabled",
+            "Tachs": [
                 6
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "2U System Fan connector 5",
-            "pwm": 4,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 4,
+            "Status": "disabled",
+            "Tachs": [
                 8
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "2U System Fan connector 6",
-            "pwm": 5,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 5,
+            "Status": "disabled",
+            "Tachs": [
                 10
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "address": "0x4A",
-            "bus": 6,
+            "Address": "0x4A",
+            "Bus": 6,
             "Name": "BMC Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "index": 0,
+            "Index": 0,
             "Name": "Baseboard 12 Volt",
-            "scale_factor": 0.1124,
-            "thresholds": [
+            "ScaleFactor": 0.1124,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 13.494
+                    "Severity": 1,
+                    "Value": 13.494
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 13.101
+                    "Severity": 0,
+                    "Value": 13.101
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 10.945
+                    "Severity": 0,
+                    "Value": 10.945
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 10.616
+                    "Severity": 1,
+                    "Value": 10.616
                 }
             ],
             "Type": "ADC"
         },
         {
             "Name": "CPU 1 Fan Connector",
-            "pwm": 7,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 7,
+            "Status": "disabled",
+            "Tachs": [
                 13
             ],
             "Type": "IntelFanConnector"
         },
         {
             "Name": "CPU 2 Fan Connector",
-            "pwm": 8,
-            "status": "disabled",
-            "tachs": [
+            "Pwm": 8,
+            "Status": "disabled",
+            "Tachs": [
                 14
             ],
             "Type": "IntelFanConnector"
         },
         {
-            "address": "0x49",
-            "bus": 6,
+            "Address": "0x49",
+            "Bus": 6,
             "Name": "Left Rear Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "index": 4,
+            "Index": 4,
             "Name": "P0V83_LAN_AUX",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 0.901
+                    "Severity": 1,
+                    "Value": 0.901
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 0.875
+                    "Severity": 0,
+                    "Value": 0.875
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.786
+                    "Severity": 0,
+                    "Value": 0.786
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.763
+                    "Severity": 1,
+                    "Value": 0.763
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 3,
+            "Index": 3,
             "Name": "P105_PCH_AUX",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.139
+                    "Severity": 1,
+                    "Value": 1.139
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.106
+                    "Severity": 0,
+                    "Value": 1.106
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.995
+                    "Severity": 0,
+                    "Value": 0.995
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.966
+                    "Severity": 1,
+                    "Value": 0.966
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 5,
+            "Index": 5,
             "Name": "P12V_AUX",
-            "scale_factor": 0.2717,
-            "thresholds": [
+            "ScaleFactor": 0.2717,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 13.494
+                    "Severity": 1,
+                    "Value": 13.494
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 13.101
+                    "Severity": 0,
+                    "Value": 13.101
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 10.945
+                    "Severity": 0,
+                    "Value": 10.945
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 10.616
+                    "Severity": 1,
+                    "Value": 10.616
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 6,
+            "Index": 6,
             "Name": "P1V8_PCH",
-            "scale_factor": 0.7505,
-            "thresholds": [
+            "ScaleFactor": 0.7505,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.961
+                    "Severity": 1,
+                    "Value": 1.961
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.904
+                    "Severity": 0,
+                    "Value": 1.904
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.699
+                    "Severity": 0,
+                    "Value": 1.699
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.648
+                    "Severity": 1,
+                    "Value": 1.648
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 1,
+            "Index": 1,
             "Name": "P3V3",
-            "scale_factor": 0.4107,
-            "thresholds": [
+            "ScaleFactor": 0.4107,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 3.647
+                    "Severity": 1,
+                    "Value": 3.647
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 3.066
+                    "Severity": 0,
+                    "Value": 3.066
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 3.066
+                    "Severity": 0,
+                    "Value": 3.066
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 2.974
+                    "Severity": 1,
+                    "Value": 2.974
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 7,
+            "Index": 7,
             "Name": "P3VBAT",
-            "scale_factor": 0.3333,
-            "thresholds": [
+            "ScaleFactor": 0.3333,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 3.296
+                    "Severity": 1,
+                    "Value": 3.296
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 3.263
+                    "Severity": 0,
+                    "Value": 3.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 2.457
+                    "Severity": 0,
+                    "Value": 2.457
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 2.138
+                    "Severity": 1,
+                    "Value": 2.138
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 8,
+            "Index": 8,
             "Name": "PVCCIN_CPU0",
-            "scale_factor": 0.7505,
-            "thresholds": [
+            "ScaleFactor": 0.7505,
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 2.151
+                    "Severity": 1,
+                    "Value": 2.151
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 2.088
+                    "Severity": 0,
+                    "Value": 2.088
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.418
+                    "Severity": 0,
+                    "Value": 1.418
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.376
+                    "Severity": 1,
+                    "Value": 1.376
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 9,
+            "Index": 9,
             "Name": "PVCCIN_CPU1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 2.151
+                    "Severity": 1,
+                    "Value": 2.151
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 2.088
+                    "Severity": 0,
+                    "Value": 2.088
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.418
+                    "Severity": 0,
+                    "Value": 1.418
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.376
+                    "Severity": 1,
+                    "Value": 1.376
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 14,
+            "Index": 14,
             "Name": "PVCCIO_CPU0",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.19
+                    "Severity": 1,
+                    "Value": 1.19
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.155
+                    "Severity": 0,
+                    "Value": 1.155
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.752
+                    "Severity": 0,
+                    "Value": 0.752
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.729
+                    "Severity": 1,
+                    "Value": 0.729
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 15,
+            "Index": 15,
             "Name": "PVCCIO_CPU1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.19
+                    "Severity": 1,
+                    "Value": 1.19
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.155
+                    "Severity": 0,
+                    "Value": 1.155
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.752
+                    "Severity": 0,
+                    "Value": 0.752
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.729
+                    "Severity": 1,
+                    "Value": 0.729
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 10,
+            "Index": 10,
             "Name": "PVDQ_ABC_CPU0",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 12,
+            "Index": 12,
             "Name": "PVDQ_ABC_CPU1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 11,
+            "Index": 11,
             "Name": "PVDQ_DEF_CPU0",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 13,
+            "Index": 13,
             "Name": "PVDQ_DEF_CPU1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.301
+                    "Severity": 1,
+                    "Value": 1.301
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.263
+                    "Severity": 0,
+                    "Value": 1.263
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 1.138
+                    "Severity": 0,
+                    "Value": 1.138
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 1.104
+                    "Severity": 1,
+                    "Value": 1.104
                 }
             ],
             "Type": "ADC"
         },
         {
-            "index": 2,
+            "Index": 2,
             "Name": "PVNN_PCH_AUX",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 1.081
+                    "Severity": 1,
+                    "Value": 1.081
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 1.049
+                    "Severity": 0,
+                    "Value": 1.049
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 0.807
+                    "Severity": 0,
+                    "Value": 0.807
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0.783
+                    "Severity": 1,
+                    "Value": 0.783
                 }
             ],
             "Type": "ADC"
         },
         {
-            "address": "0x4D",
-            "bus": 6,
+            "Address": "0x4D",
+            "Bus": 6,
             "Name": "Right Rear Board Temp",
             "Name1": "Right Rear TMP421 Internal Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP421"
         },
         {
-            "address": "0x48",
-            "bus": 6,
+            "Address": "0x48",
+            "Bus": 6,
             "Name": "Voltage Regulator 1 Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x4B",
-            "bus": 6,
+            "Address": "0x4B",
+            "Bus": 6,
             "Name": "Voltage Regulator 2 Temp",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 115
+                    "Severity": 1,
+                    "Value": 115
                 },
                 {
-                    "direction": "greater than",
+                    "Direction": "greater than",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 110
+                    "Severity": 0,
+                    "Value": 110
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower non critical",
-                    "severity": 0,
-                    "value": 5
+                    "Severity": 0,
+                    "Value": 5
                 },
                 {
-                    "direction": "less than",
+                    "Direction": "less than",
                     "Name": "lower critical",
-                    "severity": 1,
-                    "value": 0
+                    "Severity": 1,
+                    "Value": 0
                 }
             ],
             "Type": "TMP75"
         },
         {
-            "address": "0x30",
-            "cpu_id": 0,
+            "Address": "0x30",
+            "CpuID": 0,
             "Name": "Skylake CPU 0",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 99
+                    "Severity": 1,
+                    "Value": 99
                 },
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 89
+                    "Severity": 0,
+                    "Value": 89
                 }
             ],
             "Type": "SkylakeCPU"
         },
         {
-            "address": "0x31",
-            "cpu_id": 1,
+            "Address": "0x31",
+            "CpuID": 1,
             "Name": "Skylake CPU 1",
-            "thresholds": [
+            "Thresholds": [
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper critical",
-                    "severity": 1,
-                    "value": 99
+                    "Severity": 1,
+                    "Value": 99
                 },
                 {
-                    "direction": "greater than",
-                    "label": "DIMM",
+                    "Direction": "greater than",
+                    "Label": "DIMM",
                     "Name": "upper non critical",
-                    "severity": 0,
-                    "value": 89
+                    "Severity": 0,
+                    "Value": 89
                 }
             ],
             "Type": "SkylakeCPU"
@@ -865,7 +865,7 @@
         }
     ],
     "Name": "WFP Baseboard",
-    "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
+    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/overlay_templates/ADC.template b/overlay_templates/ADC.template
index c60a4f8..d8e4175 100644
--- a/overlay_templates/ADC.template
+++ b/overlay_templates/ADC.template
@@ -1,13 +1,13 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target-path = "/";
         __overlay__{
             iio-hwmon {
                 compatible = "iio-hwmon";
-                oemname$index = "$Name";
+                oemname$Index = "$Name";
             };
         };
 
diff --git a/overlay_templates/IntelFanConnector.template b/overlay_templates/IntelFanConnector.template
index 4343831..a835f69 100644
--- a/overlay_templates/IntelFanConnector.template
+++ b/overlay_templates/IntelFanConnector.template
@@ -1,17 +1,17 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target = <&pwm_tacho>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            oemname$pwm = "$Name";
-            fan@$pwm {
-                reg = <$pwm>;
-                aspeed,fan-tach-ch = /bits/ 8 <$tachs>;
+            oemname$Pwm = "$Name";
+            fan@$Pwm {
+                reg = <$Pwm>;
+                aspeed,fan-tach-ch = /bits/ 8 <$Tachs>;
             };
         };
 
diff --git a/overlay_templates/IntelFruDevice.template b/overlay_templates/IntelFruDevice.template
index 33cba50..34a97e3 100644
--- a/overlay_templates/IntelFruDevice.template
+++ b/overlay_templates/IntelFruDevice.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: eeprom@$address {
+            $Name: eeprom@$Address {
                 compatible = "atmel,24c02";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 pagesize = <64>;
             };
diff --git a/overlay_templates/PCA9543Mux.template b/overlay_templates/PCA9543Mux.template
index d85a6c3..bb4b9ea 100644
--- a/overlay_templates/PCA9543Mux.template
+++ b/overlay_templates/PCA9543Mux.template
@@ -1,14 +1,14 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             status = "okay";
-            $Name: smbus_mux@$address {
+            $Name: smbus_mux@$Address {
                 compatible = "nxp,pca9543";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
                 oemname1 = "$Name";
diff --git a/overlay_templates/PCA9545Mux.template b/overlay_templates/PCA9545Mux.template
index a106277..7108b80 100644
--- a/overlay_templates/PCA9545Mux.template
+++ b/overlay_templates/PCA9545Mux.template
@@ -1,14 +1,14 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             status = "okay";
-            $Name: smbus_mux@$address {
+            $Name: smbus_mux@$Address {
                 compatible = "nxp,pca9545";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
                 oemname1 = "$Name";
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
index 34b10dd..882a144 100644
--- a/overlay_templates/SkylakeCPU.template
+++ b/overlay_templates/SkylakeCPU.template
@@ -1,17 +1,17 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target = <&peci0>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
 
-            Skylake_CPU_$cpu_id: peci-client@$address {
+            Skylake_CPU_$CpuID: peci-client@$Address {
                 compatible = "intel,peci-client";
                 oemname1 = "$Name";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 status = "okay";
             };
         };
diff --git a/overlay_templates/Symbol.template b/overlay_templates/Symbol.template
index 7d430b2..f6ec38d 100644
--- a/overlay_templates/Symbol.template
+++ b/overlay_templates/Symbol.template
@@ -1,11 +1,11 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
         target-path = "/__symbols__";
         __overlay__{
-           i2c$bus = "$path";
+           i2c$Bus = "$Path";
         };
     };
 };
\ No newline at end of file
diff --git a/overlay_templates/TMP421.template b/overlay_templates/TMP421.template
index 745d824..b819651 100644
--- a/overlay_templates/TMP421.template
+++ b/overlay_templates/TMP421.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name$Name1: tmp421@$address {
+            $Name$Name1: tmp421@$Address {
                 compatible = "ti,tmp421";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 oemname2 = "$Name1";
                 scale = "-3";
diff --git a/overlay_templates/TMP75.template b/overlay_templates/TMP75.template
index ddb5607..164c9ec 100644
--- a/overlay_templates/TMP75.template
+++ b/overlay_templates/TMP75.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: tmp75@$address {
+            $Name: tmp75@$Address {
                 compatible = "ti,tmp75";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
                 scale = "-3";
             };
diff --git a/overlay_templates/pmbus.template b/overlay_templates/pmbus.template
index 7aca62a..ce1df8e 100644
--- a/overlay_templates/pmbus.template
+++ b/overlay_templates/pmbus.template
@@ -1,16 +1,16 @@
 /dts-v1/;
 /plugin/;
 / {
-    compatible = "$platform";
+    compatible = "$Platform";
     fragment@0{
-        target = <&i2c$bus>;
+        target = <&i2c$Bus>;
         __overlay__{
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            $Name: pmbus@$address {
+            $Name: pmbus@$Address {
                 compatible = "pmbus";
-                reg = <0x$address>;
+                reg = <0x$Address>;
                 oemname1 = "$Name";
             };
         };
diff --git a/schemas/global.json b/schemas/global.json
new file mode 100644
index 0000000..ab87394
--- /dev/null
+++ b/schemas/global.json
@@ -0,0 +1,307 @@
+{
+    "$schema": "http://json-schema.org/schema#",
+    "anyOf": [
+        {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Exposes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "Address": {
+                                    "type": "string"
+                                },
+                                "Bus": {
+                                    "type": "string"
+                                },
+                                "Name": {
+                                    "type": "string"
+                                },
+                                "Thresholds": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "Direction": {
+                                                "type": "string"
+                                            },
+                                            "Name": {
+                                                "type": "string"
+                                            },
+                                            "Severity": {
+                                                "type": "integer"
+                                            },
+                                            "Value": {
+                                                "type": "integer"
+                                            }
+                                        },
+                                        "required": [
+                                            "Direction",
+                                            "Name",
+                                            "Severity",
+                                            "Value"
+                                        ]
+                                    }
+                                },
+                                "Type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "Address",
+                                "Bus",
+                                "Name",
+                                "Type"
+                            ]
+                        }
+                    },
+                    "Name": {
+                        "type": "string"
+                    },
+                    "Probe": {
+                        "type": "string"
+                    },
+                    "xyz.openbmc_project.Inventory.Decorator.Asset": {
+                        "type": "object",
+                        "properties": {
+                            "Manufacturer": {
+                                "type": "string"
+                            },
+                            "Model": {
+                                "type": "string"
+                            },
+                            "PartNumber": {
+                                "type": "string"
+                            },
+                            "SerialNumber": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "Manufacturer",
+                            "Model",
+                            "PartNumber",
+                            "SerialNumber"
+                        ]
+                    },
+                    "Type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Exposes",
+                    "Name",
+                    "Probe",
+                    "xyz.openbmc_project.Inventory.Decorator.Asset"
+                ]
+            }
+        },
+        {
+            "type": "object",
+            "properties": {
+                "Exposes": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "Address": {
+                                "type": "string"
+                            },
+                            "Name": {
+                                "type": "string"
+                            },
+                            "Type": {
+                                "type": "string"
+                            },
+                            "Bus": {
+                                "type": [
+                                    "integer",
+                                    "string"
+                                ]
+                            },
+                            "Thresholds": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "Direction": {
+                                            "type": "string"
+                                        },
+                                        "Name": {
+                                            "type": "string"
+                                        },
+                                        "Severity": {
+                                            "type": "integer"
+                                        },
+                                        "Value": {
+                                            "type": "number"
+                                        },
+                                        "Label": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "Direction",
+                                        "Name",
+                                        "Severity",
+                                        "Value"
+                                    ]
+                                }
+                            },
+                            "BindConnector": {
+                                "type": "string"
+                            },
+                            "Index": {
+                                "type": "integer"
+                            },
+                            "Class": {
+                                "type": "string"
+                            },
+                            "FFGainCoefficient": {
+                                "type": "number"
+                            },
+                            "FFOffCoefficient": {
+                                "type": "number"
+                            },
+                            "ICoefficient": {
+                                "type": "number"
+                            },
+                            "ILimit": {
+                                "type": "object",
+                                "properties": {
+                                    "Max": {
+                                        "type": "number"
+                                    },
+                                    "Min": {
+                                        "type": "number"
+                                    }
+                                },
+                                "required": [
+                                    "Max",
+                                    "Min"
+                                ]
+                            },
+                            "Inputs": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "OutLimit": {
+                                "type": "object",
+                                "properties": {
+                                    "Max": {
+                                        "type": "number"
+                                    },
+                                    "Min": {
+                                        "type": "number"
+                                    }
+                                },
+                                "required": [
+                                    "Max",
+                                    "Min"
+                                ]
+                            },
+                            "PCoefficient": {
+                                "type": "number"
+                            },
+                            "SetPoint": {
+                                "type": "number"
+                            },
+                            "SlewNeg": {
+                                "type": "number"
+                            },
+                            "SlewPos": {
+                                "type": "number"
+                            },
+                            "MinThermalRpm": {
+                                "type": "integer"
+                            },
+                            "FailSafePercent": {
+                                "type": "integer"
+                            },
+                            "present": {
+                                "type": "integer"
+                            },
+                            "Pwm": {
+                                "type": "integer"
+                            },
+                            "Status": {
+                                "type": "string"
+                            },
+                            "Tachs": {
+                                "type": "array",
+                                "items": {
+                                    "type": "integer"
+                                }
+                            },
+                            "Name1": {
+                                "type": "string"
+                            },
+                            "ScaleFactor": {
+                                "type": "number"
+                            },
+                            "CpuID": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "Name",
+                            "Type"
+                        ]
+                    }
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Probe": {
+                    "anyOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    ]
+                },
+                "xyz.openbmc_project.Inventory.Decorator.Asset": {
+                    "type": "object",
+                    "properties": {
+                        "Manufacturer": {
+                            "type": "string"
+                        },
+                        "Model": {
+                            "type": "string"
+                        },
+                        "PartNumber": {
+                            "type": "string"
+                        },
+                        "SerialNumber": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Manufacturer",
+                        "Model",
+                        "PartNumber",
+                        "SerialNumber"
+                    ]
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Exposes",
+                "Name",
+                "Probe"
+            ]
+        }
+    ]
+}
diff --git a/scripts/CloseMuxes.py b/scripts/CloseMuxes.py
index 52d8403..abbe84b 100644
--- a/scripts/CloseMuxes.py
+++ b/scripts/CloseMuxes.py
@@ -23,10 +23,10 @@
 configuration = json.load(open(CONFIGURATION_FILE))
 
 for _, entity in configuration.iteritems():
-    for exposed in entity.get('exposes', []):
-        if exposed.get('type', None) in MUX_TYPES:
-            bus = exposed.get('bus', False)
-            address = exposed.get('address', False)
+    for exposed in entity.get('Exposes', []):
+        if exposed.get('Type', None) in MUX_TYPES:
+            bus = exposed.get('Bus', False)
+            address = exposed.get('Address', False)
             if bus and address:
                 subprocess.call('i2cset -y -f {} {} 0'.format(bus, address),
                                 shell=True)
diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index c93fb60..ab658b2 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -34,6 +34,7 @@
 
 constexpr const char *OUTPUT_DIR = "/var/configuration/";
 constexpr const char *CONFIGURATION_DIR = "/usr/share/configurations";
+constexpr const char *schemaFile = "schema.json";
 constexpr const char *TEMPLATE_CHAR = "$";
 constexpr const size_t PROPERTIES_CHANGED_UNTIL_FLUSH_COUNT = 20;
 constexpr const int32_t MAX_MAPPER_DEPTH = 0;
@@ -69,7 +70,7 @@
                  {"MATCH_ONE", probe_type_codes::MATCH_ONE}}};
 
 static constexpr std::array<const char *, 1> SETTABLE_INTERFACES = {
-    "thresholds"};
+    "Thresholds"};
 
 using BasicVariantType =
     sdbusplus::message::variant<std::string, int64_t, uint64_t, double, int32_t,
@@ -767,13 +768,13 @@
             }
         }
 
-        auto exposes = boardValues.find("exposes");
+        auto exposes = boardValues.find("Exposes");
         if (exposes == boardValues.end())
         {
             continue;
         }
         // iterate through exposes
-        jsonPointerPath += "exposes/";
+        jsonPointerPath += "Exposes/";
 
         // store the board level pointer so we can modify it on the way down
         std::string jsonPointerPathBoard = jsonPointerPath;
@@ -790,7 +791,7 @@
                 std::cerr << "cannot find name in field " << item << "\n";
                 continue;
             }
-            auto findStatus = item.find("status");
+            auto findStatus = item.find("Status");
             // if status is not found it is assumed to be status = 'okay'
             if (findStatus != item.end())
             {
@@ -967,6 +968,11 @@
     }
     for (auto &jsonPath : jsonPaths)
     {
+        if (boost::algorithm::ends_with(jsonPath.string(), schemaFile))
+        {
+            // todo: parse using schema
+            continue;
+        }
         std::ifstream jsonStream(jsonPath.c_str());
         if (!jsonStream.good())
         {
@@ -1007,7 +1013,7 @@
     {
         for (auto it = _configurations.begin(); it != _configurations.end();)
         {
-            auto findProbe = it->find("probe");
+            auto findProbe = it->find("Probe");
             auto findName = it->find("Name");
 
             nlohmann::json probeCommand;
@@ -1071,7 +1077,7 @@
                             templateCharReplace(keyPair, foundDevice,
                                                 foundDeviceIdx);
                         }
-                        auto findExpose = record->find("exposes");
+                        auto findExpose = record->find("Exposes");
                         if (findExpose == record->end())
                         {
                             continue;
@@ -1087,7 +1093,7 @@
                                 templateCharReplace(keyPair, foundDevice,
                                                     foundDeviceIdx);
                                 // special case bind
-                                if (boost::starts_with(keyPair.key(), "bind_"))
+                                if (boost::starts_with(keyPair.key(), "Bind"))
                                 {
                                     if (keyPair.value().type() !=
                                         nlohmann::json::value_t::string)
@@ -1099,7 +1105,7 @@
                                     }
                                     bool foundBind = false;
                                     std::string bind = keyPair.key().substr(
-                                        sizeof("bind_") - 1);
+                                        sizeof("Bind") - 1);
 
                                     for (auto &configurationPair :
                                          _systemConfiguration.items())
@@ -1107,7 +1113,7 @@
 
                                         auto configListFind =
                                             configurationPair.value().find(
-                                                "exposes");
+                                                "Exposes");
 
                                         if (configListFind ==
                                                 configurationPair.value()
@@ -1127,7 +1133,7 @@
                                                     keyPair.value()
                                                         .get<std::string>()))
                                             {
-                                                exposedObject["status"] =
+                                                exposedObject["Status"] =
                                                     "okay";
                                                 expose[bind] = exposedObject;
 
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 697456d..6b12ab6 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -130,9 +130,9 @@
             std::experimental::filesystem::canonical(devtreePath);
         symbolPath =
             symbolPath.substr(sizeof("/sys/firmware/devicetree/base") - 1);
-        nlohmann::json configuration = {{"path", symbolPath},
+        nlohmann::json configuration = {{"Path", symbolPath},
                                         {"Type", "Symbol"},
-                                        {"bus", std::stoul(bus)},
+                                        {"Bus", std::stoul(bus)},
                                         {"Name", "i2c" + bus}};
         createOverlay(TEMPLATE_DIR + std::string("/Symbol.template"),
                       configuration);
@@ -160,7 +160,7 @@
         std::string subsituteString;
 
         // device tree symbols are in decimal
-        if (keyPair.key() == "bus" &&
+        if (keyPair.key() == "Bus" &&
             keyPair.value().type() == nlohmann::json::value_t::string)
         {
             unsigned int dec =
@@ -174,7 +174,7 @@
                 keyPair.value().get<std::string>(), ILLEGAL_NAME_REGEX, "_");
             name = subsituteString;
         }
-        else if (keyPair.key() == "address")
+        else if (keyPair.key() == "Address")
         {
             if (keyPair.value().type() == nlohmann::json::value_t::string)
             {
@@ -198,7 +198,7 @@
     }
     // todo: this is a lame way to fill in platform, but we only
     // care about ast2500 right now
-    boost::replace_all(templateStr, TEMPLATE_CHAR + std::string("platform"),
+    boost::replace_all(templateStr, TEMPLATE_CHAR + std::string("Platform"),
                        PLATFORM);
     std::string dtsFilename =
         std::string(OUTPUT_DIR) + "/" + name + "_" + type + ".dts";
@@ -269,7 +269,7 @@
     for (auto entity = systemConfiguration.begin();
          entity != systemConfiguration.end(); entity++)
     {
-        auto findExposes = entity.value().find("exposes");
+        auto findExposes = entity.value().find("Exposes");
         if (findExposes == entity.value().end() ||
             findExposes->type() != nlohmann::json::value_t::array)
         {
@@ -278,7 +278,7 @@
 
         for (auto &configuration : *findExposes)
         {
-            auto findStatus = configuration.find("status");
+            auto findStatus = configuration.find("Status");
             // status missing is assumed to be 'okay'
             if (findStatus != configuration.end() && *findStatus == "disabled")
             {