diff --git a/api-gen-runtime-internal/src/jsMain/kotlin/sh/christian/ozone/api/xrpc/jsXrpcSubscriptionResponse.kt b/api-gen-runtime-internal/src/jsMain/kotlin/sh/christian/ozone/api/xrpc/XrpcSubscriptionResponse.js.kt
similarity index 100%
rename from api-gen-runtime-internal/src/jsMain/kotlin/sh/christian/ozone/api/xrpc/jsXrpcSubscriptionResponse.kt
rename to api-gen-runtime-internal/src/jsMain/kotlin/sh/christian/ozone/api/xrpc/XrpcSubscriptionResponse.js.kt
diff --git a/api-gen-runtime-internal/src/jvmMain/kotlin/sh/christian/ozone/api/xrpc/jvmXrpcSubscriptionResponse.kt b/api-gen-runtime-internal/src/jvmMain/kotlin/sh/christian/ozone/api/xrpc/XrpcSubscriptionResponse.jvm.kt
similarity index 100%
rename from api-gen-runtime-internal/src/jvmMain/kotlin/sh/christian/ozone/api/xrpc/jvmXrpcSubscriptionResponse.kt
rename to api-gen-runtime-internal/src/jvmMain/kotlin/sh/christian/ozone/api/xrpc/XrpcSubscriptionResponse.jvm.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/api/androidDispatching.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/api/dispatching.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/api/androidDispatching.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/api/dispatching.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/androidDynamicDarkMode.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/ui/androidDynamicDarkMode.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidOnBackPressedModifier.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidOnBackPressedModifier.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidSystemInsets.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidSystemInsets.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidZoomableImage.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidZoomableImage.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidType.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/type.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/androidType.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/ui/compose/type.android.kt
diff --git a/app/common/src/androidMain/kotlin/sh/christian/ozone/util/androidTime.kt b/app/common/src/androidMain/kotlin/sh/christian/ozone/util/time.android.kt
similarity index 100%
rename from app/common/src/androidMain/kotlin/sh/christian/ozone/util/androidTime.kt
rename to app/common/src/androidMain/kotlin/sh/christian/ozone/util/time.android.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/api/jvmDispatching.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/api/dispatching.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/api/jvmDispatching.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/api/dispatching.jvm.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/jvmDynamicDarkMode.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/jvmDynamicDarkMode.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.jvm.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmOnBackPressedModifier.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmOnBackPressedModifier.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.jvm.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmSystemInsets.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmSystemInsets.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.jvm.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmZoomableImage.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmZoomableImage.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.jvm.kt
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmType.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/type.jvm.kt
similarity index 97%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmType.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/type.jvm.kt
index ba09df96..f64069fc 100644
--- a/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/jvmType.kt
+++ b/app/common/src/desktopMain/kotlin/sh/christian/ozone/ui/compose/type.jvm.kt
@@ -7,7 +7,6 @@ import androidx.compose.ui.text.platform.Font
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.InputStream
-import java.util.stream.IntStream
 import kotlin.streams.toList
 
 actual suspend fun heroFont(): FontFamily {
diff --git a/app/common/src/desktopMain/kotlin/sh/christian/ozone/util/jvmTime.kt b/app/common/src/desktopMain/kotlin/sh/christian/ozone/util/time.jvm.kt
similarity index 100%
rename from app/common/src/desktopMain/kotlin/sh/christian/ozone/util/jvmTime.kt
rename to app/common/src/desktopMain/kotlin/sh/christian/ozone/util/time.jvm.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/api/jsDispatching.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/api/dispatching.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/api/jsDispatching.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/api/dispatching.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/jsDynamicDarkMode.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/ui/jsDynamicDarkMode.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/ui/DynamicDarkMode.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsOnBackPressedModifier.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsOnBackPressedModifier.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/OnBackPressedModifier.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsSystemInsets.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsSystemInsets.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/SystemInsets.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsZoomableImage.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsZoomableImage.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/ZoomableImage.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsType.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/type.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/jsType.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/ui/compose/type.js.kt
diff --git a/app/common/src/jsMain/kotlin/sh/christian/ozone/util/jsTime.kt b/app/common/src/jsMain/kotlin/sh/christian/ozone/util/time.js.kt
similarity index 100%
rename from app/common/src/jsMain/kotlin/sh/christian/ozone/util/jsTime.kt
rename to app/common/src/jsMain/kotlin/sh/christian/ozone/util/time.js.kt
diff --git a/app/store/src/androidMain/kotlin/sh/christian/ozone/store/androidStorage.kt b/app/store/src/androidMain/kotlin/sh/christian/ozone/store/Storage.android.kt
similarity index 100%
rename from app/store/src/androidMain/kotlin/sh/christian/ozone/store/androidStorage.kt
rename to app/store/src/androidMain/kotlin/sh/christian/ozone/store/Storage.android.kt
diff --git a/app/store/src/desktopMain/kotlin/sh/christian/ozone/store/jvmStorage.kt b/app/store/src/desktopMain/kotlin/sh/christian/ozone/store/Storage.jvm.kt
similarity index 100%
rename from app/store/src/desktopMain/kotlin/sh/christian/ozone/store/jvmStorage.kt
rename to app/store/src/desktopMain/kotlin/sh/christian/ozone/store/Storage.jvm.kt
diff --git a/app/store/src/jsMain/kotlin/sh/christian/ozone/store/jsStorage.kt b/app/store/src/jsMain/kotlin/sh/christian/ozone/store/Storage.js.kt
similarity index 100%
rename from app/store/src/jsMain/kotlin/sh/christian/ozone/store/jsStorage.kt
rename to app/store/src/jsMain/kotlin/sh/christian/ozone/store/Storage.js.kt