diff --git a/README.md b/README.md
index fe4e02c..2e44a34 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@
 
 | String    | Example Value                            | Description                              |
 | :-------- | ---------------------------------------- | ---------------------------------------- |
-| "name"    | "X1000 1U Chassis"                       | Human readable name used for identification and sorting. |
+| "Name"    | "X1000 1U Chassis"                       | Human readable name used for identification and sorting. |
 | "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. |
+| "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. |
 
@@ -57,94 +57,94 @@
 {
     "exposes": [
         {
-            "name": "1U System Fan connector 1",
+            "Name": "1U System Fan connector 1",
             "pwm": 1,
             "status": "disabled",
             "tachs": [
                 1,
                 2
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 1",
+            "Name": "2U System Fan connector 1",
             "pwm": 1,
             "status": "disabled",
             "tachs": [
                 1
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "address": "0x49",
             "bus": 6,
-            "name": "Left Rear Temp",
+            "Name": "Left Rear Temp",
             "thresholds": [
                 [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 115
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 110
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ]
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x48",
             "bus": 6,
-            "name": "Voltage Regulator 1 Temp",
+            "Name": "Voltage Regulator 1 Temp",
             "thresholds": [
                 [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 115
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 110
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ]
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         }
     ],
-    "name": "WFP Baseboard",
+    "Name": "WFP Baseboard",
     "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME' : '.*WFT'})"
 }
 ```
@@ -164,24 +164,24 @@
     "exposes": [
         {
             "bind_connector": "1U System Fan connector 1",
-            "name": "Fan 1",
+            "Name": "Fan 1",
             "thresholds": [
                 [
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 1750
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 2000
                     }
                 ]
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         }
     ]
 }
diff --git a/configurations/1Ux16 Riser.json b/configurations/1Ux16 Riser.json
index 4bb3f99..81f2be2 100644
--- a/configurations/1Ux16 Riser.json
+++ b/configurations/1Ux16 Riser.json
@@ -4,49 +4,49 @@
             {
                 "address": "0x48",
                 "bus": "$bus",
-                "name": "Riser 1 Temp",
+                "Name": "Riser 1 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "0x72",
                 "bus": "$bus",
-                "name": "Riser 1 Mux",
-                "type": "PCA9543Mux"
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9543Mux"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 1 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 1 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "1Ux16 Riser 1",
+        "Name": "1Ux16 Riser 1",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -60,49 +60,49 @@
             {
                 "address": "0x49",
                 "bus": "$bus",
-                "name": "Riser 2 Temp",
+                "Name": "Riser 2 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "0x73",
                 "bus": "$bus",
-                "name": "Riser 2 Mux",
-                "type": "PCA9543Mux"
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9543Mux"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 2 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 2 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "1Ux16 Riser 2",
+        "Name": "1Ux16 Riser 2",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F1UL16RISER\\d', 'ADDRESS' : 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/2Ux8 Riser.json b/configurations/2Ux8 Riser.json
index 3516589..cf2540b 100644
--- a/configurations/2Ux8 Riser.json
+++ b/configurations/2Ux8 Riser.json
@@ -4,49 +4,49 @@
             {
                 "address": "0x48",
                 "bus": "$bus",
-                "name": "Riser 1 Temp",
+                "Name": "Riser 1 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "0x72",
                 "bus": "$bus",
-                "name": "Riser 1 Mux",
-                "type": "PCA9545Mux"
+                "Name": "Riser 1 Mux",
+                "Type": "PCA9545Mux"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 1 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 1 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "2Ux8 Riser 1",
+        "Name": "2Ux8 Riser 1",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER1', 'ADDRESS': 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -60,49 +60,49 @@
             {
                 "address": "0x49",
                 "bus": "$bus",
-                "name": "Riser 2 Temp",
+                "Name": "Riser 2 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "0x73",
                 "bus": "$bus",
-                "name": "Riser 2 Mux",
-                "type": "PCA9545Mux"
+                "Name": "Riser 2 Mux",
+                "Type": "PCA9545Mux"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 2 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 2 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "2Ux8 Riser 2",
+        "Name": "2Ux8 Riser 2",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL8RISER2', 'ADDRESS': 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/8X25 HSBP.json b/configurations/8X25 HSBP.json
index 590c058..ca7574f 100644
--- a/configurations/8X25 HSBP.json
+++ b/configurations/8X25 HSBP.json
@@ -2,18 +2,18 @@
     "exposes": [
         {
             "address": "0xEB",
-            "name": "HSBP $index Drive Mux",
-            "type": "GenericSMBusMux"
+            "Name": "HSBP $index Drive Mux",
+            "Type": "GenericSMBusMux"
         },
         {
-            "name": "HSBP $index FRU",
-            "type": "IntelHsbpFruDevice"
+            "Name": "HSBP $index FRU",
+            "Type": "IntelHsbpFruDevice"
         },
         {
-            "name": "HSBP $index Temperature",
-            "type": "IntelHsbpTempSensor"
+            "Name": "HSBP $index Temperature",
+            "Type": "IntelHsbpTempSensor"
         }
     ],
-    "name": "1U_HSBP",
+    "Name": "1U_HSBP",
     "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 485bd1d..e22bb96 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -4,19 +4,19 @@
             {
                 "address": "0x59",
                 "bus": "$bus",
-                "name": "Delta DPS-750XB PSU Device",
-                "type": "pmbus"
+                "Name": "Delta DPS-750XB PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Delta DPS-750XB PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "Delta DPS-750XB PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Delta DPS-750XB PSU 2",
+        "Name": "Delta DPS-750XB PSU 2",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 81})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -29,19 +29,19 @@
             {
                 "address": "0x58",
                 "bus": "$bus",
-                "name": "Delta DPS-750XB PSU Device",
-                "type": "pmbus"
+                "Name": "Delta DPS-750XB PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Delta DPS-750XB PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "Delta DPS-750XB PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Delta DPS-750XB PSU 1",
+        "Name": "Delta DPS-750XB PSU 1",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 80})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/F2U12X35S3P_riser.json b/configurations/F2U12X35S3P_riser.json
index 188c57c..d412248 100644
--- a/configurations/F2U12X35S3P_riser.json
+++ b/configurations/F2U12X35S3P_riser.json
@@ -4,43 +4,43 @@
             {
                 "address": "0x48",
                 "bus": "$bus",
-                "name": "Riser1 Temp",
+                "Name": "Riser1 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 1 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 1 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "2U12x35 Riser1",
+        "Name": "2U12x35 Riser1",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 80})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
@@ -54,43 +54,43 @@
             {
                 "address": "0x49",
                 "bus": "$bus",
-                "name": "Riser2 Temp",
+                "Name": "Riser2 Temp",
                 "thresholds": [
                     {
                         "direction": "greater than",
-                        "name": "upper critical",
+                        "Name": "upper critical",
                         "severity": 1,
                         "value": 80
                     },
                     {
                         "direction": "greater than",
-                        "name": "upper non critical",
+                        "Name": "upper non critical",
                         "severity": 0,
                         "value": 75
                     },
                     {
                         "direction": "less than",
-                        "name": "lower non critical",
+                        "Name": "lower non critical",
                         "severity": 0,
                         "value": 5
                     },
                     {
                         "direction": "less than",
-                        "name": "lower critical",
+                        "Name": "lower critical",
                         "severity": 1,
                         "value": 0
                     }
                 ],
-                "type": "TMP75"
+                "Type": "TMP75"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Riser 2 Fru",
-                "type": "IntelFruDevice"
+                "Name": "Riser 2 Fru",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "2U12x35 Riser2",
+        "Name": "2U12x35 Riser2",
         "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'A2UL16RISER\\d', 'ADDRESS' : 81})",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index ebd4c1b..a96b4e6 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -4,19 +4,19 @@
             {
                 "address": "0x59",
                 "bus": "$bus",
-                "name": "Flextronics S-1100ADU00-201 PSU Device",
-                "type": "pmbus"
+                "Name": "Flextronics S-1100ADU00-201 PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Flextronics S-1100ADU00-201 PSU 2",
+        "Name": "Flextronics S-1100ADU00-201 PSU 2",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 81})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -29,19 +29,19 @@
             {
                 "address": "0x58",
                 "bus": "$bus",
-                "name": "Flextronics S-1100ADU00-201 PSU Device",
-                "type": "pmbus"
+                "Name": "Flextronics S-1100ADU00-201 PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Flextronics S-1100ADU00-201 PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Flextronics S-1100ADU00-201 PSU 1",
+        "Name": "Flextronics S-1100ADU00-201 PSU 1",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 80})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/Intel Front Panel.json b/configurations/Intel Front Panel.json
index 5cafc90..4e55cac 100644
--- a/configurations/Intel Front Panel.json
+++ b/configurations/Intel Front Panel.json
@@ -3,43 +3,43 @@
         {
             "address": "$address",
             "bus": "$bus",
-            "name": "Front Panel FRU",
-            "type": "IntelFruDevice"
+            "Name": "Front Panel FRU",
+            "Type": "IntelFruDevice"
         },
         {
             "address": "0x4D",
             "bus": "$bus",
-            "name": "Front Panel Temp",
+            "Name": "Front Panel Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 55
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 50
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         }
     ],
-    "name": "Intel Front Panel",
+    "Name": "Intel Front Panel",
     "probe": [
         "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'FFPANEL'})",
         "OR",
diff --git a/configurations/PCIE SSD Retimer.json b/configurations/PCIE SSD Retimer.json
index 79f6c13..9ac9ce6 100644
--- a/configurations/PCIE SSD Retimer.json
+++ b/configurations/PCIE SSD Retimer.json
@@ -3,17 +3,17 @@
         {
             "address": "$address",
             "bus": "$bus",
-            "name": "PCIE SSD Retimer FRU",
-            "type": "IntelFruDevice"
+            "Name": "PCIE SSD Retimer FRU",
+            "Type": "IntelFruDevice"
         },
         {
             "address": "0x4F",
             "bus": "$bus",
-            "name": "PCIE SSD Retimer Temp",
-            "type": "TMP75"
+            "Name": "PCIE SSD Retimer Temp",
+            "Type": "TMP75"
         }
     ],
-    "name": "PCIE SSD Retimer",
+    "Name": "PCIE SSD Retimer",
     "probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'SP3RT040X16'})",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$BOARD_MANUFACTURER",
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index 83f02bb..7182cfc 100755
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -4,19 +4,19 @@
             {
                 "address": "0x59",
                 "bus": "$bus",
-                "name": "Solum 1300W PSU 2 Device",
-                "type": "pmbus"
+                "Name": "Solum 1300W PSU 2 Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Solum 1300W PSU 2 FRU",
-                "type": "IntelFruDevice"
+                "Name": "Solum 1300W PSU 2 FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Solum 1300W PSU 2",
+        "Name": "Solum 1300W PSU 2",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 81})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
             "Model": "$PRODUCT_PRODUCT_NAME",
@@ -29,19 +29,19 @@
             {
                 "address": "0x58",
                 "bus": "$bus",
-                "name": "Solum 1300W PSU 1 Device",
-                "type": "pmbus"
+                "Name": "Solum 1300W PSU 1 Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "Solum 1300W PSU 1 FRU",
-                "type": "IntelFruDevice"
+                "Name": "Solum 1300W PSU 1 FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "Solum 1300W PSU 1",
+        "Name": "Solum 1300W PSU 1",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', 'ADDRESS': 80})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$PRODUCT_MANUFACTURER",
             "Model": "$PRODUCT_PRODUCT_NAME",
diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index 6c1e20b..ed6ed64 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -3,245 +3,245 @@
         {
             "bind_connector": "1U System Fan connector 1",
             "index": 0,
-            "name": "Fan 1a",
+            "Name": "Fan 1a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 1",
             "index": 1,
-            "name": "Fan 1b",
+            "Name": "Fan 1b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 2",
             "index": 2,
-            "name": "Fan 2a",
+            "Name": "Fan 2a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 2",
             "index": 3,
-            "name": "Fan 2b",
+            "Name": "Fan 2b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 3",
             "index": 4,
-            "name": "Fan 3a",
+            "Name": "Fan 3a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 3",
             "index": 5,
-            "name": "Fan 3b",
+            "Name": "Fan 3b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 4",
             "index": 6,
-            "name": "Fan 4a",
+            "Name": "Fan 4a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 4",
             "index": 7,
-            "name": "Fan 4b",
+            "Name": "Fan 4b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 5",
             "index": 8,
-            "name": "Fan 5a",
+            "Name": "Fan 5a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 5",
             "index": 9,
-            "name": "Fan 5b",
+            "Name": "Fan 5b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 6",
             "index": 10,
-            "name": "Fan 6a",
+            "Name": "Fan 6a",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1080
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1260
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "1U System Fan connector 6",
             "index": 11,
-            "name": "Fan 6b",
+            "Name": "Fan 6b",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1295
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         }
     ],
-    "name": "R1000 Chassis",
+    "Name": "R1000 Chassis",
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 220ad4d..b4181ab 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -3,125 +3,125 @@
         {
             "bind_connector": "2U System Fan connector 1",
             "index": 0,
-            "name": "Fan 1",
+            "Name": "Fan 1",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "2U System Fan connector 2",
             "index": 2,
-            "name": "Fan 2",
+            "Name": "Fan 2",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "2U System Fan connector 3",
             "index": 4,
-            "name": "Fan 3",
+            "Name": "Fan 3",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "2U System Fan connector 4",
             "index": 6,
-            "name": "Fan 4",
+            "Name": "Fan 4",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "2U System Fan connector 5",
             "index": 8,
-            "name": "Fan 5",
+            "Name": "Fan 5",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "2U System Fan connector 6",
             "index": 10,
-            "name": "Fan 6",
+            "Name": "Fan 6",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         }
     ],
-    "name": "R2000 Chassis",
+    "Name": "R2000 Chassis",
     "probe": [
         "FOUND('WFP Baseboard')",
         "AND",
diff --git a/configurations/SAS Module.json b/configurations/SAS Module.json
index fae43ff..10363e9 100644
--- a/configurations/SAS Module.json
+++ b/configurations/SAS Module.json
@@ -2,16 +2,16 @@
     "exposes": [
         {
             "bus": "$bus",
-            "name": "SAS Module FRU",
-            "type": "IntelFruDevice"
+            "Name": "SAS Module FRU",
+            "Type": "IntelFruDevice"
         },
         {
             "address": "0x98",
             "bus": "$bus",
-            "name": "SAS Module Temperature",
-            "type": "TMP75"
+            "Name": "SAS Module Temperature",
+            "Type": "TMP75"
         }
     ],
-    "name": "SAS Module",
+    "Name": "SAS Module",
     "probe": "FALSE"
 }
\ No newline at end of file
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 982c67f..42be150 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -4,19 +4,19 @@
             {
                 "address": "0x59",
                 "bus": "$bus",
-                "name": "SOLUM CO IS162F22 PSU Device",
-                "type": "pmbus"
+                "Name": "SOLUM CO IS162F22 PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "SOLUM CO IS162F22 PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "SOLUM CO IS162F22 PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "SOLUM CO IS162F22 PSU 2",
+        "Name": "SOLUM CO IS162F22 PSU 2",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
@@ -29,19 +29,19 @@
             {
                 "address": "0x58",
                 "bus": "$bus",
-                "name": "SOLUM CO IS162F22 PSU Device",
-                "type": "pmbus"
+                "Name": "SOLUM CO IS162F22 PSU Device",
+                "Type": "pmbus"
             },
             {
                 "address": "$address",
                 "bus": "$bus",
-                "name": "SOLUM CO IS162F22 PSU FRU",
-                "type": "IntelFruDevice"
+                "Name": "SOLUM CO IS162F22 PSU FRU",
+                "Type": "IntelFruDevice"
             }
         ],
-        "name": "SOLUM CO IS162F22 PSU 1",
+        "Name": "SOLUM CO IS162F22 PSU 1",
         "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 80})",
-        "type": "PowerSupply",
+        "Type": "PowerSupply",
         "xyz.openbmc_project.Inventory.Decorator.Asset": {
             "Manufacturer": "$BOARD_MANUFACTURER",
             "Model": "$BOARD_PRODUCT_NAME",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 44872e3..88d417e 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -2,856 +2,856 @@
     "exposes": [
         {
             "fault_led": 0,
-            "name": "4U System Fan connector 1",
+            "Name": "4U System Fan connector 1",
             "present": 0,
             "pwm": 1,
             "status": "disabled",
             "tachs": [
                 1
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 1,
-            "name": "4U System Fan connector 2",
+            "Name": "4U System Fan connector 2",
             "present": 1,
             "pwm": 2,
             "status": "disabled",
             "tachs": [
                 2
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 2,
-            "name": "4U System Fan connector 3",
+            "Name": "4U System Fan connector 3",
             "present": 2,
             "pwm": 3,
             "status": "disabled",
             "tachs": [
                 3
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 3,
-            "name": "4U System Fan connector 4",
+            "Name": "4U System Fan connector 4",
             "present": 3,
             "pwm": 4,
             "status": "disabled",
             "tachs": [
                 4
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 4,
-            "name": "4U System Fan connector 5",
+            "Name": "4U System Fan connector 5",
             "present": 4,
             "pwm": 5,
             "status": "disabled",
             "tachs": [
                 5
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 5,
-            "name": "4U System Fan connector 6",
+            "Name": "4U System Fan connector 6",
             "present": 5,
             "pwm": 6,
             "status": "disabled",
             "tachs": [
                 6
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 6,
-            "name": "4U CPU 0 fan connector",
+            "Name": "4U CPU 0 fan connector",
             "pwm": 7,
             "status": "disabled",
             "tachs": [
                 7
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "fault_led": 7,
-            "name": "4U CPU 1 fan connector",
+            "Name": "4U CPU 1 fan connector",
             "pwm": 8,
             "status": "disabled",
             "tachs": [
                 8
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "4U System Fan connector 7",
+            "Name": "4U System Fan connector 7",
             "pwm": 9,
             "status": "disabled",
             "tachs": [
                 9
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "address": "0x48",
             "bus": 6,
-            "name": "M_2 Temp",
+            "Name": "M_2 Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x4F",
             "bus": 6,
-            "name": "Memory VRM Temp",
+            "Name": "Memory VRM Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x4E",
             "bus": 6,
-            "name": "LR Memory Board Temp",
+            "Name": "LR Memory Board Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x4C",
             "bus": 6,
-            "name": "BMC Temp",
-            "name1": "TMP421 Internal Temp",
+            "Name": "BMC Temp",
+            "Name1": "TMP421 Internal Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP421"
+            "Type": "TMP421"
         },
         {
             "address": "0x49",
             "bus": 6,
-            "name": "CPU VR Temp",
+            "Name": "CPU VR Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x4D",
             "bus": 6,
-            "name": "Ambient Temp",
+            "Name": "Ambient Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "index": 0,
-            "name": "PSU 12 Volt",
+            "Name": "PSU 12 Volt",
             "scale_factor": 0.1124,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 13.494
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 13.101
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 10.945
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 10.616
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 1,
-            "name": "P3V3",
+            "Name": "P3V3",
             "scale_factor": 0.4107,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 3.647
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 3.066
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 3.066
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 2.974
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 2,
-            "name": "PVNN_PCH_AUX",
+            "Name": "PVNN_PCH_AUX",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.081
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.049
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.807
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.783
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 3,
-            "name": "P1V05_PCH_AUX",
+            "Name": "P1V05_PCH_AUX",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.139
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.106
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.995
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.966
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 4,
-            "name": "P0V83_LAN_AUX",
+            "Name": "P0V83_LAN_AUX",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 0.901
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 0.875
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.786
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.763
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 5,
-            "name": "P5V_STBY",
+            "Name": "P5V_STBY",
             "scale_factor": 0.2717,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 13.494
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 13.101
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 10.945
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 10.616
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 6,
-            "name": "P1V8_PCH_AUX",
+            "Name": "P1V8_PCH_AUX",
             "scale_factor": 0.7505,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.961
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.904
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.699
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.648
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 7,
-            "name": "P3V_BAT",
+            "Name": "P3V_BAT",
             "scale_factor": 0.3333,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 3.296
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 3.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2.457
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 2.138
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 8,
-            "name": "PVCCIN_CPU0",
+            "Name": "PVCCIN_CPU0",
             "scale_factor": 0.7505,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 2.151
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 2.088
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.418
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.376
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 9,
-            "name": "PVCCIN_CPU1",
+            "Name": "PVCCIN_CPU1",
             "scale_factor": 0.7505,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 2.151
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 2.088
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.418
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.376
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 10,
-            "name": "PVDDQ_ABC_CPU0",
+            "Name": "PVDDQ_ABC_CPU0",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 11,
-            "name": "PVDDQ_DEF_CPU0",
+            "Name": "PVDDQ_DEF_CPU0",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 12,
-            "name": "PVDDQ_ABC_CPU1",
+            "Name": "PVDDQ_ABC_CPU1",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 13,
-            "name": "PVDDQ_DEF_CPU1",
+            "Name": "PVDDQ_DEF_CPU1",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 14,
-            "name": "PVCCIO_CPU0",
+            "Name": "PVCCIO_CPU0",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.19
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.155
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.752
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.729
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 15,
-            "name": "PVCCIO_CPU1",
+            "Name": "PVCCIO_CPU1",
             "scale_factor": 1.0,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.19
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.155
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.752
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.729
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "address": "0x30",
             "cpu_id": 0,
-            "name": "Skylake CPU 0",
+            "Name": "Skylake CPU 0",
             "thresholds": [
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 99
                 },
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 89
                 }
             ],
-            "type": "SkylakeCPU"
+            "Type": "SkylakeCPU"
         },
         {
             "address": "0x31",
             "cpu_id": 1,
-            "name": "Skylake CPU 1",
+            "Name": "Skylake CPU 1",
             "thresholds": [
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 99
                 },
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 89
                 }
             ],
-            "type": "SkylakeCPU"
+            "Type": "SkylakeCPU"
         }
     ],
-    "name": "STP Baseboard",
+    "Name": "STP Baseboard",
     "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*STB'})",
-    "type": "Board",
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_PRODUCT_SERIAL_NUMBER"
     }
-}
\ No newline at end of file
+}
diff --git a/configurations/STP P4000 Chassis.json b/configurations/STP P4000 Chassis.json
index 445c89a..110b916 100644
--- a/configurations/STP P4000 Chassis.json
+++ b/configurations/STP P4000 Chassis.json
@@ -3,125 +3,125 @@
         {
             "bind_connector": "4U System Fan connector 1",
             "index": 0,
-            "name": "Fan 1",
+            "Name": "Fan 1",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "4U System Fan connector 2",
             "index": 1,
-            "name": "Fan 2",
+            "Name": "Fan 2",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "4U System Fan connector 3",
             "index": 2,
-            "name": "Fan 3",
+            "Name": "Fan 3",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "4U System Fan connector 4",
             "index": 3,
-            "name": "Fan 4",
+            "Name": "Fan 4",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "4U System Fan connector 5",
             "index": 4,
-            "name": "Fan 5",
+            "Name": "Fan 5",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         },
         {
             "bind_connector": "4U System Fan connector 6",
             "index": 5,
-            "name": "Fan 6",
+            "Name": "Fan 6",
             "thresholds": [
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1750
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2000
                 }
             ],
-            "type": "AspeedFan"
+            "Type": "AspeedFan"
         }
     ],
-    "name": "P4000 Chassis",
+    "Name": "P4000 Chassis",
     "probe": [
         "FOUND('STP Baseboard')",
         "AND",
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index a7be0e2..85ddfed 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1,852 +1,852 @@
 {
     "exposes": [
         {
-            "name": "1U System Fan connector 1",
+            "Name": "1U System Fan connector 1",
             "pwm": 0,
             "status": "disabled",
             "tachs": [
                 0,
                 1
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "1U System Fan connector 2",
+            "Name": "1U System Fan connector 2",
             "pwm": 1,
             "status": "disabled",
             "tachs": [
                 2,
                 3
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "1U System Fan connector 3",
+            "Name": "1U System Fan connector 3",
             "pwm": 2,
             "status": "disabled",
             "tachs": [
                 4,
                 5
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "1U System Fan connector 4",
+            "Name": "1U System Fan connector 4",
             "pwm": 3,
             "status": "disabled",
             "tachs": [
                 6,
                 7
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "1U System Fan connector 5",
+            "Name": "1U System Fan connector 5",
             "pwm": 4,
             "status": "disabled",
             "tachs": [
                 8,
                 9
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "1U System Fan connector 6",
+            "Name": "1U System Fan connector 6",
             "pwm": 5,
             "status": "disabled",
             "tachs": [
                 10,
                 11
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 1",
+            "Name": "2U System Fan connector 1",
             "pwm": 0,
             "status": "disabled",
             "tachs": [
                 0
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 2",
+            "Name": "2U System Fan connector 2",
             "pwm": 1,
             "status": "disabled",
             "tachs": [
                 2
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 3",
+            "Name": "2U System Fan connector 3",
             "pwm": 2,
             "status": "disabled",
             "tachs": [
                 4
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 4",
+            "Name": "2U System Fan connector 4",
             "pwm": 3,
             "status": "disabled",
             "tachs": [
                 6
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 5",
+            "Name": "2U System Fan connector 5",
             "pwm": 4,
             "status": "disabled",
             "tachs": [
                 8
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "2U System Fan connector 6",
+            "Name": "2U System Fan connector 6",
             "pwm": 5,
             "status": "disabled",
             "tachs": [
                 10
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "address": "0x4A",
             "bus": 6,
-            "name": "BMC Temp",
+            "Name": "BMC Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "index": 0,
-            "name": "Baseboard 12 Volt",
+            "Name": "Baseboard 12 Volt",
             "scale_factor": 0.1124,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 13.494
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 13.101
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 10.945
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 10.616
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
-            "name": "CPU 1 Fan Connector",
+            "Name": "CPU 1 Fan Connector",
             "pwm": 7,
             "status": "disabled",
             "tachs": [
                 13
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
-            "name": "CPU 2 Fan Connector",
+            "Name": "CPU 2 Fan Connector",
             "pwm": 8,
             "status": "disabled",
             "tachs": [
                 14
             ],
-            "type": "IntelFanConnector"
+            "Type": "IntelFanConnector"
         },
         {
             "address": "0x49",
             "bus": 6,
-            "name": "Left Rear Temp",
+            "Name": "Left Rear Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "index": 4,
-            "name": "P0V83_LAN_AUX",
+            "Name": "P0V83_LAN_AUX",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 0.901
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 0.875
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.786
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.763
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 3,
-            "name": "P105_PCH_AUX",
+            "Name": "P105_PCH_AUX",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.139
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.106
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.995
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.966
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 5,
-            "name": "P12V_AUX",
+            "Name": "P12V_AUX",
             "scale_factor": 0.2717,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 13.494
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 13.101
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 10.945
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 10.616
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 6,
-            "name": "P1V8_PCH",
+            "Name": "P1V8_PCH",
             "scale_factor": 0.7505,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.961
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.904
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.699
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.648
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 1,
-            "name": "P3V3",
+            "Name": "P3V3",
             "scale_factor": 0.4107,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 3.647
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 3.066
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 3.066
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 2.974
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 7,
-            "name": "P3VBAT",
+            "Name": "P3VBAT",
             "scale_factor": 0.3333,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 3.296
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 3.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 2.457
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 2.138
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 8,
-            "name": "PVCCIN_CPU0",
+            "Name": "PVCCIN_CPU0",
             "scale_factor": 0.7505,
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 2.151
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 2.088
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.418
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.376
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 9,
-            "name": "PVCCIN_CPU1",
+            "Name": "PVCCIN_CPU1",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 2.151
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 2.088
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.418
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.376
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 14,
-            "name": "PVCCIO_CPU0",
+            "Name": "PVCCIO_CPU0",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.19
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.155
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.752
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.729
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 15,
-            "name": "PVCCIO_CPU1",
+            "Name": "PVCCIO_CPU1",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.19
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.155
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.752
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.729
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 10,
-            "name": "PVDQ_ABC_CPU0",
+            "Name": "PVDQ_ABC_CPU0",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 12,
-            "name": "PVDQ_ABC_CPU1",
+            "Name": "PVDQ_ABC_CPU1",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 11,
-            "name": "PVDQ_DEF_CPU0",
+            "Name": "PVDQ_DEF_CPU0",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 13,
-            "name": "PVDQ_DEF_CPU1",
+            "Name": "PVDQ_DEF_CPU1",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.301
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.263
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 1.138
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 1.104
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "index": 2,
-            "name": "PVNN_PCH_AUX",
+            "Name": "PVNN_PCH_AUX",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 1.081
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 1.049
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 0.807
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0.783
                 }
             ],
-            "type": "ADC"
+            "Type": "ADC"
         },
         {
             "address": "0x4D",
             "bus": 6,
-            "name": "Right Rear Board Temp",
-            "name1": "Right Rear TMP421 Internal Temp",
+            "Name": "Right Rear Board Temp",
+            "Name1": "Right Rear TMP421 Internal Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP421"
+            "Type": "TMP421"
         },
         {
             "address": "0x48",
             "bus": 6,
-            "name": "Voltage Regulator 1 Temp",
+            "Name": "Voltage Regulator 1 Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x4B",
             "bus": 6,
-            "name": "Voltage Regulator 2 Temp",
+            "Name": "Voltage Regulator 2 Temp",
             "thresholds": [
                 {
                     "direction": "greater than",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 115
                 },
                 {
                     "direction": "greater than",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 110
                 },
                 {
                     "direction": "less than",
-                    "name": "lower non critical",
+                    "Name": "lower non critical",
                     "severity": 0,
                     "value": 5
                 },
                 {
                     "direction": "less than",
-                    "name": "lower critical",
+                    "Name": "lower critical",
                     "severity": 1,
                     "value": 0
                 }
             ],
-            "type": "TMP75"
+            "Type": "TMP75"
         },
         {
             "address": "0x30",
             "cpu_id": 0,
-            "name": "Skylake CPU 0",
+            "Name": "Skylake CPU 0",
             "thresholds": [
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 99
                 },
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 89
                 }
             ],
-            "type": "SkylakeCPU"
+            "Type": "SkylakeCPU"
         },
         {
             "address": "0x31",
             "cpu_id": 1,
-            "name": "Skylake CPU 1",
+            "Name": "Skylake CPU 1",
             "thresholds": [
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper critical",
+                    "Name": "upper critical",
                     "severity": 1,
                     "value": 99
                 },
                 {
                     "direction": "greater than",
                     "label": "DIMM",
-                    "name": "upper non critical",
+                    "Name": "upper non critical",
                     "severity": 0,
                     "value": 89
                 }
             ],
-            "type": "SkylakeCPU"
+            "Type": "SkylakeCPU"
         }
     ],
-    "name": "WFP Baseboard",
+    "Name": "WFP Baseboard",
     "probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WFT'})",
-    "type": "Board",
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_PRODUCT_SERIAL_NUMBER"
     }
-}
\ No newline at end of file
+}
diff --git a/overlay_templates/ADC.template b/overlay_templates/ADC.template
index a786628..c60a4f8 100644
--- a/overlay_templates/ADC.template
+++ b/overlay_templates/ADC.template
@@ -7,7 +7,7 @@
         __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 1e0aad7..4343831 100644
--- a/overlay_templates/IntelFanConnector.template
+++ b/overlay_templates/IntelFanConnector.template
@@ -8,7 +8,7 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            oemname$pwm = "$name";
+            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 0ebb322..a55309e 100644
--- a/overlay_templates/IntelFruDevice.template
+++ b/overlay_templates/IntelFruDevice.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            eeprom@$name {
+            eeprom@$Name {
                 compatible = "atmel,24c02";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 pagesize = <64>;
             };
         };
diff --git a/overlay_templates/PCA9543Mux.template b/overlay_templates/PCA9543Mux.template
index 3a0cb1c..49257c4 100644
--- a/overlay_templates/PCA9543Mux.template
+++ b/overlay_templates/PCA9543Mux.template
@@ -6,18 +6,18 @@
         target = <&i2c$bus>;
         __overlay__{
             status = "okay";
-            smbus_mux@$name {
+            smbus_mux@$Name {
                 compatible = "nxp,pca9543";
                 reg = <$address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                oemname1 = "$name";
-                $name_0: $name@0 {
+                oemname1 = "$Name";
+                $Name_0: $Name@0 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <0>;
                 };
-                $name_1: $name@1 {
+                $Name_1: $Name@1 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <1>;
diff --git a/overlay_templates/PCA9545Mux.template b/overlay_templates/PCA9545Mux.template
index 930a5ee..9da50a5 100644
--- a/overlay_templates/PCA9545Mux.template
+++ b/overlay_templates/PCA9545Mux.template
@@ -6,28 +6,28 @@
         target = <&i2c$bus>;
         __overlay__{
             status = "okay";
-            smbus_mux@$name {
+            smbus_mux@$Name {
                 compatible = "nxp,pca9545";
                 reg = <$address>;
                 #address-cells = <1>;
                 #size-cells = <0>;
-                oemname1 = "$name";
-                $name_0: $name@0 {
+                oemname1 = "$Name";
+                $Name_0: $Name@0 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <0>;
                 };
-                $name_1: $name@1 {
+                $Name_1: $Name@1 {
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <1>;
                 };
-                $name_2: $name@2{
+                $Name_2: $Name@2{
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <2>;
                 };
-                $name_3: $name@3{
+                $Name_3: $Name@3{
                     #address-cells = <1>;
                     #size-cells = <0>;
                     reg = <3>;
diff --git a/overlay_templates/SkylakeCPU.template b/overlay_templates/SkylakeCPU.template
index 90672c8..cbaa49a 100644
--- a/overlay_templates/SkylakeCPU.template
+++ b/overlay_templates/SkylakeCPU.template
@@ -10,7 +10,7 @@
 
             peci-client@Skylake_CPU_$cpu_id {
                 compatible = "intel,peci-client", "simple-mfd";
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 reg = <$address>;
                 status = "okay";
             };
diff --git a/overlay_templates/TMP421.template b/overlay_templates/TMP421.template
index 3d32d71..70b2ab4 100644
--- a/overlay_templates/TMP421.template
+++ b/overlay_templates/TMP421.template
@@ -8,11 +8,11 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            tmp421@$name$name1 {
+            tmp421@$Name$Name1 {
                 compatible = "ti,tmp421";
                 reg = <$address>;
-                oemname1 = "$name";
-                oemname2 = "$name1";
+                oemname1 = "$Name";
+                oemname2 = "$Name1";
                 scale = "-3";
             };
         };
diff --git a/overlay_templates/TMP75.template b/overlay_templates/TMP75.template
index b60e467..69d70ca 100644
--- a/overlay_templates/TMP75.template
+++ b/overlay_templates/TMP75.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            tmp75@$name {
+            tmp75@$Name {
                 compatible = "ti,tmp75";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
                 scale = "-3";
             };
         };
diff --git a/overlay_templates/pmbus.template b/overlay_templates/pmbus.template
index 11d2338..b48780b 100644
--- a/overlay_templates/pmbus.template
+++ b/overlay_templates/pmbus.template
@@ -8,10 +8,10 @@
             #address-cells = <1>;
             #size-cells = <0>;
             status = "okay";
-            pmbus@$name {
+            pmbus@$Name {
                 compatible = "pmbus";
                 reg = <$address>;
-                oemname1 = "$name";
+                oemname1 = "$Name";
             };
         };
     };
diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 9f95d0e..a62c36f 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -767,7 +767,7 @@
         // loop through newConfiguration, but use values from system
         // configuration to be able to modify via dbus later
         auto boardValues = systemConfiguration[boardKey];
-        auto findBoardType = boardValues.find("type");
+        auto findBoardType = boardValues.find("Type");
         std::string boardType;
         if (findBoardType != boardValues.end() &&
             findBoardType->type() == nlohmann::json::value_t::string)
@@ -827,7 +827,7 @@
             jsonPointerPath = jsonPointerPathBoard;
             jsonPointerPath += std::to_string(exposesIndex);
 
-            auto findName = item.find("name");
+            auto findName = item.find("Name");
             if (findName == item.end())
             {
                 std::cerr << "cannot find name in field " << item << "\n";
@@ -842,7 +842,7 @@
                     continue;
                 }
             }
-            auto findType = item.find("type");
+            auto findType = item.find("Type");
             std::string itemType;
             if (findType != item.end())
             {
@@ -1047,7 +1047,7 @@
         for (auto it = _configurations.begin(); it != _configurations.end();)
         {
             auto findProbe = it->find("probe");
-            auto findName = it->find("name");
+            auto findName = it->find("Name");
 
             nlohmann::json probeCommand;
             // check for poorly formatted fields, probe must be an array
@@ -1160,7 +1160,7 @@
                                              *configListFind)
                                         {
                                             std::string foundObjectName =
-                                                (exposedObject)["name"];
+                                                (exposedObject)["Name"];
                                             if (boost::iequals(
                                                     foundObjectName,
                                                     keyPair.value()
diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 7df8908..f80994f 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -130,9 +130,9 @@
         symbolPath =
             symbolPath.substr(sizeof("/sys/firmware/devicetree/base") - 1);
         nlohmann::json configuration = {{"path", symbolPath},
-                                        {"type", "Symbol"},
+                                        {"Type", "Symbol"},
                                         {"bus", std::stoul(bus)},
-                                        {"name", "i2c" + bus}};
+                                        {"Name", "i2c" + bus}};
         createOverlay(TEMPLATE_DIR + std::string("/Symbol.template"),
                       configuration);
     }
@@ -152,7 +152,7 @@
     buff << templateFile.rdbuf();
     std::string templateStr = buff.str();
     std::string name = "unknown";
-    std::string type = configuration["type"];
+    std::string type = configuration["Type"];
     for (auto keyPair = configuration.begin(); keyPair != configuration.end();
          keyPair++)
     {
@@ -166,7 +166,7 @@
                 std::stoul(keyPair.value().get<std::string>(), nullptr, 16);
             subsituteString = std::to_string(dec);
         }
-        else if (keyPair.key() == "name" &&
+        else if (keyPair.key() == "Name" &&
                  keyPair.value().type() == nlohmann::json::value_t::string)
         {
             subsituteString = std::regex_replace(
@@ -268,7 +268,7 @@
             {
                 continue;
             }
-            auto findType = configuration.find("type");
+            auto findType = configuration.find("Type");
             if (findType == configuration.end() ||
                 findType->type() != nlohmann::json::value_t::string)
             {