diff --git a/applications/settings/system/system_settings.c b/applications/settings/system/system_settings.c
index 3a2388f2b..a204db7d6 100644
--- a/applications/settings/system/system_settings.c
+++ b/applications/settings/system/system_settings.c
@@ -139,17 +139,17 @@ static void sleep_method_changed(VariableItem* item) {
 }
 
 const char* const filename_scheme[] = {
-    "Default",
-    "Detailed",
+    "Timestamp",
+    "Simple",
 };
 
 static void filename_scheme_changed(VariableItem* item) {
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, filename_scheme[index]);
     if(index) {
-        furi_hal_rtc_set_flag(FuriHalRtcFlagDetailedFilename);
+        furi_hal_rtc_set_flag(FuriHalRtcFlagSimpleFilename);
     } else {
-        furi_hal_rtc_reset_flag(FuriHalRtcFlagDetailedFilename);
+        furi_hal_rtc_reset_flag(FuriHalRtcFlagSimpleFilename);
     }
 }
 
@@ -232,7 +232,7 @@ SystemSettings* system_settings_alloc() {
 
     item = variable_item_list_add(
         app->var_item_list, "File Naming", COUNT_OF(filename_scheme), filename_scheme_changed, app);
-    value_index = furi_hal_rtc_is_flag_set(FuriHalRtcFlagDetailedFilename) ? 1 : 0;
+    value_index = furi_hal_rtc_is_flag_set(FuriHalRtcFlagSimpleFilename) ? 1 : 0;
     variable_item_set_current_value_index(item, value_index);
     variable_item_set_current_value_text(item, filename_scheme[value_index]);
 
diff --git a/firmware/targets/furi_hal_include/furi_hal_rtc.h b/firmware/targets/furi_hal_include/furi_hal_rtc.h
index 29fb54ac4..a93bed486 100644
--- a/firmware/targets/furi_hal_include/furi_hal_rtc.h
+++ b/firmware/targets/furi_hal_include/furi_hal_rtc.h
@@ -32,7 +32,7 @@ typedef enum {
     FuriHalRtcFlagHandOrient = (1 << 4),
     FuriHalRtcFlagLegacySleep = (1 << 5),
     FuriHalRtcFlagStealthMode = (1 << 6),
-    FuriHalRtcFlagDetailedFilename = (1 << 7),
+    FuriHalRtcFlagSimpleFilename = (1 << 7),
 } FuriHalRtcFlag;
 
 typedef enum {
diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c
index 732fdfedf..4e7e96b3b 100644
--- a/lib/toolbox/name_generator.c
+++ b/lib/toolbox/name_generator.c
@@ -45,7 +45,7 @@ const char* const name_generator_right[] = {
 };
 
 void name_generator_make_auto(char* name, size_t max_name_size, const char* prefix) {
-    if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDetailedFilename)) {
+    if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagSimpleFilename)) {
         name_generator_make_detailed(name, max_name_size, prefix);
     } else {
         name_generator_make_random(name, max_name_size);