diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts
index 7b2948f27..2f1bc16ee 100644
--- a/multisrc/build.gradle.kts
+++ b/multisrc/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     // Note that this does not mean that generated sources are going to
     // implement them too; this is just to be able to compile and generate sources.
     rootProject.subprojects
-        .filter { it.path.startsWith(":lib") }
+        .filter { it.path.startsWith(":lib:") }
         .forEach(::implementation)
 }
 
diff --git a/multisrc/overrides/madara/default/additional.gradle b/multisrc/overrides/madara/default/additional.gradle
index 214a0df0e..48c2499a0 100644
--- a/multisrc/overrides/madara/default/additional.gradle
+++ b/multisrc/overrides/madara/default/additional.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-cryptoaes"))
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:cryptoaes"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/multisrc/overrides/madara/shinigami/additional.gradle b/multisrc/overrides/madara/shinigami/additional.gradle
index 56e3d5c86..0ffbe4386 100644
--- a/multisrc/overrides/madara/shinigami/additional.gradle
+++ b/multisrc/overrides/madara/shinigami/additional.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-synchrony"))
+    implementation(project(":lib:synchrony"))
 }
diff --git a/multisrc/overrides/mangahub/default/additional.gradle b/multisrc/overrides/mangahub/default/additional.gradle
index 57807a7d0..4020fe0a8 100644
--- a/multisrc/overrides/mangahub/default/additional.gradle
+++ b/multisrc/overrides/mangahub/default/additional.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/multisrc/overrides/mangathemesia/default/additional.gradle b/multisrc/overrides/mangathemesia/default/additional.gradle
index 57807a7d0..4020fe0a8 100644
--- a/multisrc/overrides/mangathemesia/default/additional.gradle
+++ b/multisrc/overrides/mangathemesia/default/additional.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/multisrc/overrides/mmrcms/mangasin/additional.gradle b/multisrc/overrides/mmrcms/mangasin/additional.gradle
index 035df1039..67bf8eb33 100644
--- a/multisrc/overrides/mmrcms/mangasin/additional.gradle
+++ b/multisrc/overrides/mmrcms/mangasin/additional.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    implementation(project(":lib-synchrony"))
-    implementation(project(":lib-cryptoaes"))
-}
\ No newline at end of file
+    implementation(project(":lib:synchrony"))
+    implementation(project(":lib:cryptoaes"))
+}
diff --git a/multisrc/overrides/sinmh/wuqimanga/additional.gradle b/multisrc/overrides/sinmh/wuqimanga/additional.gradle
index 027379881..72d602774 100644
--- a/multisrc/overrides/sinmh/wuqimanga/additional.gradle
+++ b/multisrc/overrides/sinmh/wuqimanga/additional.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation project(':lib-unpacker')
+    implementation project(':lib:unpacker')
 }
diff --git a/multisrc/overrides/webtoons/webtoons/additional.gradle b/multisrc/overrides/webtoons/webtoons/additional.gradle
index 8de52e9e0..f2fd3c255 100644
--- a/multisrc/overrides/webtoons/webtoons/additional.gradle
+++ b/multisrc/overrides/webtoons/webtoons/additional.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    implementation(project(':lib-textinterceptor'))
+    implementation(project(':lib:textinterceptor'))
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3e0631f9e..dd982f424 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,11 +1,7 @@
 include(":core")
 
 // Load all modules under /lib
-File(rootDir, "lib").eachDir {
-    val libName = it.name
-    include(":lib-$libName")
-    project(":lib-$libName").projectDir = File("lib/$libName")
-}
+File(rootDir, "lib").eachDir { include("lib:${it.name}") }
 
 if (System.getenv("CI") == null || System.getenv("CI_MODULE_GEN") == "true") {
     // Local development (full project build)
diff --git a/src/all/batoto/build.gradle b/src/all/batoto/build.gradle
index 215f15289..7c94a845a 100644
--- a/src/all/batoto/build.gradle
+++ b/src/all/batoto/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-cryptoaes'))
+    implementation(project(':lib:cryptoaes'))
 }
diff --git a/src/all/comicfury/build.gradle b/src/all/comicfury/build.gradle
index f5ad8e213..8b228ad84 100644
--- a/src/all/comicfury/build.gradle
+++ b/src/all/comicfury/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-textinterceptor'))
+    implementation(project(':lib:textinterceptor'))
 }
diff --git a/src/all/comickfun/build.gradle b/src/all/comickfun/build.gradle
index 625639ffa..4aa96d636 100644
--- a/src/all/comickfun/build.gradle
+++ b/src/all/comickfun/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-i18n"))
+    implementation(project(":lib:i18n"))
 }
diff --git a/src/all/comico/build.gradle b/src/all/comico/build.gradle
index 45f3ffd47..39ffd2b44 100644
--- a/src/all/comico/build.gradle
+++ b/src/all/comico/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-cryptoaes'))
+    implementation(project(':lib:cryptoaes'))
 }
diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle
index c517cc7ea..d22527e5d 100644
--- a/src/all/mangadex/build.gradle
+++ b/src/all/mangadex/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-i18n"))
+    implementation(project(":lib:i18n"))
 }
diff --git a/src/all/mangaplus/build.gradle b/src/all/mangaplus/build.gradle
index 55083422a..6f4207971 100644
--- a/src/all/mangaplus/build.gradle
+++ b/src/all/mangaplus/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-i18n"))
+    implementation(project(":lib:i18n"))
 }
