diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index ed6b399be..020ee44f1 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -51,9 +51,11 @@ void name_generator_make_auto_datetime(
     const char* prefix,
     FuriHalRtcDateTime* custom_time) {
     if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagRandomFilename)) {
-        name_generator_make_detailed_datetime(name, max_name_size, prefix, custom_time);
+        name_generator_make_detailed_datetime(
+            name, max_name_size, prefix, custom_time, xtreme_settings.file_naming_prefix_after);
     } else {
-        name_generator_make_random_prefixed(name, max_name_size, prefix);
+        name_generator_make_random_prefixed(
+            name, max_name_size, prefix, xtreme_settings.file_naming_prefix_after);
     }
 }
 
@@ -61,14 +63,18 @@ void name_generator_make_auto(char* name, size_t max_name_size, const char* pref
     name_generator_make_auto_datetime(name, max_name_size, prefix, NULL);
 }
 
-void name_generator_make_random_prefixed(char* name, size_t max_name_size, const char* prefix) {
+void name_generator_make_random_prefixed(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    bool prefix_after) {
     furi_assert(name);
     furi_assert(max_name_size);
 
     uint8_t name_generator_left_i = rand() % COUNT_OF(name_generator_left);
     uint8_t name_generator_right_i = rand() % COUNT_OF(name_generator_right);
 
-    if(xtreme_settings.file_naming_prefix_after) {
+    if(prefix_after) {
         snprintf(
             name,
             max_name_size,
@@ -93,14 +99,16 @@ void name_generator_make_random_prefixed(char* name, size_t max_name_size, const
 }
 
 void name_generator_make_random(char* name, size_t max_name_size) {
-    name_generator_make_random_prefixed(name, max_name_size, NULL);
+    name_generator_make_random_prefixed(
+        name, max_name_size, NULL, xtreme_settings.file_naming_prefix_after);
 }
 
 void name_generator_make_detailed_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time) {
+    FuriHalRtcDateTime* custom_time,
+    bool prefix_after) {
     furi_assert(name);
     furi_assert(max_name_size);
     furi_assert(prefix);
@@ -112,7 +120,7 @@ void name_generator_make_detailed_datetime(
         furi_hal_rtc_get_datetime(&dateTime);
     }
 
-    if(xtreme_settings.file_naming_prefix_after) {
+    if(prefix_after) {
         snprintf(
             name,
             max_name_size,
@@ -143,5 +151,6 @@ void name_generator_make_detailed_datetime(
 }
 
 void name_generator_make_detailed(char* name, size_t max_name_size, const char* prefix) {
-    name_generator_make_detailed_datetime(name, max_name_size, prefix, NULL);
+    name_generator_make_detailed_datetime(
+        name, max_name_size, prefix, NULL, xtreme_settings.file_naming_prefix_after);
 }
diff --git a/lib/toolbox/name_generator.h b/lib/toolbox/name_generator.h
index f5a566aea..9785d83b1 100644
--- a/lib/toolbox/name_generator.h
+++ b/lib/toolbox/name_generator.h
@@ -28,7 +28,11 @@ void name_generator_make_auto_datetime(
  * @param[in]  prefix         The prefix of the name
  */
 void name_generator_make_random(char* name, size_t max_name_size);
-void name_generator_make_random_prefixed(char* name, size_t max_name_size, const char* prefix);
+void name_generator_make_random_prefixed(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    bool prefix_after);
 
 /** Generates detailed name
  *
@@ -41,7 +45,8 @@ void name_generator_make_detailed_datetime(
     char* name,
     size_t max_name_size,
     const char* prefix,
-    FuriHalRtcDateTime* custom_time);
+    FuriHalRtcDateTime* custom_time,
+    bool prefix_after);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 5c1d310c0..67abd7bd0 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -2529,9 +2529,9 @@ Function,-,music_worker_stop,void,MusicWorker*
 Function,+,name_generator_make_auto,void,"char*, size_t, const char*"
 Function,+,name_generator_make_auto_datetime,void,"char*, size_t, const char*, FuriHalRtcDateTime*"
 Function,+,name_generator_make_detailed,void,"char*, size_t, const char*"
-Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, FuriHalRtcDateTime*"
+Function,+,name_generator_make_detailed_datetime,void,"char*, size_t, const char*, FuriHalRtcDateTime*, _Bool"
 Function,+,name_generator_make_random,void,"char*, size_t"
-Function,+,name_generator_make_random_prefixed,void,"char*, size_t, const char*"
+Function,+,name_generator_make_random_prefixed,void,"char*, size_t, const char*, _Bool"
 Function,-,nan,double,const char*
 Function,-,nanf,float,const char*
 Function,-,nanl,long double,const char*