diff --git a/firmware/console/tooth_logger.cpp b/firmware/console/binary/tooth_logger.cpp
similarity index 100%
rename from firmware/console/tooth_logger.cpp
rename to firmware/console/binary/tooth_logger.cpp
diff --git a/firmware/console/tooth_logger.h b/firmware/console/binary/tooth_logger.h
similarity index 100%
rename from firmware/console/tooth_logger.h
rename to firmware/console/binary/tooth_logger.h
diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp
index 6809ccc5dc..bb3e016e07 100644
--- a/firmware/console/binary/tunerstudio.cpp
+++ b/firmware/console/binary/tunerstudio.cpp
@@ -476,8 +476,8 @@ static bool isKnownCommand(char command) {
 			|| command == TS_IO_TEST_COMMAND
 			|| command == TS_GET_STRUCT
 			|| command == TS_GET_FILE_RANGE
-			|| command == TS_SET_LOGGER_MODE
-			|| command == TS_GET_LOGGER_BUFFER
+			|| command == TS_SET_LOGGER_SWITCH
+			|| command == TS_GET_LOGGER_GET_BUFFER
 			|| command == TS_GET_TEXT
 			|| command == TS_CRC_CHECK_COMMAND
 			|| command == TS_GET_FIRMWARE_VERSION
@@ -826,7 +826,7 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
 		}
 		break;
 #if EFI_TOOTH_LOGGER
-	case TS_SET_LOGGER_MODE:
+	case TS_SET_LOGGER_SWITCH:
 		switch(data[0]) {
 		case 0x01:
 			EnableToothLogger();
@@ -842,7 +842,7 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin
 		sendOkResponse(tsChannel, TS_CRC);
 
 		break;
-	case TS_GET_LOGGER_BUFFER:
+	case TS_GET_LOGGER_GET_BUFFER:
 		{
 			auto toothBuffer = GetToothLoggerBuffer();
 			sr5SendResponse(tsChannel, TS_CRC, toothBuffer.Buffer, toothBuffer.Length);
diff --git a/firmware/console/binary/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h
index 92ffc52de1..47d4214900 100644
--- a/firmware/console/binary/tunerstudio_io.h
+++ b/firmware/console/binary/tunerstudio_io.h
@@ -71,8 +71,8 @@ typedef struct {
 #define TS_GET_CONFIG_ERROR 'e' // returns getFirmwareError(), works together with ind_hasFatalError
 
 // High speed logger commands
-#define TS_SET_LOGGER_MODE   'l'
-#define TS_GET_LOGGER_BUFFER 'L'
+#define TS_SET_LOGGER_SWITCH   'l'
+#define TS_GET_LOGGER_GET_BUFFER 'L'
 
 // Performance tracing
 #define TS_PERF_TRACE_BEGIN 'r'
diff --git a/firmware/console/console.mk b/firmware/console/console.mk
index b8c0c57f6b..f0df04957d 100644
--- a/firmware/console/console.mk
+++ b/firmware/console/console.mk
@@ -4,7 +4,7 @@ CONSOLESRC =
 CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \
 	$(PROJECT_DIR)/console/console_io.cpp \
 	$(PROJECT_DIR)/console/eficonsole.cpp \
-	$(PROJECT_DIR)/console/tooth_logger.cpp \
+	$(PROJECT_DIR)/console/binary_log/tooth_logger.cpp \
 	$(PROJECT_DIR)/console/binary_log/log_field.cpp \
 	$(PROJECT_DIR)/console/binary_log/binary_logging.cpp \