diff --git a/src/all/nhentai/build.gradle b/src/all/nhentai/build.gradle
index 33c8b2d3a..a070324a2 100644
--- a/src/all/nhentai/build.gradle
+++ b/src/all/nhentai/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/src/all/projectsuki/build.gradle b/src/all/projectsuki/build.gradle
index e2fe1a96a..57007b535 100644
--- a/src/all/projectsuki/build.gradle
+++ b/src/all/projectsuki/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(":lib-randomua")
+    implementation project(":lib:randomua")
 }
diff --git a/src/en/apairof2/build.gradle b/src/en/apairof2/build.gradle
index bfabca39e..3d3560c90 100644
--- a/src/en/apairof2/build.gradle
+++ b/src/en/apairof2/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(':lib-dataimage')
+    implementation project(':lib:dataimage')
 }
diff --git a/src/en/grrlpower/build.gradle b/src/en/grrlpower/build.gradle
index c8f0ab68d..8e9cf3654 100644
--- a/src/en/grrlpower/build.gradle
+++ b/src/en/grrlpower/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-textinterceptor'))
+    implementation(project(':lib:textinterceptor'))
 }
diff --git a/src/en/mangago/build.gradle b/src/en/mangago/build.gradle
index a3ce0711d..0f5b1afbe 100644
--- a/src/en/mangago/build.gradle
+++ b/src/en/mangago/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-cryptoaes'))
+    implementation(project(':lib:cryptoaes'))
 }
diff --git a/src/en/questionablecontent/build.gradle b/src/en/questionablecontent/build.gradle
index 1987ff59a..b8c1f4b6f 100644
--- a/src/en/questionablecontent/build.gradle
+++ b/src/en/questionablecontent/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-textinterceptor'))
+    implementation(project(':lib:textinterceptor'))
 }
diff --git a/src/en/readcomiconline/build.gradle b/src/en/readcomiconline/build.gradle
index 0bf32f106..8c10cbc99 100644
--- a/src/en/readcomiconline/build.gradle
+++ b/src/en/readcomiconline/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-synchrony"))
+    implementation(project(":lib:synchrony"))
 }
diff --git a/src/en/tapastic/build.gradle b/src/en/tapastic/build.gradle
index 6ab491c86..48606be86 100644
--- a/src/en/tapastic/build.gradle
+++ b/src/en/tapastic/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-textinterceptor'))
+    implementation(project(':lib:textinterceptor'))
 }
diff --git a/src/es/leercapitulo/build.gradle b/src/es/leercapitulo/build.gradle
index 01bec8c37..2e2b6ea31 100644
--- a/src/es/leercapitulo/build.gradle
+++ b/src/es/leercapitulo/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-synchrony"))
+    implementation(project(":lib:synchrony"))
 }
diff --git a/src/id/doujindesu/build.gradle b/src/id/doujindesu/build.gradle
index 888895b06..9e27ab814 100644
--- a/src/id/doujindesu/build.gradle
+++ b/src/id/doujindesu/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/src/id/mangaku/build.gradle b/src/id/mangaku/build.gradle
index f936a8122..506e78de5 100644
--- a/src/id/mangaku/build.gradle
+++ b/src/id/mangaku/build.gradle
@@ -7,6 +7,6 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(':lib-cryptoaes'))
-    implementation(project(':lib-unpacker'))
+    implementation(project(':lib:cryptoaes'))
+    implementation(project(':lib:unpacker'))
 }
diff --git a/src/ru/newbie/build.gradle b/src/ru/newbie/build.gradle
index 5ef990396..597fbd110 100644
--- a/src/ru/newbie/build.gradle
+++ b/src/ru/newbie/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(':lib-dataimage')
+    implementation project(':lib:dataimage')
 }
diff --git a/src/tr/mangaship/build.gradle b/src/tr/mangaship/build.gradle
index ed0acbb4f..e9c071c5e 100644
--- a/src/tr/mangaship/build.gradle
+++ b/src/tr/mangaship/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(':lib-dataimage')
+    implementation project(':lib:dataimage')
 }
diff --git a/src/vi/hentaivn/build.gradle b/src/vi/hentaivn/build.gradle
index 17244e888..5e7d4a0c5 100644
--- a/src/vi/hentaivn/build.gradle
+++ b/src/vi/hentaivn/build.gradle
@@ -8,5 +8,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-randomua"))
+    implementation(project(":lib:randomua"))
 }
diff --git a/src/zh/mangabz/build.gradle b/src/zh/mangabz/build.gradle
index 28be22ef6..974507e7a 100644
--- a/src/zh/mangabz/build.gradle
+++ b/src/zh/mangabz/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(':lib-unpacker')
+    implementation project(':lib:unpacker')
 }
diff --git a/src/zh/onemanhua/build.gradle b/src/zh/onemanhua/build.gradle
index 53bb80db0..a6251657e 100644
--- a/src/zh/onemanhua/build.gradle
+++ b/src/zh/onemanhua/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation(project(":lib-synchrony"))
+    implementation(project(":lib:synchrony"))
 }
diff --git a/src/zh/sixmh/build.gradle b/src/zh/sixmh/build.gradle
index 6fc5bce98..dce0b2676 100644
--- a/src/zh/sixmh/build.gradle
+++ b/src/zh/sixmh/build.gradle
@@ -7,5 +7,5 @@ ext {
 apply from: "$rootDir/common.gradle"
 
 dependencies {
-    implementation project(':lib-unpacker')
+    implementation project(':lib:unpacker')
 }