diff --git a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON b/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON
index a4866909..4a85e53f 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON
+++ b/internal_filesystem/builtin/apps/com.micropythonos.hotspot/META-INF/MANIFEST.JSON
@@ -10,8 +10,8 @@
 "category": "networking",
 "activities": [
     {
-      "entrypoint": "assets/hotspot.py",
-      "classname": "Hotspot",
+      "entrypoint": "assets/hotspot_settings.py",
+      "classname": "HotspotSettings",
       "intent_filters": [
         {
           "action": "main",
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot.py b/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py
similarity index 99%
rename from internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot.py
rename to internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py
index 56d18cc2..5058c42e 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot.py
+++ b/internal_filesystem/builtin/apps/com.micropythonos.hotspot/assets/hotspot_settings.py
@@ -3,7 +3,7 @@ import lvgl as lv
 from mpos import Activity, DisplayMetrics, Intent, SettingsActivity, SharedPreferences, WifiService
 
 
-class Hotspot(Activity):
+class HotspotSettings(Activity):
     """
     Hotspot configuration app.
 
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON b/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON
index 7a7614d5..e2cc5d18 100644
--- a/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON
+++ b/internal_filesystem/builtin/apps/com.micropythonos.webserver/META-INF/MANIFEST.JSON
@@ -10,8 +10,8 @@
 "category": "networking",
 "activities": [
     {
-      "entrypoint": "assets/webserver.py",
-      "classname": "WebServerApp",
+      "entrypoint": "assets/webserver_settings.py",
+      "classname": "WebServerSettings",
       "intent_filters": [
         {
           "action": "main",
diff --git a/internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver.py b/internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver_settings.py
similarity index 100%
rename from internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver.py
rename to internal_filesystem/builtin/apps/com.micropythonos.webserver/assets/webserver_settings.py