diff --git a/applications/external/camera-suite/application.fam b/applications/external/camera_suite/application.fam
similarity index 51%
rename from applications/external/camera-suite/application.fam
rename to applications/external/camera_suite/application.fam
index d2beefcde..40131ae9a 100644
--- a/applications/external/camera-suite/application.fam
+++ b/applications/external/camera_suite/application.fam
@@ -3,14 +3,14 @@ App(
     apptype=FlipperAppType.EXTERNAL,
     cdefines=["APP_CAMERA_SUITE"],
     entry_point="camera_suite_app",
-	fap_author="Cody Tolene",
+    fap_author="Cody Tolene",
     fap_category="GPIO",
-	fap_description="A camera suite application for the Flipper Zero ESP32-CAM module.",
-	fap_icon="icons/camera-suite.png",
+    fap_description="A camera suite application for the Flipper Zero ESP32-CAM module.",
+    fap_icon="icons/camera_suite.png",
     fap_libs=["assets"],
-	fap_weburl="https://github.com/CodyTolene/Flipper-Zero-Cam",
+    fap_weburl="https://github.com/CodyTolene/Flipper-Zero-Cam",
     name="[ESP32] Camera Suite",
     order=1,
     requires=["gui", "storage"],
-    stack_size=8 * 1024
-)
\ No newline at end of file
+    stack_size=8 * 1024,
+)
diff --git a/applications/external/camera-suite/camera-suite.c b/applications/external/camera_suite/camera_suite.c
similarity index 99%
rename from applications/external/camera-suite/camera-suite.c
rename to applications/external/camera_suite/camera_suite.c
index 361bfef4e..13ee09c22 100644
--- a/applications/external/camera-suite/camera-suite.c
+++ b/applications/external/camera_suite/camera_suite.c
@@ -1,4 +1,4 @@
-#include "camera-suite.h"
+#include "camera_suite.h"
 #include <stdlib.h>
 
 bool camera_suite_custom_event_callback(void* context, uint32_t event) {
diff --git a/applications/external/camera-suite/camera-suite.h b/applications/external/camera_suite/camera_suite.h
similarity index 100%
rename from applications/external/camera-suite/camera-suite.h
rename to applications/external/camera_suite/camera_suite.h
diff --git a/applications/external/camera-suite/helpers/camera_suite_custom_event.h b/applications/external/camera_suite/helpers/camera_suite_custom_event.h
similarity index 100%
rename from applications/external/camera-suite/helpers/camera_suite_custom_event.h
rename to applications/external/camera_suite/helpers/camera_suite_custom_event.h
diff --git a/applications/external/camera-suite/helpers/camera_suite_haptic.c b/applications/external/camera_suite/helpers/camera_suite_haptic.c
similarity index 97%
rename from applications/external/camera-suite/helpers/camera_suite_haptic.c
rename to applications/external/camera_suite/helpers/camera_suite_haptic.c
index 27ea81868..237a96004 100644
--- a/applications/external/camera-suite/helpers/camera_suite_haptic.c
+++ b/applications/external/camera_suite/helpers/camera_suite_haptic.c
@@ -1,5 +1,5 @@
 #include "camera_suite_haptic.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 void camera_suite_play_happy_bump(void* context) {
     CameraSuite* app = context;
diff --git a/applications/external/camera-suite/helpers/camera_suite_haptic.h b/applications/external/camera_suite/helpers/camera_suite_haptic.h
similarity index 100%
rename from applications/external/camera-suite/helpers/camera_suite_haptic.h
rename to applications/external/camera_suite/helpers/camera_suite_haptic.h
diff --git a/applications/external/camera-suite/helpers/camera_suite_led.c b/applications/external/camera_suite/helpers/camera_suite_led.c
similarity index 94%
rename from applications/external/camera-suite/helpers/camera_suite_led.c
rename to applications/external/camera_suite/helpers/camera_suite_led.c
index c7211a996..c4f1a85d7 100644
--- a/applications/external/camera-suite/helpers/camera_suite_led.c
+++ b/applications/external/camera_suite/helpers/camera_suite_led.c
@@ -1,5 +1,5 @@
 #include "camera_suite_led.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 void camera_suite_led_set_rgb(void* context, int red, int green, int blue) {
     CameraSuite* app = context;
@@ -34,5 +34,5 @@ void camera_suite_led_reset(void* context) {
     notification_message(app->notification, &sequence_reset_green);
     notification_message(app->notification, &sequence_reset_blue);
     //Delay, prevent removal from RAM before LED value set.
-    furi_thread_flags_wait(0, FuriFlagWaitAny, 300); 
+    furi_thread_flags_wait(0, FuriFlagWaitAny, 300);
 }
diff --git a/applications/external/camera-suite/helpers/camera_suite_led.h b/applications/external/camera_suite/helpers/camera_suite_led.h
similarity index 100%
rename from applications/external/camera-suite/helpers/camera_suite_led.h
rename to applications/external/camera_suite/helpers/camera_suite_led.h
diff --git a/applications/external/camera-suite/helpers/camera_suite_speaker.c b/applications/external/camera_suite/helpers/camera_suite_speaker.c
similarity index 95%
rename from applications/external/camera-suite/helpers/camera_suite_speaker.c
rename to applications/external/camera_suite/helpers/camera_suite_speaker.c
index 35d712109..c2a5a7dd0 100644
--- a/applications/external/camera-suite/helpers/camera_suite_speaker.c
+++ b/applications/external/camera_suite/helpers/camera_suite_speaker.c
@@ -1,5 +1,5 @@
 #include "camera_suite_speaker.h"
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 #define NOTE_INPUT 587.33f
 
diff --git a/applications/external/camera-suite/helpers/camera_suite_speaker.h b/applications/external/camera_suite/helpers/camera_suite_speaker.h
similarity index 100%
rename from applications/external/camera-suite/helpers/camera_suite_speaker.h
rename to applications/external/camera_suite/helpers/camera_suite_speaker.h
diff --git a/applications/external/camera-suite/helpers/camera_suite_storage.c b/applications/external/camera_suite/helpers/camera_suite_storage.c
similarity index 100%
rename from applications/external/camera-suite/helpers/camera_suite_storage.c
rename to applications/external/camera_suite/helpers/camera_suite_storage.c
diff --git a/applications/external/camera-suite/helpers/camera_suite_storage.h b/applications/external/camera_suite/helpers/camera_suite_storage.h
similarity index 86%
rename from applications/external/camera-suite/helpers/camera_suite_storage.h
rename to applications/external/camera_suite/helpers/camera_suite_storage.h
index e56a4e5ac..37e82d722 100644
--- a/applications/external/camera-suite/helpers/camera_suite_storage.h
+++ b/applications/external/camera_suite/helpers/camera_suite_storage.h
@@ -2,11 +2,11 @@
 #include <string.h>
 #include <storage/storage.h>
 #include <flipper_format/flipper_format_i.h>
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 #define BOILERPLATE_SETTINGS_FILE_VERSION 1
-#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/camera-suite")
-#define BOILERPLATE_SETTINGS_SAVE_PATH CONFIG_FILE_DIRECTORY_PATH "/camera-suite.conf"
+#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/camera_suite")
+#define BOILERPLATE_SETTINGS_SAVE_PATH CONFIG_FILE_DIRECTORY_PATH "/camera_suite.conf"
 #define BOILERPLATE_SETTINGS_SAVE_PATH_TMP BOILERPLATE_SETTINGS_SAVE_PATH ".tmp"
 #define BOILERPLATE_SETTINGS_HEADER "Camera Suite Config File"
 #define BOILERPLATE_SETTINGS_KEY_ORIENTATION "Orientation"
diff --git a/applications/external/camera-suite/icons/camera-suite.png b/applications/external/camera_suite/icons/camera_suite.png
similarity index 100%
rename from applications/external/camera-suite/icons/camera-suite.png
rename to applications/external/camera_suite/icons/camera_suite.png
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene.c b/applications/external/camera_suite/scenes/camera_suite_scene.c
similarity index 100%
rename from applications/external/camera-suite/scenes/camera_suite_scene.c
rename to applications/external/camera_suite/scenes/camera_suite_scene.c
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene.h b/applications/external/camera_suite/scenes/camera_suite_scene.h
similarity index 100%
rename from applications/external/camera-suite/scenes/camera_suite_scene.h
rename to applications/external/camera_suite/scenes/camera_suite_scene.h
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_config.h b/applications/external/camera_suite/scenes/camera_suite_scene_config.h
similarity index 100%
rename from applications/external/camera-suite/scenes/camera_suite_scene_config.h
rename to applications/external/camera_suite/scenes/camera_suite_scene_config.h
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_guide.c b/applications/external/camera_suite/scenes/camera_suite_scene_guide.c
similarity index 98%
rename from applications/external/camera-suite/scenes/camera_suite_scene_guide.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_guide.c
index 12682fb24..6599058ef 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_guide.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_guide.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_guide.h"
 
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_menu.c b/applications/external/camera_suite/scenes/camera_suite_scene_menu.c
similarity index 99%
rename from applications/external/camera-suite/scenes/camera_suite_scene_menu.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_menu.c
index 538e64252..09c4dade7 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_menu.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_menu.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 
 enum SubmenuIndex {
     /** Atkinson Dithering Algorithm. */
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_settings.c b/applications/external/camera_suite/scenes/camera_suite_scene_settings.c
similarity index 99%
rename from applications/external/camera-suite/scenes/camera_suite_scene_settings.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_settings.c
index aba80d08c..a06b45fe9 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_settings.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_settings.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <lib/toolbox/value_index.h>
 
 // Camera orientation, in degrees.
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_start.c b/applications/external/camera_suite/scenes/camera_suite_scene_start.c
similarity index 98%
rename from applications/external/camera-suite/scenes/camera_suite_scene_start.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_start.c
index 9f128b761..12591760c 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_start.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_start.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_start.h"
 
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_style_1.c b/applications/external/camera_suite/scenes/camera_suite_scene_style_1.c
similarity index 98%
rename from applications/external/camera-suite/scenes/camera_suite_scene_style_1.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_style_1.c
index 1341c6173..1aeecec7a 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_style_1.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_style_1.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../views/camera_suite_view_style_1.h"
 
diff --git a/applications/external/camera-suite/scenes/camera_suite_scene_style_2.c b/applications/external/camera_suite/scenes/camera_suite_scene_style_2.c
similarity index 98%
rename from applications/external/camera-suite/scenes/camera_suite_scene_style_2.c
rename to applications/external/camera_suite/scenes/camera_suite_scene_style_2.c
index df8c875ba..b74d33784 100644
--- a/applications/external/camera-suite/scenes/camera_suite_scene_style_2.c
+++ b/applications/external/camera_suite/scenes/camera_suite_scene_style_2.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_haptic.h"
 #include "../helpers/camera_suite_led.h"
diff --git a/applications/external/camera-suite/views/camera_suite_view_guide.c b/applications/external/camera_suite/views/camera_suite_view_guide.c
similarity index 99%
rename from applications/external/camera-suite/views/camera_suite_view_guide.c
rename to applications/external/camera_suite/views/camera_suite_view_guide.c
index f27047d47..479f8d4d1 100644
--- a/applications/external/camera-suite/views/camera_suite_view_guide.c
+++ b/applications/external/camera_suite/views/camera_suite_view_guide.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
diff --git a/applications/external/camera-suite/views/camera_suite_view_guide.h b/applications/external/camera_suite/views/camera_suite_view_guide.h
similarity index 100%
rename from applications/external/camera-suite/views/camera_suite_view_guide.h
rename to applications/external/camera_suite/views/camera_suite_view_guide.h
diff --git a/applications/external/camera-suite/views/camera_suite_view_start.c b/applications/external/camera_suite/views/camera_suite_view_start.c
similarity index 99%
rename from applications/external/camera-suite/views/camera_suite_view_start.c
rename to applications/external/camera_suite/views/camera_suite_view_start.c
index dbb374cbf..a84ee50c2 100644
--- a/applications/external/camera-suite/views/camera_suite_view_start.c
+++ b/applications/external/camera_suite/views/camera_suite_view_start.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
diff --git a/applications/external/camera-suite/views/camera_suite_view_start.h b/applications/external/camera_suite/views/camera_suite_view_start.h
similarity index 100%
rename from applications/external/camera-suite/views/camera_suite_view_start.h
rename to applications/external/camera_suite/views/camera_suite_view_start.h
diff --git a/applications/external/camera-suite/views/camera_suite_view_style_1.c b/applications/external/camera_suite/views/camera_suite_view_style_1.c
similarity index 99%
rename from applications/external/camera-suite/views/camera_suite_view_style_1.c
rename to applications/external/camera_suite/views/camera_suite_view_style_1.c
index 34aeaf272..6d16d0231 100644
--- a/applications/external/camera-suite/views/camera_suite_view_style_1.c
+++ b/applications/external/camera_suite/views/camera_suite_view_style_1.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
diff --git a/applications/external/camera-suite/views/camera_suite_view_style_1.h b/applications/external/camera_suite/views/camera_suite_view_style_1.h
similarity index 100%
rename from applications/external/camera-suite/views/camera_suite_view_style_1.h
rename to applications/external/camera_suite/views/camera_suite_view_style_1.h
diff --git a/applications/external/camera-suite/views/camera_suite_view_style_2.c b/applications/external/camera_suite/views/camera_suite_view_style_2.c
similarity index 99%
rename from applications/external/camera-suite/views/camera_suite_view_style_2.c
rename to applications/external/camera_suite/views/camera_suite_view_style_2.c
index eefa4d637..0a7ac0b83 100644
--- a/applications/external/camera-suite/views/camera_suite_view_style_2.c
+++ b/applications/external/camera_suite/views/camera_suite_view_style_2.c
@@ -1,4 +1,4 @@
-#include "../camera-suite.h"
+#include "../camera_suite.h"
 #include <furi.h>
 #include <furi_hal.h>
 #include <input/input.h>
diff --git a/applications/external/camera-suite/views/camera_suite_view_style_2.h b/applications/external/camera_suite/views/camera_suite_view_style_2.h
similarity index 100%
rename from applications/external/camera-suite/views/camera_suite_view_style_2.h
rename to applications/external/camera_suite/views/camera_suite_view_style_2.h