diff --git a/configurations/yosemite4_sentineldome_t2_retimer.json b/configurations/yosemite4_sentineldome_t2_retimer.json
index 75bae2c..7a3d54e 100644
--- a/configurations/yosemite4_sentineldome_t2_retimer.json
+++ b/configurations/yosemite4_sentineldome_t2_retimer.json
@@ -10,7 +10,7 @@
             "ILimitMax": 100,
             "ILimitMin": -50,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RETIMER_TEMP_C"
             ],
             "Name": "PID_MB_RETIMER_TEMP_Slot $bus % 15",
             "NegativeHysteresis": 3.0,
@@ -37,18 +37,18 @@
             "ILimitMin": -50,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C"
             ],
             "Name": "PID_MB_DIMM_Slot $bus % 15",
             "NegativeHysteresis": 2.0,
@@ -75,7 +75,7 @@
             "ILimitMin": -50,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C"
             ],
             "Name": "PID_MB_CPU_Slot $bus % 15",
             "NegativeHysteresis": 3.0,
@@ -102,7 +102,7 @@
             "ILimitMin": -50,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C"
             ],
             "Name": "PID_MB_SSD_BOOT_Slot $bus % 15",
             "NegativeHysteresis": 2.0,
@@ -129,7 +129,7 @@
             "ILimitMin": -50,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C"
             ],
             "Name": "PID_MB_SSD_DATA_Slot $bus % 15",
             "NegativeHysteresis": 2.0,
@@ -156,11 +156,11 @@
             "ILimitMin": -50,
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C"
             ],
             "Name": "PID_MB_VR_Slot $bus % 15",
             "NegativeHysteresis": 3.0,
@@ -180,8 +180,8 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_INLET_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_OUTLET_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_INLET_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_OUTLET_TEMP_C"
             ],
             "Name": "Stepwise_MB_INLET_OUTLET_TEMP_Slot $bus % 15",
             "NegativeHysteresis": 0,
@@ -201,7 +201,7 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_X8_RETIMER_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_X8_RETIMER_TEMP_C"
             ],
             "Name": "Stepwise_MB_RETIMER_TEMP_Slot $bus % 15",
             "NegativeHysteresis": 2,
@@ -235,7 +235,7 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Calibrated_Sentinel_Dome_Slot $bus % 15 MB_FIO_TEMP_C"
+                "CALIBRATED_SENTINEL_DOME_SLOT $bus % 15 MB_FIO_TEMP_C"
             ],
             "Name": "Stepwise_MB_FIO_Slot $bus % 15",
             "NegativeHysteresis": 1,
@@ -293,18 +293,18 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_A_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_B_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_C_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_D_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_E_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_F_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_G_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_H_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_I_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_J_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_K_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_DIMM_L_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_A_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_B_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_C_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_D_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_E_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_F_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_G_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_H_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_I_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_J_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_K_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_DIMM_L_TEMP_C"
             ],
             "Name": "Stepwise_MB_DIMM_Slot $bus % 15",
             "NegativeHysteresis": 2,
@@ -334,7 +334,7 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_CPU_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_CPU_TEMP_C"
             ],
             "Name": "Stepwise_MB_CPU_Slot $bus % 15",
             "NegativeHysteresis": 3,
@@ -370,7 +370,7 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_SSD_BOOT_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_BOOT_TEMP_C"
             ],
             "Name": "Stepwise_MB_SSD_BOOT_Slot $bus % 15",
             "NegativeHysteresis": 2,
@@ -400,7 +400,7 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_SSD_DATA_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_SSD_DATA_TEMP_C"
             ],
             "Name": "Stepwise_MB_SSD_DATA_Slot $bus % 15",
             "NegativeHysteresis": 2,
@@ -430,11 +430,11 @@
             "Class": "temp",
             "InputUnavailableAsFailed": false,
             "Inputs": [
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU0_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_SOC_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_CPU1_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDDIO_TEMP_C",
-                "Sentinel_Dome_Slot $bus % 15 MB_VR_PVDD11_TEMP_C"
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU0_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_SOC_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_CPU1_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDDIO_TEMP_C",
+                "SENTINEL_DOME_SLOT $bus % 15 MB_VR_PVDD11_TEMP_C"
             ],
             "Name": "Stepwise_MB_VR_Slot $bus % 15",
             "NegativeHysteresis": 3,