diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index b92ccbc981..b68ddb26a3 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -839,6 +839,6 @@ int getRusEfiVersion(void) {
 	if (initBootloader() != 0)
 		return 123;
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
-	return 20191110;
+	return 20191112;
 }
 #endif /* EFI_UNIT_TEST */
diff --git a/firmware/hw_layer/trigger_input.h b/firmware/hw_layer/trigger_input.h
index 529971ced0..c6094f61c7 100644
--- a/firmware/hw_layer/trigger_input.h
+++ b/firmware/hw_layer/trigger_input.h
@@ -22,6 +22,6 @@ void startTriggerInputPins(void);
 void stopTriggerInputPins(void);
 void setPrimaryChannel(brain_pin_e brainPin);
 void turnOffTriggerInputPin(brain_pin_e brainPin);
-void turnOnTriggerInputPin(const char *msg, int index, bool isVvtShaft);
+void turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft);
 
 #endif /* CRANK_INPUT_H_ */
diff --git a/firmware/hw_layer/trigger_input_exti.cpp b/firmware/hw_layer/trigger_input_exti.cpp
index fa5775a679..c6beacbb6b 100644
--- a/firmware/hw_layer/trigger_input_exti.cpp
+++ b/firmware/hw_layer/trigger_input_exti.cpp
@@ -64,8 +64,8 @@ static void cam_callback(void *arg) {
 	}
 }
 
-void turnOnTriggerInputPin(const char *msg, int index, bool isVvtShaft) {
-	brain_pin_e brainPin = isVvtShaft ? engineConfiguration->camInputs[index] : CONFIGB(triggerInputPins)[index];
+void turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft) {
+	brain_pin_e brainPin = isTriggerShaft ? CONFIGB(triggerInputPins)[index] : engineConfiguration->camInputs[index];
 
 	scheduleMsg(logger, "turnOnTriggerInputPin(PAL) %s %s", msg, hwPortname(brainPin));
 
diff --git a/firmware/hw_layer/trigger_input_icu.cpp b/firmware/hw_layer/trigger_input_icu.cpp
index 8cdbc5ceef..7d4e216383 100644
--- a/firmware/hw_layer/trigger_input_icu.cpp
+++ b/firmware/hw_layer/trigger_input_icu.cpp
@@ -28,12 +28,12 @@ extern bool hasFirmwareErrorFlag;
 
 static Logging *logger;
 
-static void cam_icu_width_callback(void *arg) {
+static void vvtWidthCallback(void *arg) {
     (void)arg;
 	hwHandleVvtCamSignal(TV_RISE);
 }
 
-static void cam_icu_period_callback(void *arg) {
+static void vvtPeriodCallback(void *arg) {
     (void)arg;
 	hwHandleVvtCamSignal(TV_FALL);
 }
@@ -79,21 +79,21 @@ static void shaftPeriodCallback(bool isPrimary) {
 	hwHandleShaftSignal(signal);
 }
 
-void turnOnTriggerInputPin(const char *msg, int index, bool isVvtShaft) {
+void turnOnTriggerInputPin(const char *msg, int index, bool isTriggerShaft) {
 
-	brain_pin_e brainPin = isVvtShaft ? engineConfiguration->camInputs[index] : CONFIGB(triggerInputPins)[index];
+	brain_pin_e brainPin = isTriggerShaft ? CONFIGB(triggerInputPins)[index] : engineConfiguration->camInputs[index];
 	if (brainPin == GPIO_UNASSIGNED) {
 		return;
 	}
 
 	digital_input_s* input = startDigitalCapture("trigger", brainPin, true);
-	if (isVvtShaft) {
-		input->setWidthCallback((VoidInt)(void*)shaftWidthCallback, NULL);
-		input->setPeriodCallback((VoidInt)(void*)shaftPeriodCallback, NULL);
-	} else {
+	if (isTriggerShaft) {
 		void * arg = (void*) (index == 0);
 		input->setWidthCallback((VoidInt)(void*)shaftWidthCallback, arg);
 		input->setPeriodCallback((VoidInt)(void*)shaftPeriodCallback, arg);
+	} else {
+		input->setWidthCallback((VoidInt)(void*)vvtWidthCallback, NULL);
+		input->setPeriodCallback((VoidInt)(void*)vvtPeriodCallback, NULL);
 	}
 }