diff --git a/app-tv/build.gradle.kts b/app-tv/build.gradle.kts
index 176fc694..ecf354ad 100644
--- a/app-tv/build.gradle.kts
+++ b/app-tv/build.gradle.kts
@@ -53,7 +53,7 @@ kotlin {
 dependencies {
     implementation(project(":data"))
     implementation(project(":core"))
-    implementation(project(":ui-common"))
+    implementation(project(":core-ui"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ffbe47a7..19328b8f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -52,7 +52,7 @@ kotlin {
 dependencies {
     implementation(project(":data"))
     implementation(project(":core"))
-    implementation(project(":ui-common"))
+    implementation(project(":core-ui"))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
diff --git a/ui-common/build.gradle.kts b/core-ui/build.gradle.kts
similarity index 100%
rename from ui-common/build.gradle.kts
rename to core-ui/build.gradle.kts
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/UnwatchedEpisodeBadge.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/badge/WatchStateBadge.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/bar/MediaProgressBar.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/bar/MediaProgressBar.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/bar/MediaProgressBar.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/bar/MediaProgressBar.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/CircularIconButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/CircularIconButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/CircularIconButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/CircularIconButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/GhostIconButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/GhostIconButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/GhostIconButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/GhostIconButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/MediaActionButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaActionButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/MediaActionButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaActionButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/MediaResumeButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinIconButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/button/PurefinTextButton.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/image/PurefinAsyncImage.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/image/PurefinAsyncImage.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/image/PurefinAsyncImage.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/image/PurefinAsyncImage.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailComponents.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaMetadataFlowRow.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaMetadataFlowRow.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaMetadataFlowRow.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaMetadataFlowRow.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabel.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabel.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabel.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabel.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlaybackSettings.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlaybackSettings.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlaybackSettings.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaPlaybackSettings.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/media/MediaSynopsis.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinComplexTextField.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/textfield/PurefinPasswordField.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/common/visual/TimedVisibility.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/common/visual/TimedVisibility.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/common/visual/TimedVisibility.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/common/visual/TimedVisibility.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/login/LoginContent.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/login/LoginContent.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/screen/login/LoginContent.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/screen/login/LoginContent.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerLoadingErrorEndCardContent.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/screen/player/components/PlayerSeekBarTrack.kt
diff --git a/ui-common/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt b/core-ui/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt
similarity index 100%
rename from ui-common/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt
rename to core-ui/src/main/java/hu/bbara/purefin/ui/screen/waiting/WaitingScreen.kt
diff --git a/ui-common/src/test/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabelTest.kt b/core-ui/src/test/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabelTest.kt
similarity index 100%
rename from ui-common/src/test/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabelTest.kt
rename to core-ui/src/test/java/hu/bbara/purefin/ui/common/media/MediaPlayButtonLabelTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 40fd3cd9..5848f3b6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,4 +27,4 @@ include(":app")
 include(":app-tv")
 include(":data")
 include(":core")
-include(":ui-common")
+include(":core-ui")