diff --git a/firmware/config/boards/cypress/efifeatures.h b/firmware/config/boards/cypress/efifeatures.h
index 3478d89fad..433fb187b0 100644
--- a/firmware/config/boards/cypress/efifeatures.h
+++ b/firmware/config/boards/cypress/efifeatures.h
@@ -75,7 +75,7 @@
 
 #define EFI_ALTERNATOR_CONTROL FALSE
 
-#define EFI_AUX_PID FALSE
+#define EFI_VVT_PID FALSE
 
 #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
 #define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE
diff --git a/firmware/config/boards/kinetis/efifeatures.h b/firmware/config/boards/kinetis/efifeatures.h
index a451addbc9..29fe4bcfc0 100644
--- a/firmware/config/boards/kinetis/efifeatures.h
+++ b/firmware/config/boards/kinetis/efifeatures.h
@@ -77,7 +77,7 @@
 
 #define EFI_ALTERNATOR_CONTROL FALSE
 
-#define EFI_AUX_PID FALSE
+#define EFI_VVT_PID FALSE
 
 #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
 #define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE
diff --git a/firmware/config/boards/skeleton/efifeatures.h b/firmware/config/boards/skeleton/efifeatures.h
index c561aa6cb2..6328c74661 100644
--- a/firmware/config/boards/skeleton/efifeatures.h
+++ b/firmware/config/boards/skeleton/efifeatures.h
@@ -117,7 +117,7 @@
 
 #define EFI_ALTERNATOR_CONTROL TRUE
 
-#define EFI_AUX_PID TRUE
+#define EFI_VVT_PID TRUE
 
 #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
 #define EFI_SIGNAL_EXECUTOR_ONE_TIMER TRUE
diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index ca305b1cc4..b1f366a5e8 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -125,8 +125,8 @@
 #define EFI_ALTERNATOR_CONTROL TRUE
 #endif
 
-#ifndef EFI_AUX_PID
-#define EFI_AUX_PID TRUE
+#ifndef EFI_VVT_PID
+#define EFI_VVT_PID TRUE
 #endif
 
 #define EFI_SIGNAL_EXECUTOR_SLEEP FALSE
diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp
index dfd97c3d79..16966a978e 100644
--- a/firmware/controllers/actuators/vvt.cpp
+++ b/firmware/controllers/actuators/vvt.cpp
@@ -38,7 +38,7 @@ int VvtController::getPeriodMs() {
 }
 
 void VvtController::PeriodicTask() {
-	if (engine->auxParametersVersion.isOld(engine->getGlobalConfigurationVersion())) {
+	if (engine->vvtParametersVersion.isOld(engine->getGlobalConfigurationVersion())) {
 		m_pid.reset();
 	}
 
@@ -115,7 +115,7 @@ void VvtController::setOutput(expected<percent_t> outputValue) {
 #endif // EFI_SHAFT_POSITION_INPUT
 }
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 
 static const char *vvtOutputNames[CAM_INPUTS_COUNT] = {
 "Vvt Output#1",
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index c4f1bbb3f1..78735ec9eb 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -195,7 +195,7 @@ public:
 	void setConfig();
 
 	LocalVersionHolder versionForConfigurationListeners;
-	LocalVersionHolder auxParametersVersion;
+	LocalVersionHolder vvtParametersVersion;
 
 	AuxActor auxValves[AUX_DIGITAL_VALVE_COUNT][2];
 
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 98a1130a48..948b85ddf1 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -684,9 +684,9 @@ void initEngineController() {
 	initAlternatorCtrl();
 #endif /* EFI_ALTERNATOR_CONTROL */
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	initVvtActuators();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 
 #if EFI_MALFUNCTION_INDICATOR
 	initMalfunctionIndicator();
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index c87639b054..171d0ee04a 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -368,9 +368,9 @@ void applyNewHardwareSettings() {
 #if EFI_LOGIC_ANALYZER
 	startLogicAnalyzerPins();
 #endif /* EFI_LOGIC_ANALYZER */
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	startVvtControlPins();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 
 #if EFI_SENT_SUPPORT
 	startSent();
@@ -459,9 +459,9 @@ void stopHardware() {
 	stopTriggerEmulatorPins();
 #endif /* EFI_EMULATE_POSITION_SENSORS */
 
-#if EFI_AUX_PID
+#if EFI_VVT_PID
 	stopVvtControlPins();
-#endif /* EFI_AUX_PID */
+#endif /* EFI_VVT_PID */
 }
 
 /**
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 4c12bdbe2a..d1c0664635 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -111,7 +111,7 @@
 #define EFI_MAX_31855 FALSE
 
 #define EFI_ELECTRONIC_THROTTLE_BODY TRUE
-#define EFI_AUX_PID TRUE
+#define EFI_VVT_PID TRUE
 
 #ifndef HAL_TRIGGER_USE_PAL
 #define HAL_TRIGGER_USE_PAL FALSE