diff --git a/applications/plugins/am2320_temp_sensor/application.fam b/applications/plugins/am2320_temp_sensor/application.fam
index 9a17539dd..f7b6dfbf2 100644
--- a/applications/plugins/am2320_temp_sensor/application.fam
+++ b/applications/plugins/am2320_temp_sensor/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="am2320_temp_sensor",
+    appid="AM2320_temp_sensor",
     name="[AM2320] Temp. Sensor",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="am_temperature_sensor_app",
diff --git a/applications/plugins/flipper_i2ctools/application.fam b/applications/plugins/flipper_i2ctools/application.fam
index b029e90fb..7d9c5944c 100644
--- a/applications/plugins/flipper_i2ctools/application.fam
+++ b/applications/plugins/flipper_i2ctools/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="i2cTools",
+    appid="I2C_Tools",
     name="i2c Tools",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="i2ctools_app",
diff --git a/applications/plugins/flipper_i2ctools/views/main_view.h b/applications/plugins/flipper_i2ctools/views/main_view.h
index 050e41130..dc9379190 100644
--- a/applications/plugins/flipper_i2ctools/views/main_view.h
+++ b/applications/plugins/flipper_i2ctools/views/main_view.h
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
-#include <i2cTools_icons.h>
+#include <I2C_Tools_icons.h>
 #define APP_NAME "I2C Tools"
 
 #define SCAN_MENU_TEXT "Scan"
diff --git a/applications/plugins/flipper_i2ctools/views/scanner_view.h b/applications/plugins/flipper_i2ctools/views/scanner_view.h
index 02bc8fb1c..bd591a740 100644
--- a/applications/plugins/flipper_i2ctools/views/scanner_view.h
+++ b/applications/plugins/flipper_i2ctools/views/scanner_view.h
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
-#include <i2cTools_icons.h>
+#include <I2C_Tools_icons.h>
 #include "../i2cscanner.h"
 
 #define SCAN_TEXT "SCAN"
diff --git a/applications/plugins/flipper_i2ctools/views/sender_view.h b/applications/plugins/flipper_i2ctools/views/sender_view.h
index 5f48081dd..8a21912dc 100644
--- a/applications/plugins/flipper_i2ctools/views/sender_view.h
+++ b/applications/plugins/flipper_i2ctools/views/sender_view.h
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
-#include <i2cTools_icons.h>
+#include <I2C_Tools_icons.h>
 #include "../i2csender.h"
 
 #define SEND_TEXT "SEND"
diff --git a/applications/plugins/flipper_i2ctools/views/sniffer_view.h b/applications/plugins/flipper_i2ctools/views/sniffer_view.h
index 80c92f7fc..d5cc373d1 100644
--- a/applications/plugins/flipper_i2ctools/views/sniffer_view.h
+++ b/applications/plugins/flipper_i2ctools/views/sniffer_view.h
@@ -1,7 +1,7 @@
 #include <furi.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
-#include <i2cTools_icons.h>
+#include <I2C_Tools_icons.h>
 #include "../i2csniffer.h"
 
 #define SNIFF_TEXT "SNIFF"
diff --git a/applications/plugins/hc_sr04/application.fam b/applications/plugins/hc_sr04/application.fam
index ad451a102..da91a0864 100644
--- a/applications/plugins/hc_sr04/application.fam
+++ b/applications/plugins/hc_sr04/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="hc_sr04",
+    appid="HC_SR04_Dist_Sensor",
     name="[HC-SR] Dist. Sensor",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hc_sr04_app",
diff --git a/applications/plugins/lightmeter/application.fam b/applications/plugins/lightmeter/application.fam
index 8cd90ee26..b1ae6c6b2 100644
--- a/applications/plugins/lightmeter/application.fam
+++ b/applications/plugins/lightmeter/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="lightmeter",
+    appid="BH1750_Lightmeter",
     name="[BH1750] Lightmeter",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="lightmeter_app",
diff --git a/applications/plugins/rc2014_coleco/application.fam b/applications/plugins/rc2014_coleco/application.fam
index 906ae2935..2a3900e19 100644
--- a/applications/plugins/rc2014_coleco/application.fam
+++ b/applications/plugins/rc2014_coleco/application.fam
@@ -1,5 +1,5 @@
 App(
-    appid="coleco",
+    appid="RC2014_Coleco",
     name="RC2014 ColecoVision",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="coleco_app",
diff --git a/applications/plugins/rc2014_coleco/coleco.c b/applications/plugins/rc2014_coleco/coleco.c
index 2ba78858d..6ae050633 100644
--- a/applications/plugins/rc2014_coleco/coleco.c
+++ b/applications/plugins/rc2014_coleco/coleco.c
@@ -2,7 +2,7 @@
 #include <furi_hal_gpio.h>
 #include <furi_hal_power.h>
 #include <gui/gui.h>
-#include "coleco_icons.h"
+#include "RC2014_Coleco_icons.h"
 
 #define CODE_0 0x0A
 #define CODE_1 0x0D