diff --git a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
index 502a741..23ab586 100644
--- a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
@@ -7,12 +7,12 @@ namespace Camera {
 
 #include <camera_service.h>
 #include <EventEndpoint.h>
-#include <FSPersistence.h>
+#include <stateful_persistence.h>
 #include <stateful_service_endpoint.h>
 #include <JsonUtils.h>
 #include <PsychicHttp.h>
 #include <SettingValue.h>
-#include <StatefulService.h>
+#include <stateful_service.h>
 #include <esp_camera.h>
 #include <filesystem.h>
 
diff --git a/esp32/lib/ESP32-sveltekit/EventEndpoint.h b/esp32/lib/ESP32-sveltekit/EventEndpoint.h
index beb0065..b5118ec 100644
--- a/esp32/lib/ESP32-sveltekit/EventEndpoint.h
+++ b/esp32/lib/ESP32-sveltekit/EventEndpoint.h
@@ -17,7 +17,7 @@
 
 #include <event_socket.h>
 #include <PsychicHttp.h>
-#include <StatefulService.h>
+#include <stateful_service.h>
 
 template <class T>
 class EventEndpoint {
diff --git a/esp32/lib/ESP32-sveltekit/Peripherals.h b/esp32/lib/ESP32-sveltekit/Peripherals.h
index 99142ee..31bf43c 100644
--- a/esp32/lib/ESP32-sveltekit/Peripherals.h
+++ b/esp32/lib/ESP32-sveltekit/Peripherals.h
@@ -2,8 +2,8 @@
 #define Peripherals_h
 
 #include <EventEndpoint.h>
-#include <FSPersistence.h>
-#include <StatefulService.h>
+#include <stateful_persistence.h>
+#include <stateful_service.h>
 #include <MathUtils.h>
 #include <timing.h>
 #include <filesystem.h>
diff --git a/esp32/lib/ESP32-sveltekit/ServoController.h b/esp32/lib/ESP32-sveltekit/ServoController.h
index 5efbd2b..48fc7b2 100644
--- a/esp32/lib/ESP32-sveltekit/ServoController.h
+++ b/esp32/lib/ESP32-sveltekit/ServoController.h
@@ -2,10 +2,9 @@
 #define ServoController_h
 
 #include <Adafruit_PWMServoDriver.h>
-#include <EventEndpoint.h>
 #include <event_socket.h>
-#include <FSPersistence.h>
-#include <StatefulService.h>
+#include <stateful_persistence.h>
+#include <stateful_service.h>
 #include <stateful_service_endpoint.h>
 #include <MathUtils.h>
 #include <timing.h>
diff --git a/esp32/lib/ESP32-sveltekit/ap_service.h b/esp32/lib/ESP32-sveltekit/ap_service.h
index 818cd89..ab42f0f 100644
--- a/esp32/lib/ESP32-sveltekit/ap_service.h
+++ b/esp32/lib/ESP32-sveltekit/ap_service.h
@@ -1,6 +1,6 @@
-#include <StatefulService.h>
+#include <stateful_service.h>
 #include <stateful_service_endpoint.h>
-#include <FSPersistence.h>
+#include <stateful_persistence.h>
 #include <settings/ap_settings.h>
 #include <timing.h>
 #include <WiFi.h>
diff --git a/esp32/lib/ESP32-sveltekit/event_socket.h b/esp32/lib/ESP32-sveltekit/event_socket.h
index c4a3349..bfc86d6 100644
--- a/esp32/lib/ESP32-sveltekit/event_socket.h
+++ b/esp32/lib/ESP32-sveltekit/event_socket.h
@@ -2,7 +2,7 @@
 #define Socket_h
 
 #include <PsychicHttp.h>
-#include <StatefulService.h>
+#include <stateful_service.h>
 #include <list>
 #include <map>
 #include <vector>
diff --git a/esp32/lib/ESP32-sveltekit/ntp_service.h b/esp32/lib/ESP32-sveltekit/ntp_service.h
index 30780f6..7b50104 100644
--- a/esp32/lib/ESP32-sveltekit/ntp_service.h
+++ b/esp32/lib/ESP32-sveltekit/ntp_service.h
@@ -2,7 +2,7 @@
 #define NTPService_h
 
 #include <filesystem.h>
-#include <FSPersistence.h>
+#include <stateful_persistence.h>
 #include <WiFi.h>
 #include <stateful_service_endpoint.h>
 #include <settings/ntp_settings.h>
diff --git a/esp32/lib/ESP32-sveltekit/FSPersistence.h b/esp32/lib/ESP32-sveltekit/stateful_persistence.h
similarity index 99%
rename from esp32/lib/ESP32-sveltekit/FSPersistence.h
rename to esp32/lib/ESP32-sveltekit/stateful_persistence.h
index 6431b42..521bc00 100644
--- a/esp32/lib/ESP32-sveltekit/FSPersistence.h
+++ b/esp32/lib/ESP32-sveltekit/stateful_persistence.h
@@ -17,7 +17,7 @@
  **/
 
 #include <FS.h>
-#include <StatefulService.h>
+#include <stateful_service.h>
 #include <filesystem.h>
 
 template <class T>
diff --git a/esp32/lib/ESP32-sveltekit/StatefulService.h b/esp32/lib/ESP32-sveltekit/stateful_service.h
similarity index 100%
rename from esp32/lib/ESP32-sveltekit/StatefulService.h
rename to esp32/lib/ESP32-sveltekit/stateful_service.h
diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.h b/esp32/lib/ESP32-sveltekit/wifi_service.h
index c24e874..5996e26 100644
--- a/esp32/lib/ESP32-sveltekit/wifi_service.h
+++ b/esp32/lib/ESP32-sveltekit/wifi_service.h
@@ -7,8 +7,8 @@
 
 #include <filesystem.h>
 #include <timing.h>
-#include <StatefulService.h>
-#include <FSPersistence.h>
+#include <stateful_service.h>
+#include <stateful_persistence.h>
 #include <stateful_service_endpoint.h>
 #include <settings/wifi_settings.h>