diff --git a/firmware/config/boards/frankenso/compile_frankenso_na6.sh b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
index 3687e96e24..623883a602 100644
--- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export EXTRA_PARAMS="-DDUMMY \
  -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
- -DSHORT_BOARD_NAME=fra \
+ -DSHORT_BOARD_NAME=frankenso_na6 \
  \
  \
  \
diff --git a/firmware/config/boards/frankenso/compile_frankenso_pal.sh b/firmware/config/boards/frankenso/compile_frankenso_pal.sh
index 5ba972fb54..985955ce95 100644
--- a/firmware/config/boards/frankenso/compile_frankenso_pal.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_pal.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export EXTRA_PARAMS="-DDUMMY \
  -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
- -DSHORT_BOARD_NAME=fra \
+ -DSHORT_BOARD_NAME=frankenso_na6 \
  -DHAL_TRIGGER_USE_PAL=TRUE \
  -DEFI_VEHICLE_SPEED=FALSE \
  -DHAL_USE_ICU=FALSE \
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh
index 7fbee896f1..59ea14818b 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f4.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f4
 
 
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
index 4d03e46eba..0f31add4b2 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
-export EXTRA_PARAMS=-DHW_CHECK_MODE=TRUE -DSHORT_BOARD_NAME=mre
+export EXTRA_PARAMS=-DHW_CHECK_MODE=TRUE -DSHORT_BOARD_NAME=mre_f4
 
 export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
index 566e9ff958..120b00c160 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
-export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre
+export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre_f4
 
 export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f7.sh b/firmware/config/boards/microrusefi/compile_mre_f7.sh
index 5e766e18d8..5202e49ae0 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f7.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F7
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
 
 export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"
 
diff --git a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
index 11d55c4c75..d978a35946 100644
--- a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F7
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
 export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
 export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"
 
diff --git a/firmware/config/boards/prometheus/compile_prometheus_405.sh b/firmware/config/boards/prometheus/compile_prometheus_405.sh
index 95c2f76836..6ca1498cc3 100644
--- a/firmware/config/boards/prometheus/compile_prometheus_405.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_405.sh
@@ -4,7 +4,7 @@
 
 cd ../../..
 export PROJECT_BOARD=prometheus/f405
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_405
 
 
 sh config/boards/common_make.sh
diff --git a/firmware/config/boards/prometheus/compile_prometheus_469.sh b/firmware/config/boards/prometheus/compile_prometheus_469.sh
index cb2fb50a6a..9c4f7d5b0a 100644
--- a/firmware/config/boards/prometheus/compile_prometheus_469.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_469.sh
@@ -4,7 +4,7 @@
 
 cd ../../..
 export PROJECT_BOARD=prometheus/f469
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_469
 export USE_BOOTLOADER=yes
 
 sh config/boards/common_make.sh
diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh
index 7c1aa3dc52..b73ecf9b97 100644
--- a/firmware/config/boards/proteus/compile_proteus_f4.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f4.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F4
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f4
 
 
 
diff --git a/firmware/config/boards/proteus/compile_proteus_f7.sh b/firmware/config/boards/proteus/compile_proteus_f7.sh
index 81db1e1e7c..d66a8605b2 100644
--- a/firmware/config/boards/proteus/compile_proteus_f7.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f7.sh
@@ -4,7 +4,7 @@ cd ../../..
 
 export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F7
-export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f7
 
 export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld