diff --git a/build.gradle.kts b/build.gradle.kts
index 6e33a6c..cd86067 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,8 @@ subprojects {
         }
     }
 
-    val projectName = project.property("artifact-id") as String
+    val moduleName = project.findProperty("artifact-id") as String?
+    val projectName = "pubsub${if (moduleName == null) "" else "-$moduleName"}"
     val signRequired = project.hasProperty("sign-required")
 
     extensions.configure<MavenPublishBaseExtension> {
diff --git a/common/gradle.properties b/common/gradle.properties
deleted file mode 100644
index 36d7d3d..0000000
--- a/common/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-artifact-id=pubsub
diff --git a/jackson/gradle.properties b/jackson/gradle.properties
index 469fd60..0dfee20 100644
--- a/jackson/gradle.properties
+++ b/jackson/gradle.properties
@@ -1 +1 @@
-artifact-id=pubsub-jackson
+artifact-id=jackson
diff --git a/kotlin/coroutines/gradle.properties b/kotlin/coroutines/gradle.properties
index e3159f0..49750fd 100644
--- a/kotlin/coroutines/gradle.properties
+++ b/kotlin/coroutines/gradle.properties
@@ -1 +1 @@
-artifact-id=pubsub-kotlin-coroutines
+artifact-id=kotlin-coroutines
diff --git a/kotlin/extensions/gradle.properties b/kotlin/extensions/gradle.properties
index 03c31f9..692e222 100644
--- a/kotlin/extensions/gradle.properties
+++ b/kotlin/extensions/gradle.properties
@@ -1 +1 @@
-artifact-id=pubsub-kotlin
+artifact-id=kotlin
diff --git a/kotlin/protobuf/gradle.properties b/kotlin/protobuf/gradle.properties
index 524d8d3..c97fb66 100644
--- a/kotlin/protobuf/gradle.properties
+++ b/kotlin/protobuf/gradle.properties
@@ -1 +1 @@
-artifact-id=pubsub-kotlin-protobuf
+artifact-id=kotlin-protobuf
diff --git a/redis/gradle.properties b/redis/gradle.properties
index e0ce7b0..e2dd57b 100644
--- a/redis/gradle.properties
+++ b/redis/gradle.properties
@@ -1 +1 @@
-artifact-id=pubsub-redis
+artifact-id=redis