diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index 9f2d88403..ed6b399be 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -45,14 +45,22 @@ const char* const name_generator_right[] = {
     "stuff",
 };
 
-void name_generator_make_auto(char* name, size_t max_name_size, const char* prefix) {
+void name_generator_make_auto_datetime(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    FuriHalRtcDateTime* custom_time) {
     if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagRandomFilename)) {
-        name_generator_make_detailed(name, max_name_size, prefix);
+        name_generator_make_detailed_datetime(name, max_name_size, prefix, custom_time);
     } else {
         name_generator_make_random_prefixed(name, max_name_size, prefix);
     }
 }
 
+void name_generator_make_auto(char* name, size_t max_name_size, const char* prefix) {
+    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) {
     furi_assert(name);
     furi_assert(max_name_size);
@@ -88,13 +96,21 @@ void name_generator_make_random(char* name, size_t max_name_size) {
     name_generator_make_random_prefixed(name, max_name_size, NULL);
 }
 
-void name_generator_make_detailed(char* name, size_t max_name_size, const char* prefix) {
+void name_generator_make_detailed_datetime(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    FuriHalRtcDateTime* custom_time) {
     furi_assert(name);
     furi_assert(max_name_size);
     furi_assert(prefix);
 
     FuriHalRtcDateTime dateTime;
-    furi_hal_rtc_get_datetime(&dateTime);
+    if(custom_time) {
+        dateTime = *custom_time;
+    } else {
+        furi_hal_rtc_get_datetime(&dateTime);
+    }
 
     if(xtreme_settings.file_naming_prefix_after) {
         snprintf(
@@ -125,3 +141,7 @@ void name_generator_make_detailed(char* name, size_t max_name_size, const char*
     // Set first symbol to upper case
     if(islower((int)name[0])) name[0] = name[0] - 0x20;
 }
+
+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);
+}
diff --git a/lib/toolbox/name_generator.h b/lib/toolbox/name_generator.h
index 01b2ad1a8..f5a566aea 100644
--- a/lib/toolbox/name_generator.h
+++ b/lib/toolbox/name_generator.h
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <furi_hal_rtc.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,6 +15,11 @@ extern "C" {
  * @param[in]  prefix         The prefix of the name
  */
 void name_generator_make_auto(char* name, size_t max_name_size, const char* prefix);
+void name_generator_make_auto_datetime(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    FuriHalRtcDateTime* custom_time);
 
 /** Generates random name
  *
@@ -31,6 +37,11 @@ void name_generator_make_random_prefixed(char* name, size_t max_name_size, const
  * @param[in]  prefix         The prefix of the name
  */
 void name_generator_make_detailed(char* name, size_t max_name_size, const char* prefix);
+void name_generator_make_detailed_datetime(
+    char* name,
+    size_t max_name_size,
+    const char* prefix,
+    FuriHalRtcDateTime* custom_time);
 
 #ifdef __cplusplus
 }
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index c5aedad44..160085085 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -2524,7 +2524,9 @@ Function,-,music_worker_set_volume,void,"MusicWorker*, float"
 Function,-,music_worker_start,void,MusicWorker*
 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_random,void,"char*, size_t"
 Function,+,name_generator_make_random_prefixed,void,"char*, size_t, const char*"
 Function,-,nan,double,const char*