diff --git a/applications/debug/application.fam b/applications/debug/application.fam
index a33b3693d..c52907002 100644
--- a/applications/debug/application.fam
+++ b/applications/debug/application.fam
@@ -7,8 +7,8 @@ App(
         "vibro_test",
         "keypad_test",
         "usb_test",
-        "usb_mouse",
-        "uart_echo",
+        "USB_Mouse",
+        "UART_Echo",
         "display_test",
         "text_box_test",
         "file_browser_test",
diff --git a/applications/debug/uart_echo/application.fam b/applications/debug/uart_echo/application.fam
index 956aa17af..a979c2e4f 100644
--- a/applications/debug/uart_echo/application.fam
+++ b/applications/debug/uart_echo/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="uart_echo",
+    appid="UART_Echo",
     name="UART Echo",
     apptype=FlipperAppType.PLUGIN,
     entry_point="uart_echo_app",
diff --git a/applications/debug/usb_mouse/application.fam b/applications/debug/usb_mouse/application.fam
index 9c2f19da6..fb7595e10 100644
--- a/applications/debug/usb_mouse/application.fam
+++ b/applications/debug/usb_mouse/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="usb_mouse",
+    appid="USB_Mouse",
     name="USB Mouse",
     apptype=FlipperAppType.PLUGIN,
     entry_point="usb_mouse_app",
diff --git a/applications/plugins/arkanoid/application.fam b/applications/plugins/arkanoid/application.fam
index 99a2f10bc..05520b4bf 100644
--- a/applications/plugins/arkanoid/application.fam
+++ b/applications/plugins/arkanoid/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="arkanoid_game",
+    appid="Arkanoid",
     name="Arkanoid",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="arkanoid_game_app",
diff --git a/applications/plugins/barcode_generator/application.fam b/applications/plugins/barcode_generator/application.fam
index 05ddbae0f..0724fdfba 100644
--- a/applications/plugins/barcode_generator/application.fam
+++ b/applications/plugins/barcode_generator/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="barcode_generator",
+    appid="Barcode_Generator",
     name="UPC-A Generator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="barcode_UPCA_generator_app",
diff --git a/applications/plugins/bt_hid_app/application.fam b/applications/plugins/bt_hid_app/application.fam
index e6a3b1752..e18783e9a 100644
--- a/applications/plugins/bt_hid_app/application.fam
+++ b/applications/plugins/bt_hid_app/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="bt_hid",
+    appid="Bluetooth_Remote",
     name="Bluetooth Remote",
     apptype=FlipperAppType.PLUGIN,
     entry_point="bt_hid_app",
diff --git a/applications/plugins/doom/application.fam b/applications/plugins/doom/application.fam
index a032e14eb..d9ae4d67d 100644
--- a/applications/plugins/doom/application.fam
+++ b/applications/plugins/doom/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="game_doom",
+    appid="DOOM",
     name="DOOM",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="doom_app",
diff --git a/applications/plugins/esp8266_deauth/application.fam b/applications/plugins/esp8266_deauth/application.fam
index 8342edfba..0b305e1fb 100644
--- a/applications/plugins/esp8266_deauth/application.fam
+++ b/applications/plugins/esp8266_deauth/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="esp8266_deauth",
+    appid="ESP8266_Deauther",
     name="[ESP8266] Deauther",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="esp8266_deauth_app",
diff --git a/applications/plugins/flappy_bird/application.fam b/applications/plugins/flappy_bird/application.fam
index daee5791d..dd8c67e85 100644
--- a/applications/plugins/flappy_bird/application.fam
+++ b/applications/plugins/flappy_bird/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="game_flappybird",
+    appid="FlappyBird",
     name="Flappy Bird",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="flappy_game_app",
diff --git a/applications/plugins/flipfrid/application.fam b/applications/plugins/flipfrid/application.fam
index 77cfefbed..4a09f1064 100644
--- a/applications/plugins/flipfrid/application.fam
+++ b/applications/plugins/flipfrid/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="flipfrid",
+    appid="RFID_Fuzzer",
     name="RFID Fuzzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="flipfrid_start",
diff --git a/applications/plugins/mousejacker/application.fam b/applications/plugins/mousejacker/application.fam
index 9c71bf7a3..07ee51ae3 100644
--- a/applications/plugins/mousejacker/application.fam
+++ b/applications/plugins/mousejacker/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="mouse_jacker",
+    appid="NRF24_Mouse_Jacker",
     name="[NRF24] Mouse Jacker",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mousejacker_app",
diff --git a/applications/plugins/multi_converter/application.fam b/applications/plugins/multi_converter/application.fam
index 5da46e06b..b19bce895 100644
--- a/applications/plugins/multi_converter/application.fam
+++ b/applications/plugins/multi_converter/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="multi_converter",
+    appid="Multi_Converter",
     name="Multi Converter",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="multi_converter_app",
diff --git a/applications/plugins/music_player/application.fam b/applications/plugins/music_player/application.fam
index 30f2b9268..cfb50c451 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="music_player",
+    appid="Music_Player",
     name="Music Player",
     apptype=FlipperAppType.PLUGIN,
     entry_point="music_player_app",
diff --git a/applications/plugins/nrfsniff/application.fam b/applications/plugins/nrfsniff/application.fam
index 269f139a9..5caa945ee 100644
--- a/applications/plugins/nrfsniff/application.fam
+++ b/applications/plugins/nrfsniff/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="nrf_sniff",
+    appid="NRF24_Sniffer",
     name="[NRF24] Sniffer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="nrfsniff_app",
diff --git a/applications/plugins/picopass/application.fam b/applications/plugins/picopass/application.fam
index 7a81e0804..888ecc128 100644
--- a/applications/plugins/picopass/application.fam
+++ b/applications/plugins/picopass/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="picopass",
+    appid="Picopass",
     name="PicoPass Reader",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="picopass_app",
diff --git a/applications/plugins/playlist/application.fam b/applications/plugins/playlist/application.fam
index 991809ae3..8be27aa6c 100644
--- a/applications/plugins/playlist/application.fam
+++ b/applications/plugins/playlist/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="sub_playlist",
+    appid="SubGHz_Playlist",
     name="Sub-GHz Playlist",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="playlist_app",
diff --git a/applications/plugins/sentry_safe/application.fam b/applications/plugins/sentry_safe/application.fam
index f409e0b06..070a677ba 100644
--- a/applications/plugins/sentry_safe/application.fam
+++ b/applications/plugins/sentry_safe/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="sentry_safe",
+    appid="GPIO_Sentry_Safe",
     name="[GPIO] Sentry Safe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="sentry_safe_app",
diff --git a/applications/plugins/signal_generator/application.fam b/applications/plugins/signal_generator/application.fam
index 7794ee492..c2bb097a4 100644
--- a/applications/plugins/signal_generator/application.fam
+++ b/applications/plugins/signal_generator/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="signal_generator",
+    appid="Signal_Generator",
     name="Signal Generator",
     apptype=FlipperAppType.PLUGIN,
     entry_point="signal_gen_app",
diff --git a/applications/plugins/snake_game/application.fam b/applications/plugins/snake_game/application.fam
index d55f53bb1..abf4f72c5 100644
--- a/applications/plugins/snake_game/application.fam
+++ b/applications/plugins/snake_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="snake_game",
+    appid="Snake",
     name="Snake Game",
     apptype=FlipperAppType.PLUGIN,
     entry_point="snake_game_app",
diff --git a/applications/plugins/spectrum_analyzer/application.fam b/applications/plugins/spectrum_analyzer/application.fam
index 5028c999b..04bb946ee 100644
--- a/applications/plugins/spectrum_analyzer/application.fam
+++ b/applications/plugins/spectrum_analyzer/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="spectrum_analyzer",
+    appid="Spectrum_Analyzer",
     name="Spectrum Analyzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="spectrum_analyzer_app",
diff --git a/applications/plugins/subbrute/application.fam b/applications/plugins/subbrute/application.fam
index 1afdc539f..5e9dd9c8d 100644
--- a/applications/plugins/subbrute/application.fam
+++ b/applications/plugins/subbrute/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="subbrute",
+    appid="SubGHz_Bruteforcer",
     name="Sub-GHz Bruteforcer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="subbrute_app",
diff --git a/applications/plugins/tetris_game/application.fam b/applications/plugins/tetris_game/application.fam
index 9a298a3d5..69dda3297 100644
--- a/applications/plugins/tetris_game/application.fam
+++ b/applications/plugins/tetris_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="tetris_game",
+    appid="Tetris",
     name="Tetris",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tetris_game_app",
diff --git a/applications/plugins/tictactoe_game/application.fam b/applications/plugins/tictactoe_game/application.fam
index 289f4f88d..2e769417e 100644
--- a/applications/plugins/tictactoe_game/application.fam
+++ b/applications/plugins/tictactoe_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="tictactoe_game",
+    appid="TicTacToe",
     name="Tic Tac Toe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tictactoe_game_app",
diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam
index 4e8d81ab2..394e45d29 100644
--- a/applications/plugins/wav_player/application.fam
+++ b/applications/plugins/wav_player/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="wav_player",
+    appid="WAV_Player",
     name="WAV Player",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wav_player_app",
diff --git a/applications/plugins/wifi_marauder_companion/application.fam b/applications/plugins/wifi_marauder_companion/application.fam
index 0548905d9..e3185d50a 100644
--- a/applications/plugins/wifi_marauder_companion/application.fam
+++ b/applications/plugins/wifi_marauder_companion/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="wifi_marauder",
+    appid="ESP32_WiFi_Marauder",
     name="[ESP32] WiFi Marauder",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
diff --git a/applications/plugins/wifi_scanner/application.fam b/applications/plugins/wifi_scanner/application.fam
index 22ca79673..dc229efc0 100644
--- a/applications/plugins/wifi_scanner/application.fam
+++ b/applications/plugins/wifi_scanner/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="wifi_scanner",
+    appid="WiFi_Scanner",
     name="[WiFi] Scanner",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_scanner_app",
diff --git a/applications/plugins/zombiez/application.fam b/applications/plugins/zombiez/application.fam
index 14cad08ce..3245187d2 100644
--- a/applications/plugins/zombiez/application.fam
+++ b/applications/plugins/zombiez/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="game_zombiez",
+    appid="Zombiez",
     name="Zombiez",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="zombiez_game_app",
diff --git a/applications/services/desktop/scenes/desktop_scene_main.c b/applications/services/desktop/scenes/desktop_scene_main.c
index dc9ac04d0..c66ada158 100644
--- a/applications/services/desktop/scenes/desktop_scene_main.c
+++ b/applications/services/desktop/scenes/desktop_scene_main.c
@@ -165,8 +165,8 @@ bool desktop_scene_main_on_event(void* context, SceneManagerEvent event) {
             break;
         }
         case DesktopMainEventOpenGameMenu: {
-            LoaderStatus status = loader_start(
-                desktop->loader, "Applications", EXT_PATH("/apps/Games/snake_game.fap"));
+            LoaderStatus status =
+                loader_start(desktop->loader, "Applications", EXT_PATH("/apps/Games/Snake.fap"));
             if(status != LoaderStatusOk) {
                 FURI_LOG_E(TAG, "loader_start failed: %d", status);
             }