diff --git a/applications/main/clock_app/clock_app.c b/applications/main/clock_app/clock_app.c
index 4fa80c948..1a58996fd 100644
--- a/applications/main/clock_app/clock_app.c
+++ b/applications/main/clock_app/clock_app.c
@@ -202,7 +202,7 @@ const NotificationSequence clock_alert_startStop = {
 
 static void desktop_view_main_dumbmode_changed(DesktopSettings* settings) {
     settings->is_dumbmode = !settings->is_dumbmode;
-    SAVE_DESKTOP_SETTINGS(settings);
+    DESKTOP_SETTINGS_SAVE(settings);
 }
 
 static void clock_input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
@@ -345,7 +345,7 @@ int32_t clock_app(void* p) {
         free(plugin_state);
         return 255;
     }
-    LOAD_DESKTOP_SETTINGS(plugin_state->desktop_settings);
+    DESKTOP_SETTINGS_LOAD(plugin_state->desktop_settings);
     // Set system callbacks
     ViewPort* view_port = view_port_alloc();
     view_port_draw_callback_set(view_port, clock_render_callback, plugin_state);
diff --git a/applications/plugins/dice/dice.c b/applications/plugins/dice/dice.c
index 4a3913977..0b1e33488 100644
--- a/applications/plugins/dice/dice.c
+++ b/applications/plugins/dice/dice.c
@@ -435,7 +435,7 @@ int32_t dice_app(void* p) {
         return 255;
     }
 
-    LOAD_DESKTOP_SETTINGS(plugin_state->desktop_settings);
+    DESKTOP_SETTINGS_LOAD(plugin_state->desktop_settings);
 
     ViewPort* view_port = view_port_alloc();
     view_port_draw_callback_set(view_port, dice_render_callback, plugin_state);
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
index f000e1fb7..c025d80c7 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -10,7 +10,7 @@
 
 static void desktop_view_lock_menu_dumbmode_changed(bool isThisGameMode) {
     DesktopSettingsApp* app = malloc(sizeof(DesktopSettingsApp));
-    LOAD_DESKTOP_SETTINGS(&app->settings);
+    DESKTOP_SETTINGS_LOAD(&app->settings);
     app->settings.is_dumbmode = isThisGameMode;
     DESKTOP_SETTINGS_SAVE(&app->settings);
 }
diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c
index 845679283..c3a568982 100644
--- a/applications/services/desktop/views/desktop_view_main.c
+++ b/applications/services/desktop/views/desktop_view_main.c
@@ -55,7 +55,7 @@ bool desktop_main_input_callback(InputEvent* event, void* context) {
     if(event->type == InputTypeShort || event->type == InputTypeLong) {
         main_view->is_gamemode = false;
         DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings));
-        LOAD_DESKTOP_SETTINGS(desktop_settings);
+        DESKTOP_SETTINGS_LOAD(desktop_settings);
         if(desktop_settings->is_dumbmode) main_view->is_gamemode = true;
         free(desktop_settings);
     }
@@ -145,7 +145,7 @@ DesktopMainView* desktop_main_alloc() {
     DesktopMainView* main_view = malloc(sizeof(DesktopMainView));
     main_view->is_gamemode = false;
     DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings));
-    LOAD_DESKTOP_SETTINGS(desktop_settings);
+    DESKTOP_SETTINGS_LOAD(desktop_settings);
     if(desktop_settings->is_dumbmode) main_view->is_gamemode = true;
     free(desktop_settings);
 
diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c
index 22e75cd5d..ede818bd5 100644
--- a/applications/settings/dolphin_passport/passport.c
+++ b/applications/settings/dolphin_passport/passport.c
@@ -63,7 +63,7 @@ static void input_callback(InputEvent* input, void* ctx) {
 static void render_callback(Canvas* canvas, void* ctx) {
     DolphinStats* stats = ctx;
     DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings));
-    LOAD_DESKTOP_SETTINGS(desktop_settings);
+    DESKTOP_SETTINGS_LOAD(desktop_settings);
 
     char level_str[12];
     char xp_str[12];