diff --git a/configurations/meta/catalina_hdd.json b/configurations/meta/catalina_hdd.json
index 29c9146..84512d0 100644
--- a/configurations/meta/catalina_hdd.json
+++ b/configurations/meta/catalina_hdd.json
@@ -14,7 +14,7 @@
                 "curr1",
                 "power1"
             ],
-            "Name": "HDDBOARD_SSD0_INA230",
+            "Name": "HDDBOARD_SSD0",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -47,7 +47,7 @@
                 "curr1",
                 "power1"
             ],
-            "Name": "HDDBOARD_SSD2_INA230",
+            "Name": "HDDBOARD_SSD2",
             "PowerState": "On",
             "Thresholds": [
                 {
diff --git a/configurations/meta/catalina_pdb.json b/configurations/meta/catalina_pdb.json
index 3dd0bdd..0f719d5 100644
--- a/configurations/meta/catalina_pdb.json
+++ b/configurations/meta/catalina_pdb.json
@@ -495,7 +495,7 @@
                 "power1",
                 "temp1"
             ],
-            "Name": "PDB_P12V_NIC0_INA238",
+            "Name": "PDB_P12V_NIC0",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -529,7 +529,7 @@
                 "power1",
                 "temp1"
             ],
-            "Name": "PDB_P12V_NIC1_INA238",
+            "Name": "PDB_P12V_NIC1",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -563,7 +563,7 @@
                 "power1",
                 "temp1"
             ],
-            "Name": "PDB_P12V_SCM_INA238",
+            "Name": "PDB_P12V_SCM",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -594,7 +594,7 @@
             "Labels": [
                 "in0"
             ],
-            "Name": "PDB_POSITIVE_VDROP_INA238",
+            "Name": "PDB_POSITIVE_VDROP",
             "Type": "INA238",
             "in0_Max": 1,
             "in0_Min": -1,
@@ -606,7 +606,7 @@
             "Labels": [
                 "in0"
             ],
-            "Name": "PDB_RETURN_VDROP_INA238",
+            "Name": "PDB_RETURN_VDROP",
             "Type": "INA238",
             "in0_Max": 1,
             "in0_Min": -1,
@@ -618,7 +618,7 @@
             "Labels": [
                 "in0"
             ],
-            "Name": "PDB_CABLE_TSENSE_POSITIVE_INA238",
+            "Name": "PDB_CABLE_TSENSE_POSITIVE",
             "Type": "INA238",
             "in0_Max": 1,
             "in0_Min": -1,
@@ -630,7 +630,7 @@
             "Labels": [
                 "in0"
             ],
-            "Name": "PDB_CABLE_TSENSE_NEGATIVE_INA238",
+            "Name": "PDB_CABLE_TSENSE_NEGATIVE",
             "Type": "INA238",
             "in0_Max": 1,
             "in0_Min": -1,
@@ -646,7 +646,7 @@
                 "vin",
                 "vout1"
             ],
-            "Name": "PDB_P48V_HSC1_LTC4287",
+            "Name": "PDB_P48V_HSC1",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -714,7 +714,7 @@
                 "vin",
                 "vout1"
             ],
-            "Name": "PDB_P48V_HSC2_LTC4287",
+            "Name": "PDB_P48V_HSC2",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -782,7 +782,7 @@
                 "vin",
                 "vout1"
             ],
-            "Name": "PDB_P12V_FAN_MP5990",
+            "Name": "PDB_P12V_FAN",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -849,7 +849,7 @@
                 "temp1",
                 "vout1"
             ],
-            "Name": "PDB_VR_P12V_N1_RAA228004",
+            "Name": "PDB_VR_P12V_N1",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -900,7 +900,7 @@
                 "temp1",
                 "vout1"
             ],
-            "Name": "PDB_VR_P12V_N2_RAA228004",
+            "Name": "PDB_VR_P12V_N2",
             "PowerState": "On",
             "Thresholds": [
                 {
@@ -951,7 +951,7 @@
                 "temp1",
                 "vout1"
             ],
-            "Name": "PDB_VR_P12V_AUX_RAA228004",
+            "Name": "PDB_VR_P12V_AUX",
             "Thresholds": [
                 {
                     "Direction": "greater than",