diff --git a/configurations/yosemite4.json b/configurations/yosemite4.json
index 0c2d19b..cee0935 100644
--- a/configurations/yosemite4.json
+++ b/configurations/yosemite4.json
@@ -442,59 +442,59 @@
             "ILimitMax": 0.0,
             "ILimitMin": 0.0,
             "Inputs": [
-                "FANBOARD0_FAN0_TACH_IL",
-                "FANBOARD0_FAN0_TACH_OL",
-                "FANBOARD0_FAN1_TACH_IL",
-                "FANBOARD0_FAN1_TACH_OL",
-                "FANBOARD1_FAN2_TACH_IL",
-                "FANBOARD1_FAN2_TACH_OL",
-                "FANBOARD1_FAN3_TACH_IL",
-                "FANBOARD1_FAN3_TACH_OL",
-                "FANBOARD0_FAN4_TACH_IL",
-                "FANBOARD0_FAN4_TACH_OL",
-                "FANBOARD0_FAN5_TACH_IL",
-                "FANBOARD0_FAN5_TACH_OL",
-                "FANBOARD1_FAN6_TACH_IL",
-                "FANBOARD1_FAN6_TACH_OL",
-                "FANBOARD1_FAN7_TACH_IL",
-                "FANBOARD1_FAN7_TACH_OL",
-                "FANBOARD0_FAN8_TACH_IL",
-                "FANBOARD0_FAN8_TACH_OL",
-                "FANBOARD0_FAN9_TACH_IL",
-                "FANBOARD0_FAN9_TACH_OL",
-                "FANBOARD1_FAN10_TACH_IL",
-                "FANBOARD1_FAN10_TACH_OL",
-                "FANBOARD1_FAN11_TACH_IL",
-                "FANBOARD1_FAN11_TACH_OL"
+                "FANBOARD0_FAN0_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN0_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN1_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN1_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN2_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN2_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN3_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN3_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN4_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN4_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN5_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN5_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN6_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN6_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN7_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN7_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN8_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN8_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN9_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN9_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN10_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN10_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN11_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN11_TACH_OL_SPEED_RPM"
             ],
             "Name": "All Fan",
             "OutLimitMax": 100.0,
             "OutLimitMin": 0.0,
             "Outputs": [
-                "FANBOARD0_FAN0_PWM",
-                "FANBOARD0_FAN0_PWM",
-                "FANBOARD0_FAN1_PWM",
-                "FANBOARD0_FAN1_PWM",
-                "FANBOARD1_FAN2_PWM",
-                "FANBOARD1_FAN2_PWM",
-                "FANBOARD1_FAN3_PWM",
-                "FANBOARD1_FAN3_PWM",
-                "FANBOARD0_FAN4_PWM",
-                "FANBOARD0_FAN4_PWM",
-                "FANBOARD0_FAN5_PWM",
-                "FANBOARD0_FAN5_PWM",
-                "FANBOARD1_FAN6_PWM",
-                "FANBOARD1_FAN6_PWM",
-                "FANBOARD1_FAN7_PWM",
-                "FANBOARD1_FAN7_PWM",
-                "FANBOARD0_FAN8_PWM",
-                "FANBOARD0_FAN8_PWM",
-                "FANBOARD0_FAN9_PWM",
-                "FANBOARD0_FAN9_PWM",
-                "FANBOARD1_FAN10_PWM",
-                "FANBOARD1_FAN10_PWM",
-                "FANBOARD1_FAN11_PWM",
-                "FANBOARD1_FAN11_PWM"
+                "FANBOARD0_FAN0_PWM_TACH_PCT",
+                "FANBOARD0_FAN0_PWM_TACH_PCT",
+                "FANBOARD0_FAN1_PWM_TACH_PCT",
+                "FANBOARD0_FAN1_PWM_TACH_PCT",
+                "FANBOARD1_FAN2_PWM_TACH_PCT",
+                "FANBOARD1_FAN2_PWM_TACH_PCT",
+                "FANBOARD1_FAN3_PWM_TACH_PCT",
+                "FANBOARD1_FAN3_PWM_TACH_PCT",
+                "FANBOARD0_FAN4_PWM_TACH_PCT",
+                "FANBOARD0_FAN4_PWM_TACH_PCT",
+                "FANBOARD0_FAN5_PWM_TACH_PCT",
+                "FANBOARD0_FAN5_PWM_TACH_PCT",
+                "FANBOARD1_FAN6_PWM_TACH_PCT",
+                "FANBOARD1_FAN6_PWM_TACH_PCT",
+                "FANBOARD1_FAN7_PWM_TACH_PCT",
+                "FANBOARD1_FAN7_PWM_TACH_PCT",
+                "FANBOARD0_FAN8_PWM_TACH_PCT",
+                "FANBOARD0_FAN8_PWM_TACH_PCT",
+                "FANBOARD0_FAN9_PWM_TACH_PCT",
+                "FANBOARD0_FAN9_PWM_TACH_PCT",
+                "FANBOARD1_FAN10_PWM_TACH_PCT",
+                "FANBOARD1_FAN10_PWM_TACH_PCT",
+                "FANBOARD1_FAN11_PWM_TACH_PCT",
+                "FANBOARD1_FAN11_PWM_TACH_PCT"
             ],
             "PCoefficient": 0.0,
             "SlewNeg": 0.0,
