diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 029223fa9..ca9cb0359 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/nuvio_file_paths" />
+                android:resource="@xml/file_paths" />
         </provider>
     </application>
 
diff --git a/composeApp/src/androidFull/res/xml/nuvio_updater_file_paths.xml b/composeApp/src/androidFull/res/xml/updater_file_paths.xml
similarity index 100%
rename from composeApp/src/androidFull/res/xml/nuvio_updater_file_paths.xml
rename to composeApp/src/androidFull/res/xml/updater_file_paths.xml
diff --git a/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.android.kt b/composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.android.kt
similarity index 100%
rename from composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.android.kt
rename to composeApp/src/androidMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.android.kt
diff --git a/composeApp/src/androidMain/res/xml/nuvio_file_paths.xml b/composeApp/src/androidMain/res/xml/file_paths.xml
similarity index 100%
rename from composeApp/src/androidMain/res/xml/nuvio_file_paths.xml
rename to composeApp/src/androidMain/res/xml/file_paths.xml
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioBottomSheet.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/BottomSheet.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioBottomSheet.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/BottomSheet.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Components.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioComponents.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Components.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioContinueWatchingActionSheet.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ContinueWatchingActionSheet.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioContinueWatchingActionSheet.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ContinueWatchingActionSheet.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioDropdownChip.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/DropdownChip.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioDropdownChip.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/DropdownChip.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioFloatingPrompt.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/FloatingPrompt.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioFloatingPrompt.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/FloatingPrompt.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioGradients.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Gradients.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioGradients.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Gradients.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioNavigationBar.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NavigationBar.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioNavigationBar.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NavigationBar.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioNetworkOfflineCard.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NetworkOfflineCard.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioNetworkOfflineCard.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NetworkOfflineCard.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioPosterActionSheet.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/PosterActionSheet.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioPosterActionSheet.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/PosterActionSheet.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioProgressBar.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ProgressBar.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioProgressBar.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ProgressBar.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioShelfComponents.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioShelfComponents.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/ShelfComponents.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Theme.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTheme.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Theme.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTokenPreview.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/TokenPreview.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTokenPreview.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/TokenPreview.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTokens.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Tokens.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTokens.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/Tokens.kt
diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTypeScale.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/TypeScale.kt
similarity index 100%
rename from composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/NuvioTypeScale.kt
rename to composeApp/src/commonMain/kotlin/com/nuvio/app/core/ui/TypeScale.kt
diff --git a/composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.ios.kt b/composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.ios.kt
similarity index 100%
rename from composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/NuvioPlatformInsets.ios.kt
rename to composeApp/src/iosMain/kotlin/com/nuvio/app/core/ui/PlatformInsets.ios.kt
diff --git a/composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/NuvioPlayerBridge.kt b/composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerBridge.kt
similarity index 100%
rename from composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/NuvioPlayerBridge.kt
rename to composeApp/src/iosMain/kotlin/com/nuvio/app/features/player/PlayerBridge.kt
diff --git a/scripts/nuvio_debug_logs.sh b/scripts/debug_logs.sh
similarity index 97%
rename from scripts/nuvio_debug_logs.sh
rename to scripts/debug_logs.sh
index 020e7bec2..e86ca2e67 100755
--- a/scripts/nuvio_debug_logs.sh
+++ b/scripts/debug_logs.sh
@@ -6,7 +6,7 @@
 #  level.  Press  C  to clear all logs on screen.  Press  Q  to quit.
 #
 #  Usage:
-#    ./scripts/nuvio_debug_logs.sh [options]
+#    ./scripts/debug_logs.sh [options]
 #
 #  Options:
 #    -s, --serial <id>    ADB device serial (optional, for multi-device)
@@ -53,7 +53,7 @@ CLR_HOTKEY='\033[38;5;220m'
 # ── Helpers ──────────────────────────────────────────────────────────────────
 usage() {
   cat <<'EOF'
-Usage: ./scripts/nuvio_debug_logs.sh [options]
+Usage: ./scripts/debug_logs.sh [options]
 
 Stream live colour-coded ADB logs for Nuvio debug builds.
 
@@ -68,10 +68,10 @@ Hotkeys (while running):
   Q   Quit the log viewer
 
 Examples:
-  ./scripts/nuvio_debug_logs.sh
-  ./scripts/nuvio_debug_logs.sh --serial emulator-5554
-  ./scripts/nuvio_debug_logs.sh --tag 'MetaDetailsRepo|SeriesContent'
-  ./scripts/nuvio_debug_logs.sh --clear --tag 'Sync|Auth'
+  ./scripts/debug_logs.sh
+  ./scripts/debug_logs.sh --serial emulator-5554
+  ./scripts/debug_logs.sh --tag 'MetaDetailsRepo|SeriesContent'
+  ./scripts/debug_logs.sh --clear --tag 'Sync|Auth'
 EOF
 }