diff --git a/firmware/controllers/engine_cycle/fuel_schedule.cpp b/firmware/controllers/engine_cycle/fuel_schedule.cpp
index 78048820bb..c38a6abbc1 100644
--- a/firmware/controllers/engine_cycle/fuel_schedule.cpp
+++ b/firmware/controllers/engine_cycle/fuel_schedule.cpp
@@ -160,7 +160,7 @@ bool InjectionEvent::update() {
 		injectorIndex = 0;
 	} else if (mode == IM_SEQUENTIAL || mode == IM_BATCH) {
 		// Map order index -> cylinder index (firing order)
-		injectorIndex = ID2INDEX(getCylinderId(ownIndex));
+		injectorIndex = ID2INDEX(getFiringOrderCylinderId(ownIndex));
 	} else {
 		firmwareError(ObdCode::CUSTOM_OBD_UNEXPECTED_INJECTION_MODE, "Unexpected injection mode %d", mode);
 		injectorIndex = 0;
@@ -177,7 +177,7 @@ bool InjectionEvent::update() {
 		// Each injector gets fired as a primary (the same as sequential), but also
 		// fires the injector 360 degrees later in the firing order.
 		int secondOrder = (ownIndex + (engineConfiguration->cylindersCount / 2)) % engineConfiguration->cylindersCount;
-		int secondIndex = ID2INDEX(getCylinderId(secondOrder));
+		int secondIndex = ID2INDEX(getFiringOrderCylinderId(secondOrder));
 		secondOutput = &enginePins.injectors[secondIndex];
 		secondOutputStage2 = &enginePins.injectorsStage2[secondIndex];
 	} else {
diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp
index 88d7d24559..a2d939290f 100644
--- a/firmware/controllers/engine_cycle/spark_logic.cpp
+++ b/firmware/controllers/engine_cycle/spark_logic.cpp
@@ -117,7 +117,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
 	engine->outputChannels.currentIgnitionMode = static_cast<uint8_t>(ignitionMode);
 
 	const int index = getIgnitionPinForIndex(event->cylinderIndex, ignitionMode);
-	const int coilIndex = ID2INDEX(getCylinderId(index));
+	const int coilIndex = ID2INDEX(getFiringOrderCylinderId(index));
 	IgnitionOutputPin *output = &enginePins.coils[coilIndex];
 	event->outputs[0] = output;
 	IgnitionOutputPin *secondOutput;
@@ -128,7 +128,7 @@ static void prepareCylinderIgnitionSchedule(angle_t dwellAngleDuration, floatms_
 	bool isTwoWireWasted = engineConfiguration->twoWireBatchIgnition || (engineConfiguration->ignitionMode == IM_INDIVIDUAL_COILS);
 	if (ignitionMode == IM_WASTED_SPARK && isTwoWireWasted) {
 		int secondIndex = index + engineConfiguration->cylindersCount / 2;
-		int secondCoilIndex = ID2INDEX(getCylinderId(secondIndex));
+		int secondCoilIndex = ID2INDEX(getFiringOrderCylinderId(secondIndex));
 		secondOutput = &enginePins.coils[secondCoilIndex];
 		assertPinAssigned(secondOutput);
 	} else {
diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index ad92aa5878..4c1976597a 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -326,7 +326,7 @@ static const uint8_t* getFiringOrderTable() {
  * @param index from zero to cylindersCount - 1
  * @return cylinderId from one to cylindersCount
  */
-size_t getCylinderId(size_t index) {
+size_t getFiringOrderCylinderId(size_t index) {
 	const size_t firingOrderLength = getFiringOrderLength();
 
 	if (firingOrderLength < 1 || firingOrderLength > MAX_CYLINDER_COUNT) {
diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h
index deca5af69f..2cdacf073b 100644
--- a/firmware/controllers/math/engine_math.h
+++ b/firmware/controllers/math/engine_math.h
@@ -35,7 +35,7 @@ floatms_t getSparkDwell(int rpm);
 
 ignition_mode_e getCurrentIgnitionMode();
 
-size_t getCylinderId(size_t index);
+size_t getFiringOrderCylinderId(size_t index);
 size_t getNextFiringCylinderId(size_t prevCylinderId);
 
 void setTimingRpmBin(float from, float to);