diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 455c18b7be..05600f7a87 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -259,7 +259,7 @@ public:
 	void reset();
 	injection_mode_e getCurrentInjectionMode(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 
-	OutputSignalPair fuelActuators[INJECTION_PIN_COUNT];
+	InjectionSignalPair fuelActuators[INJECTION_PIN_COUNT];
 	IgnitionEventList ignitionEvents;
 
 
diff --git a/firmware/controllers/algo/signal_executor.cpp b/firmware/controllers/algo/signal_executor.cpp
index 9c8ec55796..4f89f4ac56 100644
--- a/firmware/controllers/algo/signal_executor.cpp
+++ b/firmware/controllers/algo/signal_executor.cpp
@@ -41,7 +41,7 @@ extern WaveChart waveChart;
 
 #include "efiGpio.h"
 
-OutputSignalPair::OutputSignalPair() {
+InjectionSignalPair::InjectionSignalPair() {
 	isScheduled = false;
 	memset(outputs, 0, sizeof(outputs));
 	event = NULL;
diff --git a/firmware/controllers/algo/signal_executor.h b/firmware/controllers/algo/signal_executor.h
index c946f47166..afa1c1e822 100644
--- a/firmware/controllers/algo/signal_executor.h
+++ b/firmware/controllers/algo/signal_executor.h
@@ -27,9 +27,9 @@
 
 class InjectionEvent;
 
-class OutputSignalPair {
+class InjectionSignalPair {
 public:
-	OutputSignalPair();
+	InjectionSignalPair();
 	scheduling_s signalTimerUp;
 	scheduling_s signalTimerDown;
 
@@ -45,6 +45,8 @@ public:
 	InjectorOutputPin *outputs[MAX_WIRES_COUNT];
 
 	InjectionEvent *event;
+	turnPinHigh();
+	turnPinLow();
 };
 
 void initSignalExecutor(void);
diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp
index 8fc9a8937b..63ab20ea77 100644
--- a/firmware/controllers/trigger/main_trigger_callback.cpp
+++ b/firmware/controllers/trigger/main_trigger_callback.cpp
@@ -133,7 +133,7 @@ static void tempTurnPinHigh(InjectorOutputPin *output) {
 }
 
 // todo: make these macro? kind of a penny optimization if compiler is not smart to inline
-void seTurnPinHigh(OutputSignalPair *pair) {
+void seTurnPinHigh(InjectionSignalPair *pair) {
 	for (int i = 0;i<MAX_WIRES_COUNT;i++) {
 		InjectorOutputPin *output = pair->outputs[i];
 		if (output != NULL) {
@@ -181,7 +181,7 @@ static void tempTurnPinLow(InjectorOutputPin *output) {
 	output->setLow();
 }
 
-void seTurnPinLow(OutputSignalPair *pair) {
+void seTurnPinLow(InjectionSignalPair *pair) {
 	pair->isScheduled = false;
 	for (int i = 0;i<MAX_WIRES_COUNT;i++) {
 		InjectorOutputPin *output = pair->outputs[i];
@@ -197,7 +197,7 @@ void seTurnPinLow(OutputSignalPair *pair) {
 	engine->injectionEvents.addFuelEventsForCylinder(pair->event->ownIndex PASS_ENGINE_PARAMETER_SUFFIX);
 }
 
-static void seScheduleByTime(scheduling_s *scheduling, efitimeus_t time, schfunc_t callback, OutputSignalPair *pair) {
+static void seScheduleByTime(scheduling_s *scheduling, efitimeus_t time, schfunc_t callback, InjectionSignalPair *pair) {
 #if FUEL_MATH_EXTREME_LOGGING || defined(__DOXYGEN__)
 	InjectorOutputPin *param = pair->outputs[0];
 //	scheduleMsg(&sharedLogger, "schX %s %x %d", prefix, scheduling,	time);
@@ -210,7 +210,7 @@ static void seScheduleByTime(scheduling_s *scheduling, efitimeus_t time, schfunc
 	scheduleByTime(scheduling, time, callback, pair);
 }
 
-static void scheduleFuelInjection(OutputSignalPair *pair, efitimeus_t nowUs, floatus_t delayUs, floatus_t durationUs, InjectionEvent *event DECLARE_ENGINE_PARAMETER_SUFFIX) {
+static void scheduleFuelInjection(InjectionSignalPair *pair, efitimeus_t nowUs, floatus_t delayUs, floatus_t durationUs, InjectionEvent *event DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	if (durationUs < 0) {
 		warning(CUSTOM_NEGATIVE_DURATION, "duration cannot be negative: %d", durationUs);
 		return;
@@ -230,7 +230,7 @@ static void scheduleFuelInjection(OutputSignalPair *pair, efitimeus_t nowUs, flo
 #if EFI_UNIT_TEST || EFI_SIMULATOR || defined(__DOXYGEN__)
 	printf("still used1 %s %d\r\n", output->name, (int)getTimeNowUs());
 #endif /* EFI_UNIT_TEST || EFI_SIMULATOR */
-		return; // this OutputSignalPair is still needed for an extremely long injection scheduled previously
+		return; // this InjectionSignalPair is still needed for an extremely long injection scheduled previously
 	}
 	pair->outputs[0] = output;
 	pair->outputs[1] = event->outputs[1];
@@ -303,7 +303,7 @@ static ALWAYS_INLINE void handleFuelInjectionEvent(int injEventIndex, InjectionE
 			getRevolutionCounter());
 #endif /* EFI_DEFAILED_LOGGING */
 
-	OutputSignalPair *pair = &ENGINE(fuelActuators[injEventIndex]);
+	InjectionSignalPair *pair = &ENGINE(fuelActuators[injEventIndex]);
 
 	if (event->isSimultanious) {
 		/**
diff --git a/firmware/controllers/trigger/main_trigger_callback.h b/firmware/controllers/trigger/main_trigger_callback.h
index 9d1a9b79e9..e2f93008b9 100644
--- a/firmware/controllers/trigger/main_trigger_callback.h
+++ b/firmware/controllers/trigger/main_trigger_callback.h
@@ -22,8 +22,8 @@ int isIgnitionTimingError(void);
 
 void showMainHistogram(void);
 
-void seTurnPinHigh(OutputSignalPair *pair);
-void seTurnPinLow(OutputSignalPair *pair);
+void seTurnPinHigh(InjectionSignalPair *pair);
+void seTurnPinLow(InjectionSignalPair *pair);
 
 float getFuel(int rpm, float key);
 #endif /* MAIN_LOOP_H_ */
diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp
index f8424289f2..27cf9b0f72 100644
--- a/unit_tests/test_trigger_decoder.cpp
+++ b/unit_tests/test_trigger_decoder.cpp
@@ -596,7 +596,7 @@ void assertEvent(const char *msg, int index, void *callback, efitime_t start, ef
 	scheduling_s *ev = schedulingQueue.getForUnitText(index);
 	assertEqualsM4(msg, "up/down", (void*)ev->callback == (void*) callback, 1);
 	assertEqualsM(msg, momentX, ev->momentX - start);
-	OutputSignalPair *pair = (OutputSignalPair *)ev->param;
+	InjectionSignalPair *pair = (InjectionSignalPair *)ev->param;
 	assertEqualsLM(msg, param, (long)pair->outputs[0]);
 }