From 438b9840000a2e83da882ab844e71349e269302f Mon Sep 17 00:00:00 2001
From: RogueMaster <anifan115@gmail.com>
Date: Mon, 19 Sep 2022 18:13:50 -0400
Subject: [PATCH] apps renamed

---
 ReadMe.md                                                    | 2 ++
 applications/plugins/arkanoid/application.fam                | 2 +-
 applications/plugins/barcode_generator/application.fam       | 2 +-
 applications/plugins/bpm-tapper/application.fam              | 2 +-
 applications/plugins/bt_hid_app/application.fam              | 2 +-
 applications/plugins/calculator/application.fam              | 2 +-
 applications/plugins/chess/application.fam                   | 4 ++--
 applications/plugins/dice/application.fam                    | 2 +-
 applications/plugins/dolphinbackup/application.fam           | 2 +-
 applications/plugins/dolphinrestorer/application.fam         | 2 +-
 applications/plugins/doom/application.fam                    | 2 +-
 applications/plugins/esp8266_deauth/application.fam          | 2 +-
 applications/plugins/flappy_bird/application.fam             | 2 +-
 applications/plugins/flipfrid/application.fam                | 2 +-
 applications/plugins/game2048/application.fam                | 2 +-
 applications/plugins/game_of_life/application.fam            | 2 +-
 applications/plugins/mandelbrot/application.fam              | 2 +-
 applications/plugins/metronome/application.fam               | 2 +-
 applications/plugins/montyhall/application.fam               | 2 +-
 applications/plugins/mouse_jiggler/application.fam           | 2 +-
 applications/plugins/mousejacker/application.fam             | 2 +-
 applications/plugins/multi_converter/application.fam         | 2 +-
 applications/plugins/music_player/application.fam            | 2 +-
 applications/plugins/nrfsniff/application.fam                | 2 +-
 applications/plugins/paint/application.fam                   | 2 +-
 applications/plugins/picopass/application.fam                | 2 +-
 applications/plugins/playlist/application.fam                | 2 +-
 applications/plugins/sentry_safe/application.fam             | 2 +-
 applications/plugins/snake_game/application.fam              | 2 +-
 applications/plugins/subbrute/application.fam                | 2 +-
 applications/plugins/tama_p1/application.fam                 | 2 +-
 applications/plugins/tanksgame/application.fam               | 4 ++--
 applications/plugins/tetris_game/application.fam             | 2 +-
 applications/plugins/tictactoe_game/application.fam          | 2 +-
 applications/plugins/videopoker/application.fam              | 2 +-
 applications/plugins/wav_player/application.fam              | 2 +-
 applications/plugins/wifi_deauther/application.fam           | 2 +-
 applications/plugins/wifi_marauder_companion/application.fam | 2 +-
 applications/plugins/wifi_scanner/application.fam            | 2 +-
 applications/plugins/zombiez/application.fam                 | 2 +-
 40 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/ReadMe.md b/ReadMe.md
