diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index 6151250c599..48e67e8d737 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.google.protobuf'
 
 def baseArtifactId = project.baseId
 def artifactGroupId = project.groupId
-def javaBaseName = "_GROUP_edu_wpi_first_${project.baseId}_ID_${project.baseId}-java_CLS"
+def javaBaseName = "_GROUP_${project.groupId.replace('.', '_')}_ID_${project.baseId}-java_CLS"
 
 def outputsFolder = file("$project.buildDir/outputs")