diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 648e7fe908..af79173a20 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -194,6 +194,7 @@ void Engine::periodicSlowCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 #if HW_CHECK_MODE
 	waitForSlowAdc(3);
+	efiAssertVoid(OBD_PCM_Processor_Fault, CONFIG(clt).adcChannel != EFI_ADC_NONE, "No CLT setting");
 	assertCloseTo("clt", Sensor::get(SensorType::Clt).Value, 49.3);
 	assertCloseTo("iat", Sensor::get(SensorType::Iat).Value, 73.2);
 	assertCloseTo("aut1", Sensor::get(SensorType::AuxTemp1).Value, 13.8);
diff --git a/firmware/init/init.h b/firmware/init/init.h
index 52be0bbfd4..c44ba16de3 100644
--- a/firmware/init/init.h
+++ b/firmware/init/init.h
@@ -19,12 +19,12 @@ void reconfigureSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 
 // Internal init functions for individual systems
 // Sensor init/config
-void initTps(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void initOilPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void initNewThermistors(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void initCanSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void initTps(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void initOilPressure(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void initThermistors(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void initCanSensors();
 
 // Sensor reconfiguration
-void reconfigureTps(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void reconfigureThermistors(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void reconfigureOilPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void reconfigureTps(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void reconfigureThermistors(DECLARE_CONFIG_PARAMETER_SIGNATURE);
+void reconfigureOilPressure(DECLARE_CONFIG_PARAMETER_SIGNATURE);
diff --git a/firmware/init/sensor/init_oil_pressure.cpp b/firmware/init/sensor/init_oil_pressure.cpp
index 15b5e73d34..29db12efac 100644
--- a/firmware/init/sensor/init_oil_pressure.cpp
+++ b/firmware/init/sensor/init_oil_pressure.cpp
@@ -44,6 +44,6 @@ void initOilPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	}
 }
 
-void reconfigureOilPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void reconfigureOilPressure(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	configureOilPressure(oilpSensorFunc, CONFIG(oilPressure));
 }
diff --git a/firmware/init/sensor/init_sensors.cpp b/firmware/init/sensor/init_sensors.cpp
index fe113446e8..e3ffc99ef9 100644
--- a/firmware/init/sensor/init_sensors.cpp
+++ b/firmware/init/sensor/init_sensors.cpp
@@ -15,7 +15,7 @@ void initNewSensors(Logging* logger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 
 	initTps(PASS_ENGINE_PARAMETER_SIGNATURE);
 	initOilPressure(PASS_ENGINE_PARAMETER_SIGNATURE);
-	initNewThermistors(PASS_ENGINE_PARAMETER_SIGNATURE);
+	initThermistors(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 	// Init CLI functionality for sensors (mocking)
 	initSensorCli(logger);
diff --git a/firmware/init/sensor/init_thermistors.cpp b/firmware/init/sensor/init_thermistors.cpp
index 7cd736222d..269322bab5 100644
--- a/firmware/init/sensor/init_thermistors.cpp
+++ b/firmware/init/sensor/init_thermistors.cpp
@@ -68,7 +68,7 @@ static void configureTempSensor(FunctionalSensor &sensor,
 	}
 }
 
-void initNewThermistors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void initThermistors(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	configureTempSensor(clt,
 						fclt,
 						CONFIG(clt),
@@ -90,7 +90,7 @@ void initNewThermistors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 						false);
 }
 
-void reconfigureThermistors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void reconfigureThermistors(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	configTherm(clt,
 				fclt,
 				CONFIG(clt),
diff --git a/firmware/init/sensor/init_tps.cpp b/firmware/init/sensor/init_tps.cpp
index 477636abcc..ba2af2f1cc 100644
--- a/firmware/init/sensor/init_tps.cpp
+++ b/firmware/init/sensor/init_tps.cpp
@@ -71,7 +71,7 @@ static void initTpsFuncAndRedund(RedundantSensor& redund, LinearFunc& func, Func
 	}
 }
 
-void initTps(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void initTps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	float min = CONFIG(tpsErrorDetectionTooLow);
 	float max = CONFIG(tpsErrorDetectionTooHigh);
 
@@ -94,7 +94,7 @@ void initTps(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	}
 }
 
-void reconfigureTps(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void reconfigureTps(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	float min = CONFIG(tpsErrorDetectionTooLow);
 	float max = CONFIG(tpsErrorDetectionTooHigh);