diff --git a/firmware/config/boards/hellen/alphax-8chan/board.mk b/firmware/config/boards/hellen/alphax-8chan/board.mk
index 9787f041b2..b315a4bdf8 100644
--- a/firmware/config/boards/hellen/alphax-8chan/board.mk
+++ b/firmware/config/boards/hellen/alphax-8chan/board.mk
@@ -14,11 +14,13 @@ DDEFS += -DADC_MUX_PIN=Gpio::F2
 include $(BOARDS_DIR)/hellen/hellen-common176.mk
 
 ifeq ($(PROJECT_CPU),ARCH_STM32F7)
+  SHORT_BOARD_NAME=alphax-8chan
 	# TODO: why do I struggle to fit into flash? compare with Proteus
 	DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE
 	DDEFS += -DENABLE_PERF_TRACE=FALSE
     USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
 else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
+  SHORT_BOARD_NAME=alphax-8chan
     # This board has trigger scope hardware!
     DDEFS += -DTRIGGER_SCOPE
     # serial ports only on F4
@@ -28,7 +30,6 @@ $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
 endif
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
 
-SHORT_BOARD_NAME=alphax-8chan
 DDEFS += -DHW_HELLEN_8CHAN=1
 
 ONBOARD_MEMS_TYPE=LIS2DH12
diff --git a/firmware/config/boards/nucleo_f429/board.mk b/firmware/config/boards/nucleo_f429/board.mk
index 1ad556ea51..3aace2fbe8 100644
--- a/firmware/config/boards/nucleo_f429/board.mk
+++ b/firmware/config/boards/nucleo_f429/board.mk
@@ -13,5 +13,5 @@ IS_STM32F429 = yes
 DDEFS += -DFIRMWARE_ID=\"nucleo_f429\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429
-SHORT_BOARD_NAME=nucleo_f429
+SHORT_BOARD_NAME=stm32f429_nucleo
 DDEFS += -DRAM_UNUSED_SIZE=10000
diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk
index 52e05bb009..580c9135d7 100644
--- a/firmware/config/boards/nucleo_f767/board.mk
+++ b/firmware/config/boards/nucleo_f767/board.mk
@@ -17,4 +17,4 @@ DDEFS += -DEFI_ETHERNET=TRUE
 DDEFS += -DFIRMWARE_ID=\"nucleo_f767\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767
-SHORT_BOARD_NAME=nucleo_f767
+SHORT_BOARD_NAME=stm32f767_nucleo
diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk
index 21f71545f6..d2a6fa00ee 100644
--- a/firmware/config/boards/nucleo_h743/board.mk
+++ b/firmware/config/boards/nucleo_h743/board.mk
@@ -12,4 +12,4 @@ DDEFS += -DEFI_ETHERNET=TRUE
 DDEFS += -DFIRMWARE_ID=\"nucleo_h743\"
 DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743
-SHORT_BOARD_NAME=nucleo_h743
+SHORT_BOARD_NAME=stm32h743_nucleo
diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh
index 5cb5eb41aa..d48e317008 100755
--- a/firmware/gen_config.sh
+++ b/firmware/gen_config.sh
@@ -62,9 +62,9 @@ for BOARD in \
    "config/boards/proteus proteus_h7" \
    "config/boards/f429-discovery f429-discovery" \
    "config/boards/f469-discovery f469-discovery" \
-   "config/boards/nucleo_f413 nucleo_f413" \
-   "config/boards/nucleo_f429 nucleo_f429" \
-   "config/boards/nucleo_f767 nucleo_f767" \
+   "config/boards/nucleo_f413 stm32f413_nucleo" \
+   "config/boards/nucleo_f429 stm32f429_nucleo" \
+   "config/boards/nucleo_f767 stm32f767_nucleo" \
    "config/boards/nucleo_h743 nucleo_h743" \
    "config/boards/atlas atlas"\
    "config/boards/tdg-pdm8 tdg-pdm8"\