diff --git a/applications/external/totp/workers/bt_type_code/bt_type_code.h b/applications/external/totp/workers/bt_type_code/bt_type_code.h
index edbe52e14..3b25c03f4 100644
--- a/applications/external/totp/workers/bt_type_code/bt_type_code.h
+++ b/applications/external/totp/workers/bt_type_code/bt_type_code.h
@@ -7,7 +7,7 @@
 #include "../../features_config.h"
 
 #if TOTP_TARGET_FIRMWARE == TOTP_FIRMWARE_XTREME
-#define TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN 18
+#define TOTP_BT_WORKER_BT_ADV_NAME_MAX_LEN FURI_HAL_BT_ADV_NAME_LENGTH
 #define TOTP_BT_WORKER_BT_MAC_ADDRESS_LEN GAP_MAC_ADDR_SIZE
 #endif
 
@@ -46,4 +46,4 @@ void totp_bt_type_code_worker_stop(TotpBtTypeCodeWorkerContext* context);
 void totp_bt_type_code_worker_notify(
     TotpBtTypeCodeWorkerContext* context,
     TotpBtTypeCodeWorkerEvent event,
-    uint8_t flags);
\ No newline at end of file
+    uint8_t flags);
diff --git a/applications/main/bad_kb/bad_kb_app.h b/applications/main/bad_kb/bad_kb_app.h
index 2b8cf1f46..2da40a21f 100644
--- a/applications/main/bad_kb/bad_kb_app.h
+++ b/applications/main/bad_kb/bad_kb_app.h
@@ -21,8 +21,8 @@
 #define BAD_KB_APP_SCRIPT_EXTENSION ".txt"
 #define BAD_KB_APP_LAYOUT_EXTENSION ".kl"
 
-#define BAD_KB_MAC_ADDRESS_LEN 6 // need replace with MAC size maccro
-#define BAD_KB_ADV_NAME_MAX_LEN 18
+#define BAD_KB_ADV_NAME_MAX_LEN FURI_HAL_BT_ADV_NAME_LENGTH
+#define BAD_KB_MAC_ADDRESS_LEN GAP_MAC_ADDR_SIZE
 
 typedef enum {
     BadKbAppErrorNoFiles,
diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index e5f561ec6..9cb9f1b24 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -402,7 +402,7 @@ void bt_set_profile_adv_name(Bt* bt, const char* fmt, ...) {
     furi_assert(bt);
     furi_assert(fmt);
 
-    char name[FURI_HAL_VERSION_DEVICE_NAME_LENGTH];
+    char name[FURI_HAL_BT_ADV_NAME_LENGTH];
     va_list args;
     va_start(args, fmt);
     vsnprintf(name, sizeof(name), fmt, args);
diff --git a/firmware/targets/f7/api_symbols.csv b/firmware/targets/f7/api_symbols.csv
index 51174ab95..713b4e418 100644
--- a/firmware/targets/f7/api_symbols.csv
+++ b/firmware/targets/f7/api_symbols.csv
@@ -1124,7 +1124,7 @@ Function,+,furi_hal_bt_serial_start,void,
 Function,+,furi_hal_bt_serial_stop,void,
 Function,+,furi_hal_bt_serial_tx,_Bool,"uint8_t*, uint16_t"
 Function,+,furi_hal_bt_set_key_storage_change_callback,void,"BleGlueKeyStorageChangedCallback, void*"
-Function,+,furi_hal_bt_set_profile_adv_name,void,"FuriHalBtProfile, const char[( 1 + ( 8 + 1 ) ) + 9 - 1]"
+Function,+,furi_hal_bt_set_profile_adv_name,void,"FuriHalBtProfile, const char[( 18 + 1 )]"
 Function,+,furi_hal_bt_set_profile_mac_addr,void,"FuriHalBtProfile, const uint8_t[( 6 )]"
 Function,+,furi_hal_bt_set_profile_pairing_method,void,"FuriHalBtProfile, GapPairing"
 Function,+,furi_hal_bt_start_advertising,void,
diff --git a/firmware/targets/f7/furi_hal/furi_hal_bt.c b/firmware/targets/f7/furi_hal/furi_hal_bt.c
index bf8ca0316..737308452 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_bt.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_bt.c
@@ -477,7 +477,7 @@ bool furi_hal_bt_ensure_c2_mode(BleGlueC2Mode mode) {
 
 void furi_hal_bt_set_profile_adv_name(
     FuriHalBtProfile profile,
-    const char name[FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1]) {
+    const char name[FURI_HAL_BT_ADV_NAME_LENGTH]) {
     furi_assert(profile < FuriHalBtProfileNumber);
     furi_assert(name);
 
@@ -491,7 +491,7 @@ void furi_hal_bt_set_profile_adv_name(
         memcpy(
             &(profile_config[profile].config.adv_name[1]),
             name,
-            FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1);
+            FURI_HAL_BT_ADV_NAME_LENGTH);
     }
 }
 
diff --git a/firmware/targets/furi_hal_include/furi_hal_bt.h b/firmware/targets/furi_hal_include/furi_hal_bt.h
index d717d346d..24817b552 100644
--- a/firmware/targets/furi_hal_include/furi_hal_bt.h
+++ b/firmware/targets/furi_hal_include/furi_hal_bt.h
@@ -230,7 +230,7 @@ bool furi_hal_bt_ensure_c2_mode(BleGlueC2Mode mode);
 */
 void furi_hal_bt_set_profile_adv_name(
     FuriHalBtProfile profile,
-    const char name[FURI_HAL_VERSION_DEVICE_NAME_LENGTH - 1]);
+    const char name[FURI_HAL_BT_ADV_NAME_LENGTH]);
 
 const char* furi_hal_bt_get_profile_adv_name(FuriHalBtProfile profile);
 
diff --git a/firmware/targets/furi_hal_include/furi_hal_version.h b/firmware/targets/furi_hal_include/furi_hal_version.h
index b81602029..2ff6730f6 100644
--- a/firmware/targets/furi_hal_include/furi_hal_version.h
+++ b/firmware/targets/furi_hal_include/furi_hal_version.h
@@ -16,9 +16,9 @@ extern "C" {
 
 #define FURI_HAL_VERSION_NAME_LENGTH 8
 #define FURI_HAL_VERSION_ARRAY_NAME_LENGTH (FURI_HAL_VERSION_NAME_LENGTH + 1)
-/** BLE symbol + name */
+#define FURI_HAL_BT_ADV_NAME_LENGTH (18 + 1) // 18 characters + null terminator
 #define FURI_HAL_VERSION_DEVICE_NAME_LENGTH \
-    (1 + FURI_HAL_VERSION_ARRAY_NAME_LENGTH) + 9 // for bad kb custom name
+    (1 + FURI_HAL_BT_ADV_NAME_LENGTH) // Used for custom BT name, BLE symbol + name
 
 /** OTP Versions enum */
 typedef enum {