diff --git a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
index 4e28769..2c2e421 100644
--- a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
+++ b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_max.json
@@ -260,15 +260,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     3
                 ]
             },
             "Index": 3,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -296,15 +296,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -332,15 +332,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     3
                 ]
             },
             "Index": 3,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -368,15 +368,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -404,15 +404,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -440,15 +440,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -476,15 +476,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -512,15 +512,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -548,15 +548,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -584,15 +584,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -620,15 +620,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -656,15 +656,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
diff --git a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
index d0e20c6..0d0654f 100644
--- a/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
+++ b/configurations/yosemite4_fanboard_fsc_max_adc_ti_led_nxp_efuse_mps.json
@@ -260,15 +260,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     3
                 ]
             },
             "Index": 3,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -296,15 +296,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -332,15 +332,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     3
                 ]
             },
             "Index": 3,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -368,15 +368,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     10
                 ]
             },
             "Index": 10,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -404,15 +404,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -440,15 +440,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -476,15 +476,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -512,15 +512,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
                 "Pwm": 1,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -548,15 +548,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -584,15 +584,15 @@
             "Address": "0x20",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -620,15 +620,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -656,15 +656,15 @@
             "Address": "0x2f",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
diff --git a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json
index 828922c..9b3a8cb 100644
--- a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json
+++ b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_max.json
@@ -10,15 +10,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -46,15 +46,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -82,15 +82,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -118,15 +118,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -154,15 +154,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     14
                 ]
             },
             "Index": 14,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -190,15 +190,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -226,15 +226,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     14
                 ]
             },
             "Index": 14,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -262,15 +262,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -298,15 +298,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -334,15 +334,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     12
                 ]
             },
             "Index": 12,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -370,15 +370,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -406,15 +406,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     12
                 ]
             },
             "Index": 12,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
diff --git a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json
index 22e1933..4f85163 100644
--- a/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json
+++ b/configurations/yosemite4_fanboard_fsc_nct_adc_max_led_ons_efuse_mps.json
@@ -10,15 +10,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -46,15 +46,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 0 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -82,15 +82,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     1
                 ]
             },
             "Index": 1,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -118,15 +118,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
                 "Pwm": 5,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 PWM_TACH_PCT",
                 "Tachs": [
                     2
                 ]
             },
             "Index": 2,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 1 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -154,15 +154,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     14
                 ]
             },
             "Index": 14,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -190,15 +190,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 4 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -226,15 +226,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     14
                 ]
             },
             "Index": 14,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -262,15 +262,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
                 "Pwm": 2,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 PWM_TACH_PCT",
                 "Tachs": [
                     0
                 ]
             },
             "Index": 0,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 5 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -298,15 +298,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -334,15 +334,15 @@
             "Address": "0x21",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 PWM_TACH_PCT",
                 "Tachs": [
                     12
                 ]
             },
             "Index": 12,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 8 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -370,15 +370,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     9
                 ]
             },
             "Index": 9,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_IL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
@@ -406,15 +406,15 @@
             "Address": "0x23",
             "Bus": "$bus",
             "Connector": {
-                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+                "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
                 "Pwm": 0,
-                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM",
+                "PwmName": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 PWM_TACH_PCT",
                 "Tachs": [
                     12
                 ]
             },
             "Index": 12,
-            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL",
+            "Name": "FANBOARD$bus % 30 FAN$bus % 30 * 2 + 9 TACH_OL_SPEED_RPM",
             "PowerState": "Always",
             "Thresholds": [
                 {
diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json
index 32a61ca..b7d3b86 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_adi_48vhsc_inf.json
@@ -149,9 +149,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -306,9 +306,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -463,9 +463,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -620,9 +620,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -777,9 +777,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -934,9 +934,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1091,9 +1091,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1248,9 +1248,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1287,7 +1287,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -1486,8 +1486,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1565,7 +1565,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1579,7 +1579,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1737,9 +1737,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -1892,9 +1892,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json
index be01911..e68dcb6 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_adi.json
@@ -147,9 +147,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -302,9 +302,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
@@ -341,7 +341,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -645,9 +645,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -802,9 +802,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -959,9 +959,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -1116,9 +1116,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -1273,9 +1273,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1430,9 +1430,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1587,9 +1587,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1744,9 +1744,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1796,8 +1796,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1875,7 +1875,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1889,7 +1889,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json
index ee8dbd7..bfa1a79 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_12vhsc_mps_48vhsc_inf.json
@@ -31,7 +31,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -335,9 +335,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -492,9 +492,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -649,9 +649,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -806,9 +806,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -963,9 +963,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1120,9 +1120,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1277,9 +1277,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1434,9 +1434,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1486,8 +1486,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1565,7 +1565,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1579,7 +1579,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1737,9 +1737,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -1892,9 +1892,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
diff --git a/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json b/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json
index 2c9a9bd..9637a51 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_hsc_adi.json
@@ -147,9 +147,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -302,9 +302,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
@@ -459,9 +459,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -616,9 +616,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -773,9 +773,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -930,9 +930,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -1087,9 +1087,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1244,9 +1244,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1401,9 +1401,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1558,9 +1558,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1597,7 +1597,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -1796,8 +1796,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1875,7 +1875,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1889,7 +1889,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json
index c6581cd..e212c1b 100644
--- a/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_rns_isl_12vhsc_adi_48vhsc_inf.json
@@ -354,9 +354,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -509,9 +509,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -664,9 +664,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -819,9 +819,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -974,9 +974,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1129,9 +1129,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1284,9 +1284,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1439,9 +1439,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1551,7 +1551,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1565,7 +1565,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1723,9 +1723,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -1878,9 +1878,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json
index b45593a..3d5b395 100644
--- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_adi_48vhsc_inf.json
@@ -149,9 +149,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -306,9 +306,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -463,9 +463,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -620,9 +620,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -777,9 +777,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -934,9 +934,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1091,9 +1091,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1248,9 +1248,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1297,7 +1297,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -1486,8 +1486,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1565,7 +1565,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1579,7 +1579,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1737,9 +1737,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -1892,9 +1892,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json
index aa04a49..4ee2d37 100644
--- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json
+++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_adi.json
@@ -147,9 +147,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -302,9 +302,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
@@ -351,7 +351,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -655,9 +655,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -812,9 +812,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -969,9 +969,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -1126,9 +1126,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -1283,9 +1283,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1440,9 +1440,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1597,9 +1597,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1754,9 +1754,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1796,8 +1796,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1875,7 +1875,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1889,7 +1889,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json
index c187e40..6ff0be0 100644
--- a/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json
+++ b/configurations/yosemite4_medusaboard_adc_ti_12vhsc_mps_48vhsc_inf.json
@@ -41,7 +41,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -345,9 +345,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -502,9 +502,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -659,9 +659,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -816,9 +816,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -973,9 +973,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1130,9 +1130,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1287,9 +1287,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1444,9 +1444,9 @@
                 }
             ],
             "Type": "MP5990",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_2",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_2_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_2_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1486,8 +1486,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1565,7 +1565,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1579,7 +1579,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1737,9 +1737,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC0_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -1892,9 +1892,9 @@
                 }
             ],
             "Type": "XDP710",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_2",