index 6e82228ba..05703392d 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -12,6 +12,7 @@
 - Known Issues:	 `Chess`, `Tanks` & `Chip8` (No Controls)
 - Last Synched changes from [Unleashed/xMasterX](https://github.com/Eng1n33r/flipperzero-firmware) in [changelog](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/CHANGELOG.md): `2022-09-19 20:45 GMT`
 - To avoid Application errors and duplicates, delete /ext/apps before doing the RM firmware update
+- Archive: FAPs are now launchable from Archive [By RogueMaster], thanks @xMasterX for the suggestion
 
 <details>
   <summary><B>TO DO</b></summary><br/>
@@ -86,6 +87,7 @@ $ ./fbt plugin_dist FIRMWARE_APP_SET=ext_apps
 - Animations: Idle animations will show all animations regardless of level and butthurt [Thanks to qqMajiKpp]
 - Animations: RM FW Update image [(Thanks to E_Surge)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/pull/257)
 - Animations: SubGHZ Scanning image with Pikachu [Thanks to Panzer00Z](https://github.com/Panzer00Z/flipperzero-firmware/blob/3a548ea9bb181c9348d8afb427890c411456134e/assets/icons/SubGhz/Scanning_123x52.png)
+- Archive: FAPs are now launchable from Archive [By RogueMaster], thanks xMasterX for the suggestion
 - Assets: Includes a NFC Level 50 Gan0n Amiibo
 - Assets: Includes a NFC Rick Roll link
 - Assets: Includes New Dolphin Animations: [Rick Roll, Matrix & Swim animations (By qqMajiKpp)], [Rukamon 2x and Agumon animations (By Syrius)], [Mew (By Arkaivos)], [Eye of the Flipper (By Kuronons)], [Shodan (By qqMajiKpp)], [Sirene & The Witch (By Haseo)], [Dino & A New Hope (By Haseo)], [Earth Arcadia (By Kuronons)], [Kuronons Black Flags Collection (21 Animations)(By Kuronons)], [D.Va (By Haseo)], [GITS (By Haseo)], [Slayers (By qqMajiKpp)], [P0liwhirl (By Panzer00Z)], [RogueMaster CFW Animation (By Kuronons)], [Nyan Cat (By Haseo)], [L (By Kuronons)], [Laughing Man (By Kuronons)], [B0ws3r (By Haseo)], [Kuronons Black Flags Collection VOL 2 (9 Animations)(By Kuronons)], [Thanks for all the fish (By qqMajiKpp)], [OCP, Skynet and Weyland (By Kuronons)], [Mario (By Haseo)], [Umbrella (By Haseo)], [Trioptimum (By qqMajiKpp)], [Tyrell & Cyberdyne (By Kuronons)], [Allen & Maha (By Haseo)], [Starfield (By qqMajiKpp)], [DJ (By ut1s)] & [Fireplace (By Friend of xMasterX)]
diff --git a/applications/plugins/arkanoid/application.fam b/applications/plugins/arkanoid/application.fam
index a7ec11724..bc202ff00 100644
--- a/applications/plugins/arkanoid/application.fam
+++ b/applications/plugins/arkanoid/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_Arkanoid",
+    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 2f2e67548..043d653b1 100644
--- a/applications/plugins/barcode_generator/application.fam
+++ b/applications/plugins/barcode_generator/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_UPC_Generator",
+    appid="UPC_Generator",
     name="UPC-A Generator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="barcode_UPCA_generator_app",
diff --git a/applications/plugins/bpm-tapper/application.fam b/applications/plugins/bpm-tapper/application.fam
index 7f80ea391..70cd3da84 100644
--- a/applications/plugins/bpm-tapper/application.fam
+++ b/applications/plugins/bpm-tapper/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="bpm_tapper",
+    appid="BPM_Tapper",
     name="BPM Tapper",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="bpm_tapper_app",
diff --git a/applications/plugins/bt_hid_app/application.fam b/applications/plugins/bt_hid_app/application.fam
index cc888e861..29e8b5ad3 100644
--- a/applications/plugins/bt_hid_app/application.fam
+++ b/applications/plugins/bt_hid_app/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_BluetoothRemote",
+    appid="BluetoothRemote",
     name="Bluetooth Remote",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="bt_hid_app",
diff --git a/applications/plugins/calculator/application.fam b/applications/plugins/calculator/application.fam
index 0fe98bc7b..ac78af7a5 100644
--- a/applications/plugins/calculator/application.fam
+++ b/applications/plugins/calculator/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Calculator",
+    appid="Calculator",
     name="Calculator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="calculator_app",
diff --git a/applications/plugins/chess/application.fam b/applications/plugins/chess/application.fam
index 14c286593..7bf1d30e6 100644
--- a/applications/plugins/chess/application.fam
+++ b/applications/plugins/chess/application.fam
@@ -1,12 +1,12 @@
 App(
-    appid="GAME_Chess",
+    appid="zBroken_Chess",
     name="Chess",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="chess_app",
     cdefines=["APP_CHESS"],
     requires=["storage","gui"],
     stack_size= 4 * 1024,
-    order=50,
+    order=500,
     fap_icon="chessIcon.png",
     fap_category="Games",
 )
diff --git a/applications/plugins/dice/application.fam b/applications/plugins/dice/application.fam
index 19e95132b..83cd02032 100644
--- a/applications/plugins/dice/application.fam
+++ b/applications/plugins/dice/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_Dice",
+    appid="Dice",
     name="Dice",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="dice_app",
diff --git a/applications/plugins/dolphinbackup/application.fam b/applications/plugins/dolphinbackup/application.fam
index 2e16f5f8e..024c1b197 100644
--- a/applications/plugins/dolphinbackup/application.fam
+++ b/applications/plugins/dolphinbackup/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_DolphinBackup",
+    appid="DolphinBackup",
     name="Dolphin Backup",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="storage_DolphinBackup_app",
diff --git a/applications/plugins/dolphinrestorer/application.fam b/applications/plugins/dolphinrestorer/application.fam
index d293fa90c..46699404a 100644
--- a/applications/plugins/dolphinrestorer/application.fam
+++ b/applications/plugins/dolphinrestorer/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_DolphinRestorer",
+    appid="DolphinRestorer",
     name="Dolphin Restorer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="drestorer_app",
diff --git a/applications/plugins/doom/application.fam b/applications/plugins/doom/application.fam
index f6e08d85a..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 9f6e35ff2..ee70cfa8f 100644
--- a/applications/plugins/esp8266_deauth/application.fam
+++ b/applications/plugins/esp8266_deauth/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_ESP8266_Deauth",
+    appid="ESP8266_Deauth",
     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 fb4ce70bb..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 5ada80014..2edb3172f 100644
--- a/applications/plugins/flipfrid/application.fam
+++ b/applications/plugins/flipfrid/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_RFID_Fuzzer",
+    appid="RFID_Fuzzer",
     name="RFID Fuzzer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="flipfrid_start",
diff --git a/applications/plugins/game2048/application.fam b/applications/plugins/game2048/application.fam
index 428becffc..a08cf7e1f 100644
--- a/applications/plugins/game2048/application.fam
+++ b/applications/plugins/game2048/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_2048",
+    appid="2048",
     name="2048",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="game_2048_app",
diff --git a/applications/plugins/game_of_life/application.fam b/applications/plugins/game_of_life/application.fam
index 306373524..55e244d22 100644
--- a/applications/plugins/game_of_life/application.fam
+++ b/applications/plugins/game_of_life/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_GameOfLife",
+    appid="GameOfLife",
     name="Game of Life",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="game_of_life_app",
diff --git a/applications/plugins/mandelbrot/application.fam b/applications/plugins/mandelbrot/application.fam
index 5f583f1da..773835fe5 100644
--- a/applications/plugins/mandelbrot/application.fam
+++ b/applications/plugins/mandelbrot/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_MandelbrotSet",
+    appid="MandelbrotSet",
     name="Mandelbrot Set",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mandelbrot_app",
diff --git a/applications/plugins/metronome/application.fam b/applications/plugins/metronome/application.fam
index 5cabe2a94..c58cf881c 100644
--- a/applications/plugins/metronome/application.fam
+++ b/applications/plugins/metronome/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="metronome",
+    appid="Metronome",
     name="Metronome",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="metronome_app",
diff --git a/applications/plugins/montyhall/application.fam b/applications/plugins/montyhall/application.fam
index 8b5868765..66d082853 100644
--- a/applications/plugins/montyhall/application.fam
+++ b/applications/plugins/montyhall/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_MontyHall",
+    appid="MontyHall",
     name="Monty Hall",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="montyhall_game_app",
diff --git a/applications/plugins/mouse_jiggler/application.fam b/applications/plugins/mouse_jiggler/application.fam
index f11853b97..cee138495 100644
--- a/applications/plugins/mouse_jiggler/application.fam
+++ b/applications/plugins/mouse_jiggler/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_MouseJiggler",
+    appid="MouseJiggler",
     name="Mouse Jiggler",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="mouse_jiggler_app",
diff --git a/applications/plugins/mousejacker/application.fam b/applications/plugins/mousejacker/application.fam
index b322cf02d..ad861e915 100644
--- a/applications/plugins/mousejacker/application.fam
+++ b/applications/plugins/mousejacker/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Mouse_Jacker",
+    appid="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 cb2b4f143..e0abe3ed4 100644
--- a/applications/plugins/multi_converter/application.fam
+++ b/applications/plugins/multi_converter/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_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 2517dc475..5a13a31ac 100644
--- a/applications/plugins/music_player/application.fam
+++ b/applications/plugins/music_player/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Music_Player",
+    appid="Music_Player",
     name="Music Player",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="music_player_app",
diff --git a/applications/plugins/nrfsniff/application.fam b/applications/plugins/nrfsniff/application.fam
index 61bd0dfed..a6ced9cf0 100644
--- a/applications/plugins/nrfsniff/application.fam
+++ b/applications/plugins/nrfsniff/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_NRF_Sniff",
+    appid="NRF_Sniff",
     name="[NRF24] Sniffer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="nrfsniff_app",
diff --git a/applications/plugins/paint/application.fam b/applications/plugins/paint/application.fam
index 798435cf6..0630abbce 100644
--- a/applications/plugins/paint/application.fam
+++ b/applications/plugins/paint/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Paint",
+    appid="Paint",
     name="Paint",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="paint_app",
diff --git a/applications/plugins/picopass/application.fam b/applications/plugins/picopass/application.fam
index c6f635270..1a1c9997a 100644
--- a/applications/plugins/picopass/application.fam
+++ b/applications/plugins/picopass/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_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 96c6e84ec..d01c82458 100644
--- a/applications/plugins/playlist/application.fam
+++ b/applications/plugins/playlist/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Sub_Playlist",
+    appid="SubPlaylist",
     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 915abf52f..2eb43f4aa 100644
--- a/applications/plugins/sentry_safe/application.fam
+++ b/applications/plugins/sentry_safe/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_GPIO_Sentry_Safe",
+    appid="GPIO_Sentry_Safe",
     name="[GPIO] Sentry Safe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="sentry_safe_app",
diff --git a/applications/plugins/snake_game/application.fam b/applications/plugins/snake_game/application.fam
index 25b699101..573f5c0b3 100644
--- a/applications/plugins/snake_game/application.fam
+++ b/applications/plugins/snake_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_Snake",
+    appid="Snake",
     name="Snake Game",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="snake_game_app",
diff --git a/applications/plugins/subbrute/application.fam b/applications/plugins/subbrute/application.fam
index 6b4f80ccf..be9891a8c 100644
--- a/applications/plugins/subbrute/application.fam
+++ b/applications/plugins/subbrute/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Subbrute",
+    appid="SubBruteforcer",
     name="Sub-GHz Bruteforcer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="subbrute_start",
diff --git a/applications/plugins/tama_p1/application.fam b/applications/plugins/tama_p1/application.fam
index 075a1e118..6059f8ed0 100644
--- a/applications/plugins/tama_p1/application.fam
+++ b/applications/plugins/tama_p1/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_TAMA_P1",
+    appid="TAMA_P1",
     name="TAMA P1",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tama_p1_app",
diff --git a/applications/plugins/tanksgame/application.fam b/applications/plugins/tanksgame/application.fam
index 8998d626f..30de63870 100644
--- a/applications/plugins/tanksgame/application.fam
+++ b/applications/plugins/tanksgame/application.fam
@@ -1,12 +1,12 @@
 App(
-    appid="GAME_Tanks",
+    appid="zBroken_Tanks",
     name="Tanks",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tanks_game_app",
     cdefines=["APP_TANKS_GAME"],
     requires=["gui", "subghz"],
     stack_size=4 * 1024,
-    order=230,
+    order=730,
     fap_icon="tanksIcon.png",
     fap_category="Games",
 )
diff --git a/applications/plugins/tetris_game/application.fam b/applications/plugins/tetris_game/application.fam
index 810c46519..52f5588cb 100644
--- a/applications/plugins/tetris_game/application.fam
+++ b/applications/plugins/tetris_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_Tetris",
+    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 c3996a43d..2ad09f11b 100644
--- a/applications/plugins/tictactoe_game/application.fam
+++ b/applications/plugins/tictactoe_game/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_TicTacToe",
+    appid="TicTacToe",
     name="Tic Tac Toe",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="tictactoe_game_app",
diff --git a/applications/plugins/videopoker/application.fam b/applications/plugins/videopoker/application.fam
index 7885dadfc..e40953fb4 100644
--- a/applications/plugins/videopoker/application.fam
+++ b/applications/plugins/videopoker/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="GAME_VideoPoker",
+    appid="VideoPoker",
     name="Video Poker",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="video_poker_app",
diff --git a/applications/plugins/wav_player/application.fam b/applications/plugins/wav_player/application.fam
index 8a81d1f7f..f0fc7819e 100644
--- a/applications/plugins/wav_player/application.fam
+++ b/applications/plugins/wav_player/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_Wav_Player",
+    appid="Wav_Player",
     name="WAV Player",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wav_player_app",
diff --git a/applications/plugins/wifi_deauther/application.fam b/applications/plugins/wifi_deauther/application.fam
index 63b88e97b..71dd45079 100644
--- a/applications/plugins/wifi_deauther/application.fam
+++ b/applications/plugins/wifi_deauther/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_ESP8266_Wifi_Deauther",
+    appid="ESP8266_Wifi_Deauther",
     name="[ESP8266] WiFi (Deauther)",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_deauther_app",
diff --git a/applications/plugins/wifi_marauder_companion/application.fam b/applications/plugins/wifi_marauder_companion/application.fam
index bc9b6dc7a..e14ac4a5a 100644
--- a/applications/plugins/wifi_marauder_companion/application.fam
+++ b/applications/plugins/wifi_marauder_companion/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_ESP32_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 8cedbf390..2983eefbd 100644
--- a/applications/plugins/wifi_scanner/application.fam
+++ b/applications/plugins/wifi_scanner/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="APPS_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 55cff2a68..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",