diff --git a/applications/external/avr_isp_programmer/scenes/avr_isp_scene_input_name.c b/applications/external/avr_isp_programmer/scenes/avr_isp_scene_input_name.c
index 3394f4362..950d564ca 100644
--- a/applications/external/avr_isp_programmer/scenes/avr_isp_scene_input_name.c
+++ b/applications/external/avr_isp_programmer/scenes/avr_isp_scene_input_name.c
@@ -1,8 +1,6 @@
 #include "../avr_isp_app_i.h"
 #include <gui/modules/validators.h>
 
-#define MAX_TEXT_INPUT_LEN 22
-
 void avr_isp_scene_input_name_text_callback(void* context) {
     furi_assert(context);
 
@@ -46,7 +44,7 @@ void avr_isp_scene_input_name_on_enter(void* context) {
         avr_isp_scene_input_name_text_callback,
         app,
         app->file_name_tmp,
-        MAX_TEXT_INPUT_LEN, // buffer size
+        AVR_ISP_MAX_LEN_NAME, // buffer size
         dev_name_empty);
 
     ValidatorIsFile* validator_is_file =
diff --git a/applications/main/archive/scenes/archive_scene_delete.c b/applications/main/archive/scenes/archive_scene_delete.c
index 4a84e1c38..7dac0a9d3 100644
--- a/applications/main/archive/scenes/archive_scene_delete.c
+++ b/applications/main/archive/scenes/archive_scene_delete.c
@@ -3,7 +3,6 @@
 #include "../helpers/archive_browser.h"
 
 #define SCENE_DELETE_CUSTOM_EVENT (0UL)
-#define MAX_TEXT_INPUT_LEN 22
 
 void archive_scene_delete_widget_callback(GuiButtonType result, InputType type, void* context) {
     furi_assert(context);
diff --git a/applications/main/archive/scenes/archive_scene_new_dir.c b/applications/main/archive/scenes/archive_scene_new_dir.c
index 4d64d0ee9..235b349d2 100644
--- a/applications/main/archive/scenes/archive_scene_new_dir.c
+++ b/applications/main/archive/scenes/archive_scene_new_dir.c
@@ -9,7 +9,6 @@
 #define TAG "Archive"
 
 #define SCENE_NEW_DIR_CUSTOM_EVENT (0UL)
-#define MAX_TEXT_INPUT_LEN 22
 
 void archive_scene_new_dir_text_input_callback(void* context) {
     ArchiveApp* archive = (ArchiveApp*)context;
@@ -29,7 +28,7 @@ void archive_scene_new_dir_on_enter(void* context) {
         archive_scene_new_dir_text_input_callback,
         context,
         archive->text_store,
-        MAX_TEXT_INPUT_LEN,
+        MAX_NAME_LEN,
         false);
 
     view_dispatcher_switch_to_view(archive->view_dispatcher, ArchiveViewTextInput);
diff --git a/applications/main/archive/scenes/archive_scene_rename.c b/applications/main/archive/scenes/archive_scene_rename.c
index 8401ce1c2..eb2f95489 100644
--- a/applications/main/archive/scenes/archive_scene_rename.c
+++ b/applications/main/archive/scenes/archive_scene_rename.c
@@ -9,7 +9,6 @@
 #define TAG "Archive"
 
 #define SCENE_RENAME_CUSTOM_EVENT (0UL)
-#define MAX_TEXT_INPUT_LEN 22
 
 void archive_scene_rename_text_input_callback(void* context) {
     ArchiveApp* archive = (ArchiveApp*)context;
@@ -47,7 +46,7 @@ void archive_scene_rename_on_enter(void* context) {
         archive_scene_rename_text_input_callback,
         context,
         archive->text_store,
-        MAX_TEXT_INPUT_LEN,
+        MAX_NAME_LEN,
         false);
 
     // Init validator to show message to user that name already exist
diff --git a/applications/main/subghz/scenes/subghz_scene_save_name.c b/applications/main/subghz/scenes/subghz_scene_save_name.c
index c05d0d962..73e7b74c7 100644
--- a/applications/main/subghz/scenes/subghz_scene_save_name.c
+++ b/applications/main/subghz/scenes/subghz_scene_save_name.c
@@ -6,8 +6,6 @@
 #include <gui/modules/validators.h>
 #include <dolphin/dolphin.h>
 
-#define MAX_TEXT_INPUT_LEN 23
-
 void subghz_scene_save_name_text_input_callback(void* context) {
     furi_assert(context);
     SubGhz* subghz = context;
@@ -108,7 +106,7 @@ void subghz_scene_save_name_on_enter(void* context) {
         subghz_scene_save_name_text_input_callback,
         subghz,
         subghz->file_name_tmp,
-        MAX_TEXT_INPUT_LEN,
+        SUBGHZ_MAX_LEN_NAME,
         dev_name_empty);
 
     ValidatorIsFile* validator_is_file = validator_is_file_alloc_init(
@@ -205,4 +203,4 @@ void subghz_scene_save_name_on_exit(void* context) {
 
     // Clear view
     text_input_reset(subghz->text_input);
-}
\ No newline at end of file
+}