+            "iout1_Name": "MEDUSA_48VHSC1_2_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_2",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_2_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
diff --git a/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json b/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json
index ecc3cc9..586d5d7 100644
--- a/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json
+++ b/configurations/yosemite4_medusaboard_adc_ti_hsc_adi.json
@@ -147,9 +147,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC0_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC0_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC0_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC0_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC0_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC0_INPUT_VOLT_V",
@@ -302,9 +302,9 @@
                 }
             ],
             "Type": "ADM1272",
-            "iout1_Name": "MEDUSA_48VHSC1_CURR_A_1",
+            "iout1_Name": "MEDUSA_48VHSC1_1_CURR_A",
             "iout1_Scale": 250,
-            "pin_Name": "MEDUSA_48VHSC1_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_48VHSC1_INPUT_1_PWR_W",
             "pin_Scale": 250000,
             "temp1_Name": "MEDUSA_48VHSC1_TEMP_C",
             "vin_Name": "MEDUSA_48VHSC1_INPUT_VOLT_V",
@@ -459,9 +459,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB1_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB1_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB1_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB1_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB1_12VHSC_INPUT_VOLT_V",
@@ -616,9 +616,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB2_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB2_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB2_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB2_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB2_12VHSC_INPUT_VOLT_V",
@@ -773,9 +773,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB3_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB3_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB3_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB3_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB3_12VHSC_INPUT_VOLT_V",
@@ -930,9 +930,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB4_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB4_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB4_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB4_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB4_12VHSC_INPUT_VOLT_V",
@@ -1087,9 +1087,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB5_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB5_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB5_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB5_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB5_12VHSC_INPUT_VOLT_V",
@@ -1244,9 +1244,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB6_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB6_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB6_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB6_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB6_12VHSC_INPUT_VOLT_V",
@@ -1401,9 +1401,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB7_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB7_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB7_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB7_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB7_12VHSC_INPUT_VOLT_V",
@@ -1558,9 +1558,9 @@
                 }
             ],
             "Type": "ADM1281",
-            "iout1_Name": "MEDUSA_MB8_12VHSC_CURR_A_1",
+            "iout1_Name": "MEDUSA_MB8_12VHSC_1_CURR_A",
             "iout1_Scale": 500,
-            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_PWR_W_1",
+            "pin_Name": "MEDUSA_MB8_12VHSC_INPUT_1_PWR_W",
             "pin_Scale": 500000,
             "temp1_Name": "MEDUSA_MB8_12VHSC_TEMP_C",
             "vin_Name": "MEDUSA_MB8_12VHSC_INPUT_VOLT_V",
@@ -1607,7 +1607,7 @@
                 }
             ],
             "Type": "INA238",
-            "in1_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
+            "in0_Name": "MEDUSA_ADC_48V_SENSE_VOLT_V"
         },
         {
             "Address": "0x40",
@@ -1796,8 +1796,8 @@
             "Inputs": [
                 "MEDUSA_48VHSC0_TEMP_C",
                 "MEDUSA_48VHSC1_TEMP_C",
-                "MEDUSA_TEMP0_C",
-                "MEDUSA_TEMP1_C"
+                "MEDUSA_0_TEMP_C",
+                "MEDUSA_1_TEMP_C"
             ],
             "Name": "Stepwise_MEDUSA_Non_Critical_Sensors",
             "NegativeHysteresis": 0,
@@ -1875,7 +1875,7 @@
         {
             "Address": "0x48",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP0_C",
+            "Name": "MEDUSA_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1889,7 +1889,7 @@
         {
             "Address": "0x49",
             "Bus": 11,
-            "Name": "MEDUSA_TEMP1_C",
+            "Name": "MEDUSA_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
index 25178eb..2cc93a9 100644
--- a/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
+++ b/configurations/yosemite4_spiderboard_adc_max_pwr_ti.json
@@ -973,8 +973,8 @@
         {
             "Class": "temp",
             "Inputs": [
-                "SPIDER_TEMP0_C",
-                "SPIDER_TEMP1_C"
+                "SPIDER_0_TEMP_C",
+                "SPIDER_1_TEMP_C"
             ],
             "Name": "Stepwise_SPIDER_TEMP",
             "NegativeHysteresis": 0,
@@ -993,7 +993,7 @@
         {
             "Address": "0x4e",
             "Bus": 14,
-            "Name": "SPIDER_TEMP0_C",
+            "Name": "SPIDER_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1007,7 +1007,7 @@
         {
             "Address": "0x4f",
             "Bus": 14,
-            "Name": "SPIDER_TEMP1_C",
+            "Name": "SPIDER_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json b/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json
index bd8e012..4b15436 100644
--- a/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json
+++ b/configurations/yosemite4_spiderboard_adc_ti_pwr_ti.json
@@ -983,8 +983,8 @@
         {
             "Class": "temp",
             "Inputs": [
-                "SPIDER_TEMP0_C",
-                "SPIDER_TEMP1_C"
+                "SPIDER_0_TEMP_C",
+                "SPIDER_1_TEMP_C"
             ],
             "Name": "Stepwise_SPIDER_TEMP",
             "NegativeHysteresis": 0,
@@ -1003,7 +1003,7 @@
         {
             "Address": "0x4e",
             "Bus": 14,
-            "Name": "SPIDER_TEMP0_C",
+            "Name": "SPIDER_0_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
@@ -1017,7 +1017,7 @@
         {
             "Address": "0x4f",
             "Bus": 14,
-            "Name": "SPIDER_TEMP1_C",
+            "Name": "SPIDER_1_TEMP_C",
             "Thresholds": [
                 {
                     "Direction": "greater than",
diff --git a/configurations/yosemite4n.json b/configurations/yosemite4n.json
index 49a6769..d3dad76 100644
--- a/configurations/yosemite4n.json
+++ b/configurations/yosemite4n.json
@@ -416,59 +416,59 @@
             "ILimitMax": 0.0,
             "ILimitMin": 0.0,
             "Inputs": [
-                "FANBOARD0_FAN0_TACH_IL",
-                "FANBOARD0_FAN0_TACH_OL",
-                "FANBOARD0_FAN1_TACH_IL",
-                "FANBOARD0_FAN1_TACH_OL",
-                "FANBOARD1_FAN2_TACH_IL",
-                "FANBOARD1_FAN2_TACH_OL",
-                "FANBOARD1_FAN3_TACH_IL",
-                "FANBOARD1_FAN3_TACH_OL",
-                "FANBOARD0_FAN4_TACH_IL",
-                "FANBOARD0_FAN4_TACH_OL",
-                "FANBOARD0_FAN5_TACH_IL",
-                "FANBOARD0_FAN5_TACH_OL",
-                "FANBOARD1_FAN6_TACH_IL",
-                "FANBOARD1_FAN6_TACH_OL",
-                "FANBOARD1_FAN7_TACH_IL",
-                "FANBOARD1_FAN7_TACH_OL",
-                "FANBOARD0_FAN8_TACH_IL",
-                "FANBOARD0_FAN8_TACH_OL",
-                "FANBOARD0_FAN9_TACH_IL",
-                "FANBOARD0_FAN9_TACH_OL",
-                "FANBOARD1_FAN10_TACH_IL",
-                "FANBOARD1_FAN10_TACH_OL",
-                "FANBOARD1_FAN11_TACH_IL",
-                "FANBOARD1_FAN11_TACH_OL"
+                "FANBOARD0_FAN0_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN0_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN1_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN1_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN2_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN2_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN3_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN3_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN4_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN4_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN5_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN5_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN6_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN6_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN7_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN7_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN8_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN8_TACH_OL_SPEED_RPM",
+                "FANBOARD0_FAN9_TACH_IL_SPEED_RPM",
+                "FANBOARD0_FAN9_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN10_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN10_TACH_OL_SPEED_RPM",
+                "FANBOARD1_FAN11_TACH_IL_SPEED_RPM",
+                "FANBOARD1_FAN11_TACH_OL_SPEED_RPM"
             ],
             "Name": "All Fan",
             "OutLimitMax": 100.0,
             "OutLimitMin": 0.0,
             "Outputs": [
-                "FANBOARD0_FAN0_PWM",
-                "FANBOARD0_FAN0_PWM",
-                "FANBOARD0_FAN1_PWM",
-                "FANBOARD0_FAN1_PWM",
-                "FANBOARD1_FAN2_PWM",
-                "FANBOARD1_FAN2_PWM",
-                "FANBOARD1_FAN3_PWM",
-                "FANBOARD1_FAN3_PWM",
-                "FANBOARD0_FAN4_PWM",
-                "FANBOARD0_FAN4_PWM",
-                "FANBOARD0_FAN5_PWM",
-                "FANBOARD0_FAN5_PWM",
-                "FANBOARD1_FAN6_PWM",
-                "FANBOARD1_FAN6_PWM",
-                "FANBOARD1_FAN7_PWM",
-                "FANBOARD1_FAN7_PWM",
-                "FANBOARD0_FAN8_PWM",
-                "FANBOARD0_FAN8_PWM",
-                "FANBOARD0_FAN9_PWM",
-                "FANBOARD0_FAN9_PWM",
-                "FANBOARD1_FAN10_PWM",
-                "FANBOARD1_FAN10_PWM",
-                "FANBOARD1_FAN11_PWM",
-                "FANBOARD1_FAN11_PWM"
+                "FANBOARD0_FAN0_PWM_TACH_PCT",
+                "FANBOARD0_FAN0_PWM_TACH_PCT",
+                "FANBOARD0_FAN1_PWM_TACH_PCT",
+                "FANBOARD0_FAN1_PWM_TACH_PCT",
+                "FANBOARD1_FAN2_PWM_TACH_PCT",
+                "FANBOARD1_FAN2_PWM_TACH_PCT",
+                "FANBOARD1_FAN3_PWM_TACH_PCT",
+                "FANBOARD1_FAN3_PWM_TACH_PCT",
+                "FANBOARD0_FAN4_PWM_TACH_PCT",
+                "FANBOARD0_FAN4_PWM_TACH_PCT",
+                "FANBOARD0_FAN5_PWM_TACH_PCT",
+                "FANBOARD0_FAN5_PWM_TACH_PCT",
+                "FANBOARD1_FAN6_PWM_TACH_PCT",
+                "FANBOARD1_FAN6_PWM_TACH_PCT",
+                "FANBOARD1_FAN7_PWM_TACH_PCT",
+                "FANBOARD1_FAN7_PWM_TACH_PCT",
+                "FANBOARD0_FAN8_PWM_TACH_PCT",
+                "FANBOARD0_FAN8_PWM_TACH_PCT",
+                "FANBOARD0_FAN9_PWM_TACH_PCT",
+                "FANBOARD0_FAN9_PWM_TACH_PCT",
+                "FANBOARD1_FAN10_PWM_TACH_PCT",
+                "FANBOARD1_FAN10_PWM_TACH_PCT",
+                "FANBOARD1_FAN11_PWM_TACH_PCT",
+                "FANBOARD1_FAN11_PWM_TACH_PCT"
             ],
             "PCoefficient": 0.0,
             "SlewNeg": 0.0,