diff --git a/firmware/controllers/buttonshift.cpp b/firmware/controllers/buttonshift.cpp
index 83f5f9761c..5713cc8139 100644
--- a/firmware/controllers/buttonshift.cpp
+++ b/firmware/controllers/buttonshift.cpp
@@ -14,8 +14,8 @@ ButtonShiftController buttonShiftController;
 
 
 ButtonShiftController::ButtonShiftController() :
-		debounceUp("up"),
-		debounceDown("down")
+		debounceUp("gear_up"),
+		debounceDown("gear_down")
 		{
 
 }
diff --git a/firmware/controllers/sensors/allsensors.cpp b/firmware/controllers/sensors/allsensors.cpp
index 44a9e411c0..fccb6ae6a3 100644
--- a/firmware/controllers/sensors/allsensors.cpp
+++ b/firmware/controllers/sensors/allsensors.cpp
@@ -12,7 +12,7 @@
 
 EXTERN_ENGINE;
 
-ButtonDebounce acDebounce("ac");
+ButtonDebounce acDebounce("ac_switch");
 
 void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	initMapDecoder(sharedLogger PASS_ENGINE_PARAMETER_SUFFIX);
diff --git a/firmware/controllers/start_stop.cpp b/firmware/controllers/start_stop.cpp
index 9b29d2d08a..f6d5ed0e2f 100644
--- a/firmware/controllers/start_stop.cpp
+++ b/firmware/controllers/start_stop.cpp
@@ -3,7 +3,7 @@
 
 EXTERN_ENGINE;
 
-ButtonDebounce startStopButtonDebounce("start");
+ButtonDebounce startStopButtonDebounce("start_button");
 
 void initStartStopButton(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	/* startCrankingDuration is efitimesec_t, so we need to multiply it by 1000 to get milliseconds*/
diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp
index d79efc4e23..0923b9f436 100644
--- a/firmware/controllers/system/efi_gpio.cpp
+++ b/firmware/controllers/system/efi_gpio.cpp
@@ -219,6 +219,16 @@ void EnginePins::unregisterPins() {
 #endif /* EFI_PROD_CODE */
 }
 
+void EnginePins::debug() {
+#if EFI_PROD_CODE
+	RegisteredOutputPin * pin = registeredOutputHead;
+	while (pin != nullptr) {
+		scheduleMsg(logger, "%s %d", pin->registrationName, pin->currentLogicValue);
+		pin = pin->next;
+	}
+#endif // EFI_PROD_CODE
+}
+
 void EnginePins::startPins(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #if EFI_ENGINE_CONTROL
 	startInjectionPins();
@@ -564,6 +574,8 @@ void initPrimaryPins(Logging *sharedLogger) {
 	criticalErrorLedPort = getHwPort("CRITICAL", LED_CRITICAL_ERROR_BRAIN_PIN);
 	criticalErrorLedPin = getHwPin("CRITICAL", LED_CRITICAL_ERROR_BRAIN_PIN);
 	criticalErrorLedState = (LED_ERROR_BRAIN_PIN_MODE == INVERTED_OUTPUT) ? 0 : 1;
+
+	addConsoleAction("gpio_pins", EnginePins::debug);
 #endif /* EFI_PROD_CODE */
 }
 
diff --git a/firmware/controllers/system/efi_gpio.h b/firmware/controllers/system/efi_gpio.h
index 63aff8bb48..f0932226c1 100644
--- a/firmware/controllers/system/efi_gpio.h
+++ b/firmware/controllers/system/efi_gpio.h
@@ -145,8 +145,8 @@ public:
 	void init(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 	void unregister();
 	RegisteredOutputPin *next;
-private:
 	const char *registrationName;
+private:
 	short pinOffset;
 	short pinModeOffset;
 	bool isPinConfigurationChanged();
@@ -162,6 +162,7 @@ public:
 	EnginePins();
 	void startPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 	void reset();
+	static void debug();
 	bool stopPins();
 	void unregisterPins();
 	RegisteredOutputPin mainRelay;