diff --git a/build.gradle b/build.gradle
index 80faedb983..d2b001c4eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,10 +129,12 @@ publishing {
       from components.java
 
       artifact(javadocJar)
+
+      module "classpath-avian"
     }
 
-    create("tools-${currentPlatformArch}", IvyPublication) {
-      module "avian-tools-${currentPlatformArch}"
+    create("tools-avian-${currentPlatformArch}", IvyPublication) {
+      module "tools-avian-${currentPlatformArch}"
 
       def publishBinSuffix = currentPlatform == "windows" ? "exe" : "bin"
       def binSuffix = currentPlatform == "windows" ? ".exe" : ""
@@ -155,12 +157,12 @@ publishing {
           binSuffix = ".${publishBinSuffix}"
         }
 
-        module "${project.name}-${platform.name}"
+        module "runtime-avian-${platform.name}"
 
         artifact("${nativeBuildDir}/avian${binSuffix}") {
           name "avian"
           type publishBinSuffix
-          extension publishBinSuffix
+          extension binSuffix
         }
 
         artifact("${nativeBuildDir}/libavian.a") {
diff --git a/gradle.properties b/gradle.properties
index c9cd254b82..2afe5bbe98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=true
 
-group=com.readytalk
+group=com.readytalk.avian
 version=1.1.0-SNAPSHOT
\ No newline at end of file