diff --git a/applications/plugins/badapple/application.fam b/applications/plugins/badapple/application.fam
index 7b8b97e05..7653a543e 100644
--- a/applications/plugins/badapple/application.fam
+++ b/applications/plugins/badapple/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="badapple",
+    appid="BadApple",
     name="Bad Apple",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="bad_apple_main",
diff --git a/applications/plugins/counter/application.fam b/applications/plugins/counter/application.fam
index 8f7eef884..0bec27076 100644
--- a/applications/plugins/counter/application.fam
+++ b/applications/plugins/counter/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="counter",
+    appid="Counter",
     name="Counter",
     apptype=FlipperAppType.PLUGIN,
     entry_point="counterapp",
diff --git a/applications/plugins/counter/counter.c b/applications/plugins/counter/counter.c
index c76ed7293..370f9e65a 100644
--- a/applications/plugins/counter/counter.c
+++ b/applications/plugins/counter/counter.c
@@ -2,7 +2,7 @@
 #include <gui/gui.h>
 #include <input/input.h>
 #include <stdlib.h>
-#include <counter_icons.h>
+#include <Counter_icons.h>
 
 #define MAX_COUNT 99
 #define BOXTIME 2
diff --git a/applications/plugins/hex_viewer/application.fam b/applications/plugins/hex_viewer/application.fam
index 7204e07c8..d62aa4db2 100644
--- a/applications/plugins/hex_viewer/application.fam
+++ b/applications/plugins/hex_viewer/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="hex_viewer",
+    appid="HEX_Viewer",
     name="HEX Viewer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hex_viewer_app",
diff --git a/applications/plugins/hex_viewer/hex_viewer.c b/applications/plugins/hex_viewer/hex_viewer.c
index 50c34d634..fa9e553d1 100644
--- a/applications/plugins/hex_viewer/hex_viewer.c
+++ b/applications/plugins/hex_viewer/hex_viewer.c
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-#include <hex_viewer_icons.h>
+#include <HEX_Viewer_icons.h>
 #include <gui/gui.h>
 #include <gui/elements.h>
 #include <dialogs/dialogs.h>
diff --git a/applications/plugins/totp/application.fam b/applications/plugins/totp/application.fam
index fbd21ddf7..ffb6d6137 100644
--- a/applications/plugins/totp/application.fam
+++ b/applications/plugins/totp/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="totp",
+    appid="Authenticator",
     name="Authenticator",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="totp_app",
diff --git a/applications/plugins/totp/ui/scenes/app_settings/totp_app_settings.c b/applications/plugins/totp/ui/scenes/app_settings/totp_app_settings.c
index 5f68c6772..e97c4fb29 100644
--- a/applications/plugins/totp/ui/scenes/app_settings/totp_app_settings.c
+++ b/applications/plugins/totp/ui/scenes/app_settings/totp_app_settings.c
@@ -1,6 +1,6 @@
 #include "totp_app_settings.h"
 #include <math.h>
-#include <totp_icons.h>
+#include <Authenticator_icons.h>
 #include "../../ui_controls.h"
 #include "../../scene_director.h"
 #include "../token_menu/totp_scene_token_menu.h"
diff --git a/applications/plugins/totp/ui/scenes/authenticate/totp_scene_authenticate.c b/applications/plugins/totp/ui/scenes/authenticate/totp_scene_authenticate.c
index c595b5bd0..d4977050f 100644
--- a/applications/plugins/totp/ui/scenes/authenticate/totp_scene_authenticate.c
+++ b/applications/plugins/totp/ui/scenes/authenticate/totp_scene_authenticate.c
@@ -1,6 +1,6 @@
 #include "totp_scene_authenticate.h"
 #include <dialogs/dialogs.h>
-#include <totp_icons.h>
+#include <Authenticator_icons.h>
 #include "../../../types/common.h"
 #include "../../constants.h"
 #include "../../../services/config/config.h"
diff --git a/applications/plugins/totp/ui/scenes/generate_token/totp_scene_generate_token.c b/applications/plugins/totp/ui/scenes/generate_token/totp_scene_generate_token.c
index c90cc6b23..79930dff9 100644
--- a/applications/plugins/totp/ui/scenes/generate_token/totp_scene_generate_token.c
+++ b/applications/plugins/totp/ui/scenes/generate_token/totp_scene_generate_token.c
@@ -1,7 +1,7 @@
 #include <gui/gui.h>
 #include <notification/notification.h>
 #include <notification/notification_messages.h>
-#include <totp_icons.h>
+#include <Authenticator_icons.h>
 #include "totp_scene_generate_token.h"
 #include "../../../types/token_info.h"
 #include "../../../types/common.h"
diff --git a/applications/plugins/totp/ui/ui_controls.c b/applications/plugins/totp/ui/ui_controls.c
index af029dd9f..7fc7f0111 100644
--- a/applications/plugins/totp/ui/ui_controls.c
+++ b/applications/plugins/totp/ui/ui_controls.c
@@ -1,5 +1,5 @@
 #include "ui_controls.h"
-#include <totp_icons.h>
+#include <Authenticator_icons.h>
 #include "constants.h"
 
 #define TEXT_BOX_HEIGHT 13
diff --git a/applications/plugins/usb_hid_autofire/application.fam b/applications/plugins/usb_hid_autofire/application.fam
index 9e7b9378c..10e3e6cf4 100644
--- a/applications/plugins/usb_hid_autofire/application.fam
+++ b/applications/plugins/usb_hid_autofire/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="usb_hid_autofire",
+    appid="USB_HID_Autofire",
     name="USB HID Autofire",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="usb_hid_autofire_app",
diff --git a/applications/plugins/wii_ec_anal/application.fam b/applications/plugins/wii_ec_anal/application.fam
index ac11d260e..42ed7e979 100644
--- a/applications/plugins/wii_ec_anal/application.fam
+++ b/applications/plugins/wii_ec_anal/application.fam
@@ -2,7 +2,7 @@
 
 App(
 	# --- App Info
-	appid="wii_ec_anal",
+	appid="Wii_EC_Analyser",
 	name="Wii EC Analyser",
 
 	# --- Entry point