diff --git a/firmware/console/binary/live_data.cpp b/firmware/console/binary/live_data.cpp
index 32f666e08a..085a058b1b 100644
--- a/firmware/console/binary/live_data.cpp
+++ b/firmware/console/binary/live_data.cpp
@@ -212,7 +212,7 @@ const idle_state_s* getLiveData(size_t) {
 }
 
 template<>
-const ignition_state_s* getLiveData(size_t) {
+const ignition_controller_s* getLiveData(size_t) {
 	return &engine->ignitionState;
 }
 
diff --git a/firmware/controllers/algo/advance_map.h b/firmware/controllers/algo/advance_map.h
index 17044be942..a7275f4902 100644
--- a/firmware/controllers/algo/advance_map.h
+++ b/firmware/controllers/algo/advance_map.h
@@ -5,10 +5,10 @@
  * @author Andrey Belomutskiy, (c) 2012-2020
  */
 
-#include "ignition_state_generated.h"
-
 #pragma once
 
+#include "ignition_controller_generated.h"
+
 angle_t getWrappedAdvance(float rpm, float engineLoad);
 angle_t getCylinderIgnitionTrim(size_t cylinderNumber, float rpm, float ignitionLoad);
 /**
@@ -23,7 +23,7 @@ angle_t getAdvanceCorrections(float engineLoad);
 size_t getMultiSparkCount(float rpm);
 void initIgnitionAdvanceControl();
 
-class IgnitionState : public ignition_state_s {
+class IgnitionState : public ignition_controller_s {
 public:
 	floatms_t getSparkDwell(float rpm);
 };
diff --git a/firmware/controllers/algo/ignition_state.txt b/firmware/controllers/algo/ignition_controller.txt
similarity index 97%
rename from firmware/controllers/algo/ignition_state.txt
rename to firmware/controllers/algo/ignition_controller.txt
index fbe8a83adf..0d6254c0d6 100644
--- a/firmware/controllers/algo/ignition_state.txt
+++ b/firmware/controllers/algo/ignition_controller.txt
@@ -1,6 +1,6 @@
 ! "units",scale,offset, min,max, digits,category
 
-struct_no_prefix ignition_state_s
+struct_no_prefix ignition_controller_s
     float baseDwell;"Ignition: base dwell";"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@
 	floatms_t sparkDwell;@@GAUGE_COIL_DWELL_TIME@@;"ms", 1,0, 0,30, 1,@@GAUGE_CATEGORY_TIMING@@
 
diff --git a/firmware/docs_enums.mk b/firmware/docs_enums.mk
index 6ebed2d496..9f51235955 100644
--- a/firmware/docs_enums.mk
+++ b/firmware/docs_enums.mk
@@ -6,6 +6,7 @@ DOCS_ENUMS_INPUTS = \
   $(PROJECT_DIR)/controllers/engine_cycle/prime_injection.txt \
   $(PROJECT_DIR)/controllers/trigger/trigger_central.txt \
   $(PROJECT_DIR)/controllers/trigger/trigger_state.txt \
+  $(PROJECT_DIR)/controllers/algo/ignition_controller.txt \
   $(PROJECT_DIR)/controllers/actuators/idle_state.txt \
   $(PROJECT_DIR)/controllers/actuators/electronic_throttle.txt \
   $(PROJECT_DIR)/integration/LiveData.yaml \
diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml
index 4671f1e6fc..6a14f692c2 100644
--- a/firmware/integration/LiveData.yaml
+++ b/firmware/integration/LiveData.yaml
@@ -28,7 +28,7 @@ Usages:
     constexpr: "engine->fuelComputer"
     conditional_compilation: "EFI_ENGINE_CONTROL"
 
-  - name: ignition_state
+  - name: ignition_controller
     cppFileName: advance_map
     java: IgnitionState.java
     folder: controllers/algo
diff --git a/firmware/live_data_generated/ignition_state_generated.h b/firmware/live_data_generated/ignition_controller_generated.h
similarity index 95%
rename from firmware/live_data_generated/ignition_state_generated.h
rename to firmware/live_data_generated/ignition_controller_generated.h
index 948af5e14f..99a2602fc9 100644
--- a/firmware/live_data_generated/ignition_state_generated.h
+++ b/firmware/live_data_generated/ignition_controller_generated.h
@@ -1,10 +1,10 @@
-// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt
+// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt
 // by class com.rusefi.output.CHeaderConsumer
 // begin
 #pragma once
 #include "rusefi_types.h"
-// start of ignition_state_s
-struct ignition_state_s {
+// start of ignition_controller_s
+struct ignition_controller_s {
 	/**
 	 * "Ignition: base dwell"
 	 * units: ms
@@ -189,7 +189,7 @@ struct ignition_state_s {
 	offset 40 bit 31 */
 	bool unusedBit_15_31 : 1 {};
 };
-static_assert(sizeof(ignition_state_s) == 44);
+static_assert(sizeof(ignition_controller_s) == 44);
 
 // end
-// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_state.txt
+// this section was generated automatically by rusEFI tool config_definition_base-all.jar based on (unknown script) controllers/algo/ignition_controller.txt