diff --git a/apriltag/BUILD.bazel b/apriltag/BUILD.bazel
index b0d3c1e19a..01f771c83f 100644
--- a/apriltag/BUILD.bazel
+++ b/apriltag/BUILD.bazel
@@ -133,7 +133,7 @@ wpilib_jni_java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     extra_source_pkgs = ["resources"],
     maven_artifact_name = "apriltag-java",
-    maven_group_id = "edu.wpi.first.apriltag",
+    maven_group_id = "org.wpilib.apriltag",
     native_libs = [":apriltagjni"],
     resource_strip_prefix = "apriltag/src/main/native/resources",
     resources = glob(["src/main/native/resources/**"]),
@@ -210,5 +210,5 @@ py_binary(
 package_minimal_jni_project(
     name = "apriltag",
     maven_artifact_name = "apriltag-cpp",
-    maven_group_id = "edu.wpi.first.apriltag",
+    maven_group_id = "org.wpilib.apriltag",
 )
diff --git a/cameraserver/BUILD.bazel b/cameraserver/BUILD.bazel
index 7bc46e247c..50bedb393e 100644
--- a/cameraserver/BUILD.bazel
+++ b/cameraserver/BUILD.bazel
@@ -54,7 +54,7 @@ wpilib_java_library(
     name = "cameraserver-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "cameraserver-java",
-    maven_group_id = "edu.wpi.first.cameraserver",
+    maven_group_id = "org.wpilib.cameraserver",
     visibility = ["//visibility:public"],
     deps = [
         "//cscore:cscore-java",
@@ -96,5 +96,5 @@ java_binary(
 package_minimal_cc_project(
     name = "cameraserver",
     maven_artifact_name = "cameraserver-cpp",
-    maven_group_id = "edu.wpi.first.cameraserver",
+    maven_group_id = "org.wpilib.cameraserver",
 )
diff --git a/cameraserver/build.gradle b/cameraserver/build.gradle
index 92925c6564..6543971844 100644
--- a/cameraserver/build.gradle
+++ b/cameraserver/build.gradle
@@ -1,6 +1,6 @@
 ext {
     nativeName = 'cameraserver'
-    devMain = 'edu.wpi.first.cameraserver.DevMain'
+    devMain = 'org.wpilib.cameraserver.DevMain'
 }
 
 evaluationDependsOn(':ntcore')
diff --git a/commandsv2/BUILD.bazel b/commandsv2/BUILD.bazel
index 402c2305db..86be7d837c 100644
--- a/commandsv2/BUILD.bazel
+++ b/commandsv2/BUILD.bazel
@@ -106,7 +106,7 @@ wpilib_java_library(
     srcs = glob(["src/main/java/**/*.java"]) + [":generated_java"],
     exported_plugins = ["//javacPlugin:plugin"],
     maven_artifact_name = "commandsv2-java",
-    maven_group_id = "edu.wpi.first.commandsv2",
+    maven_group_id = "org.wpilib.commandsv2",
     plugins = ["//javacPlugin:plugin"],
     visibility = ["//visibility:public"],
     deps = [
@@ -181,5 +181,5 @@ java_binary(
 package_minimal_cc_project(
     name = "commandsv2",
     maven_artifact_name = "commandsv2-cpp",
-    maven_group_id = "edu.wpi.first.commandsv2",
+    maven_group_id = "org.wpilib.commandsv2",
 )
diff --git a/commandsv2/build.gradle b/commandsv2/build.gradle
index 0d137721b4..16359c2ce1 100644
--- a/commandsv2/build.gradle
+++ b/commandsv2/build.gradle
@@ -1,6 +1,6 @@
 ext {
     nativeName = 'commandsv2'
-    devMain = 'edu.wpi.first.wpilibj2.commands.DevMain'
+    devMain = 'org.wpilib.commandsv2.DevMain'
 }
 
 evaluationDependsOn(':ntcore')
diff --git a/cscore/BUILD.bazel b/cscore/BUILD.bazel
index 6da0c35c7e..420bc3d2f4 100644
--- a/cscore/BUILD.bazel
+++ b/cscore/BUILD.bazel
@@ -210,7 +210,7 @@ wpilib_jni_java_library(
     name = "cscore-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "cscore-java",
-    maven_group_id = "edu.wpi.first.cscore",
+    maven_group_id = "org.wpilib.cscore",
     native_libs = [":cscorejni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -281,7 +281,7 @@ java_binary(
 package_minimal_jni_project(
     name = "cscore",
     maven_artifact_name = "cscore-cpp",
-    maven_group_id = "edu.wpi.first.cscore",
+    maven_group_id = "org.wpilib.cscore",
 )
 
 alias(
diff --git a/cscore/build.gradle b/cscore/build.gradle
index ffbdb9d063..2f98aa800d 100644
--- a/cscore/build.gradle
+++ b/cscore/build.gradle
@@ -2,7 +2,7 @@ import org.gradle.internal.os.OperatingSystem
 
 ext {
     nativeName = 'cscore'
-    devMain = 'edu.wpi.first.cscore.DevMain'
+    devMain = 'org.wpilib.cscore.DevMain'
 }
 
 // Removed because having the objective-cpp plugin added breaks
diff --git a/datalog/BUILD.bazel b/datalog/BUILD.bazel
index 0b10834dcd..510e3564fe 100644
--- a/datalog/BUILD.bazel
+++ b/datalog/BUILD.bazel
@@ -69,7 +69,7 @@ wpilib_jni_java_library(
     name = "datalog-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "datalog-java",
-    maven_group_id = "edu.wpi.first.datalog",
+    maven_group_id = "org.wpilib.datalog",
     native_libs = [":datalogjni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -144,5 +144,5 @@ wpilib_java_junit5_test(
 package_minimal_jni_project(
     name = "datalog",
     maven_artifact_name = "datalog-cpp",
-    maven_group_id = "edu.wpi.first.datalog",
+    maven_group_id = "org.wpilib.datalog",
 )
diff --git a/datalog/build.gradle b/datalog/build.gradle
index 55a23c227a..d6746c43ff 100644
--- a/datalog/build.gradle
+++ b/datalog/build.gradle
@@ -2,10 +2,10 @@ ext {
     useJava = true
     useCpp = true
     baseId = 'datalog'
-    groupId = 'edu.wpi.first.datalog'
+    groupId = 'org.wpilib.datalog'
 
     nativeName = 'datalog'
-    devMain = 'edu.wpi.first.datalog.DevMain'
+    devMain = 'org.wpilib.datalog.DevMain'
 }
 
 apply from: "${rootDir}/shared/jni/setupBuild.gradle"
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
index 0ecbdedf70..e505e21282 100644
--- a/docs/BUILD.bazel
+++ b/docs/BUILD.bazel
@@ -96,7 +96,7 @@ pkg_zip(
 
 maven_export(
     name = "wpilibc_publish",
-    maven_coordinates = "edu.wpi.first.wpilibc:documentation:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibc:documentation:$(WPILIB_VERSION)",
     target = ":doxygen-zip",
     visibility = ["//visibility:public"],
 )
@@ -130,7 +130,7 @@ copy_file(
 
 maven_export(
     name = "wpilibj_publish",
-    maven_coordinates = "edu.wpi.first.wpilibj:documentation:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibj:documentation:$(WPILIB_VERSION)",
     target = ":javadoc-zip",
     visibility = ["//visibility:public"],
 )
diff --git a/docs/build.gradle b/docs/build.gradle
index d9494b7d15..773059b6f7 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -22,12 +22,12 @@ evaluationDependsOn(':romiVendordep')
 evaluationDependsOn(':xrpVendordep')
 
 def baseArtifactIdCpp = 'documentation'
-def artifactGroupIdCpp = 'edu.wpi.first.wpilibc'
-def zipBaseNameCpp = '_GROUP_edu_wpi_first_wpilibc_ID_documentation_CLS'
+def artifactGroupIdCpp = 'org.wpilib.wpilibc'
+def zipBaseNameCpp = '_GROUP_org_wpilib_wpilibc_ID_documentation_CLS'
 
 def baseArtifactIdJava = 'documentation'
-def artifactGroupIdJava = 'edu.wpi.first.wpilibj'
-def zipBaseNameJava = '_GROUP_edu_wpi_first_wpilibj_ID_documentation_CLS'
+def artifactGroupIdJava = 'org.wpilib.wpilibj'
+def zipBaseNameJava = '_GROUP_org_wpilib_wpilibj_ID_documentation_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/epilogue-processor/BUILD.bazel b/epilogue-processor/BUILD.bazel
index 8db0962590..7c9f4cc41a 100644
--- a/epilogue-processor/BUILD.bazel
+++ b/epilogue-processor/BUILD.bazel
@@ -7,7 +7,7 @@ wpilib_java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     extra_source_pkgs = ["resources"],
     maven_artifact_name = "epilogue-processor-java",
-    maven_group_id = "edu.wpi.first.epilogue",
+    maven_group_id = "org.wpilib.epilogue",
     resource_strip_prefix = "epilogue-processor/src/main/resources/",
     resources = glob(["src/main/resources/**"]),
     visibility = ["//visibility:public"],
diff --git a/epilogue-processor/build.gradle b/epilogue-processor/build.gradle
index f2efd47b36..5db590e459 100644
--- a/epilogue-processor/build.gradle
+++ b/epilogue-processor/build.gradle
@@ -2,7 +2,7 @@ ext {
     useJava = true
     useCpp = false
     baseId = 'epilogue-processor'
-    groupId = 'edu.wpi.first.epilogue'
+    groupId = 'org.wpilib.epilogue'
 
     devMain = ''
 }
diff --git a/epilogue-runtime/BUILD.bazel b/epilogue-runtime/BUILD.bazel
index 51a7d42076..ecb690f2e0 100644
--- a/epilogue-runtime/BUILD.bazel
+++ b/epilogue-runtime/BUILD.bazel
@@ -4,7 +4,7 @@ wpilib_java_library(
     name = "epilogue-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "epilogue-runtime-java",
-    maven_group_id = "edu.wpi.first.epilogue",
+    maven_group_id = "org.wpilib.epilogue",
     visibility = ["//visibility:public"],
     deps = [
         "//datalog:datalog-java",
diff --git a/epilogue-runtime/build.gradle b/epilogue-runtime/build.gradle
index 020c0d86b8..66ee1e6e75 100644
--- a/epilogue-runtime/build.gradle
+++ b/epilogue-runtime/build.gradle
@@ -2,7 +2,7 @@ ext {
     useJava = true
     useCpp = false
     baseId = 'epilogue-runtime'
-    groupId = 'edu.wpi.first.epilogue'
+    groupId = 'org.wpilib.epilogue'
 
     devMain = ''
 }
diff --git a/fields/BUILD.bazel b/fields/BUILD.bazel
index 3531ee8491..9104cbff33 100644
--- a/fields/BUILD.bazel
+++ b/fields/BUILD.bazel
@@ -37,7 +37,7 @@ wpilib_java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     extra_source_pkgs = ["resources"],
     maven_artifact_name = "fields-java",
-    maven_group_id = "edu.wpi.first.fields",
+    maven_group_id = "org.wpilib.fields",
     resource_strip_prefix = "fields/src/main/native/resources",
     resources = glob(["src/main/native/resources/**"]),
     visibility = ["//visibility:public"],
@@ -64,5 +64,5 @@ wpilib_java_junit5_test(
 package_minimal_cc_project(
     name = "fields",
     maven_artifact_name = "fields-cpp",
-    maven_group_id = "edu.wpi.first.fields",
+    maven_group_id = "org.wpilib.fields",
 )
diff --git a/fields/build.gradle b/fields/build.gradle
index 1a509099e2..7ef7e339b6 100644
--- a/fields/build.gradle
+++ b/fields/build.gradle
@@ -22,8 +22,8 @@ dependencies {
 ext {
     nativeName = 'fields'
     baseId = nativeName
-    groupId = 'edu.wpi.first.fields'
-    devMain = "edu.wpi.first.fields.DevMain"
+    groupId = 'org.wpilib.fields'
+    devMain = "org.wpilib.fields.DevMain"
 }
 
 apply from: "${rootDir}/shared/resources.gradle"
diff --git a/fields/publish.gradle b/fields/publish.gradle
index 9f6307e35f..15cfb4cf5a 100644
--- a/fields/publish.gradle
+++ b/fields/publish.gradle
@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 
 def baseArtifactId = project.nativeName
 def artifactGroupId = project.groupId
-def cppZipBaseName = "_GROUP_edu_wpi_first_fields_ID_${baseArtifactId}-cpp_CLS"
+def cppZipBaseName = "_GROUP_org_wpilib_fields_ID_${baseArtifactId}-cpp_CLS"
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/glass/BUILD.bazel b/glass/BUILD.bazel
index e176dfb025..f645a242df 100644
--- a/glass/BUILD.bazel
+++ b/glass/BUILD.bazel
@@ -102,19 +102,19 @@ cc_binary(
 package_minimal_cc_project(
     name = "glass",
     maven_artifact_name = "libglass",
-    maven_group_id = "edu.wpi.first.glass",
+    maven_group_id = "org.wpilib.glass",
 )
 
 package_minimal_cc_project(
     name = "glassnt",
     maven_artifact_name = "libglassnt",
-    maven_group_id = "edu.wpi.first.glass",
+    maven_group_id = "org.wpilib.glass",
 )
 
 package_binary_cc_project(
     name = "glassapp",
     maven_artifact_name = "Glass",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
     renames = {
         "glassapp": "glass",
     },
diff --git a/glass/publish.gradle b/glass/publish.gradle
index a29ad2401c..383ad31954 100644
--- a/glass/publish.gradle
+++ b/glass/publish.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'Glass'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_Glass_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_Glass_CLS'
 
 def libBaseArtifactId = 'libglass'
-def libArtifactGroupId = 'edu.wpi.first.glass'
-def libZipBaseName = '_GROUP_edu_wpi_first_glass_ID_libglass_CLS'
+def libArtifactGroupId = 'org.wpilib.glass'
+def libZipBaseName = '_GROUP_org_wpilib_glass_ID_libglass_CLS'
 
 def libntBaseArtifactId = 'libglassnt'
-def libntArtifactGroupId = 'edu.wpi.first.glass'
-def libntZipBaseName = '_GROUP_edu_wpi_first_glass_ID_libglassnt_CLS'
+def libntArtifactGroupId = 'org.wpilib.glass'
+def libntZipBaseName = '_GROUP_org_wpilib_glass_ID_libglassnt_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/hal/BUILD.bazel b/hal/BUILD.bazel
index 175c99c2ea..d80a8a94a6 100644
--- a/hal/BUILD.bazel
+++ b/hal/BUILD.bazel
@@ -183,7 +183,7 @@ wpilib_jni_java_library(
     name = "hal-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "hal-java",
-    maven_group_id = "edu.wpi.first.hal",
+    maven_group_id = "org.wpilib.hal",
     native_libs = [":wpiHaljni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -230,5 +230,5 @@ java_binary(
 package_minimal_jni_project(
     name = "wpiHal",
     maven_artifact_name = "hal-cpp",
-    maven_group_id = "edu.wpi.first.hal",
+    maven_group_id = "org.wpilib.hal",
 )
diff --git a/msvcruntime/build.gradle b/msvcruntime/build.gradle
index 732652db66..d09a54ed7d 100644
--- a/msvcruntime/build.gradle
+++ b/msvcruntime/build.gradle
@@ -10,8 +10,8 @@ if (OperatingSystem.current().isWindows()) {
     def outputsFolder = file("$buildDir/outputs")
 
     def baseArtifactId = 'runtime'
-    def artifactGroupId = "edu.wpi.first.msvc"
-    def zipBaseName = "_GROUP_edu_wpi_first_msvc_ID_runtime_CLS"
+    def artifactGroupId = "org.wpilib.msvc"
+    def zipBaseName = "_GROUP_org_wpilib_msvc_ID_runtime_CLS"
 
     def vsLocator = gradle.services.get(VisualStudioLocator)
 
diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel
index d57ee8f658..1f70ad922e 100644
--- a/ntcore/BUILD.bazel
+++ b/ntcore/BUILD.bazel
@@ -162,7 +162,7 @@ wpilib_jni_java_library(
     name = "ntcore-java",
     srcs = glob(["src/main/java/**/*.java"]) + [":generated_java"],
     maven_artifact_name = "ntcore-java",
-    maven_group_id = "edu.wpi.first.ntcore",
+    maven_group_id = "org.wpilib.ntcore",
     native_libs = [":ntcorejni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -222,5 +222,5 @@ java_binary(
 package_default_jni_project(
     name = "ntcore",
     maven_artifact_name = "ntcore-cpp",
-    maven_group_id = "edu.wpi.first.ntcore",
+    maven_group_id = "org.wpilib.ntcore",
 )
diff --git a/ntcoreffi/BUILD.bazel b/ntcoreffi/BUILD.bazel
index 273a1150ab..a019ccaa7c 100644
--- a/ntcoreffi/BUILD.bazel
+++ b/ntcoreffi/BUILD.bazel
@@ -69,5 +69,5 @@ wpilib_cc_shared_library(
 package_shared_cc_project(
     name = "ntcoreffi",
     maven_artifact_name = "ntcoreffi-cpp",
-    maven_group_id = "edu.wpi.first.ntcoreffi",
+    maven_group_id = "org.wpilib.ntcoreffi",
 )
diff --git a/ntcoreffi/build.gradle b/ntcoreffi/build.gradle
index 42645d8aaf..5855715b8d 100644
--- a/ntcoreffi/build.gradle
+++ b/ntcoreffi/build.gradle
@@ -81,8 +81,8 @@ model {
 
 def nativeName = 'ntcoreffi'
 def baseArtifactId = nativeName
-def artifactGroupId = "edu.wpi.first.${nativeName}"
-def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS"
+def artifactGroupId = "org.wpilib.${nativeName}"
+def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS"
 def outputsFolder = file("$project.buildDir/outputs")
 
 evaluationDependsOn(':ntcore')
diff --git a/romiVendordep/BUILD.bazel b/romiVendordep/BUILD.bazel
index 7f65bb689d..5692046935 100644
--- a/romiVendordep/BUILD.bazel
+++ b/romiVendordep/BUILD.bazel
@@ -59,7 +59,7 @@ wpilib_java_library(
     name = "romiVendordep-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "romiVendordep-java",
-    maven_group_id = "edu.wpi.first.romiVendordep",
+    maven_group_id = "org.wpilib.romiVendordep",
     visibility = ["//visibility:public"],
     deps = [
         "//hal:hal-java",
@@ -99,5 +99,5 @@ java_binary(
 package_minimal_cc_project(
     name = "romiVendordep",
     maven_artifact_name = "romiVendordep-cpp",
-    maven_group_id = "edu.wpi.first.romiVendordep",
+    maven_group_id = "org.wpilib.romiVendordep",
 )
diff --git a/romiVendordep/build.gradle b/romiVendordep/build.gradle
index b891c4de40..c93103a36a 100644
--- a/romiVendordep/build.gradle
+++ b/romiVendordep/build.gradle
@@ -1,6 +1,6 @@
 ext {
     nativeName = 'romiVendordep'
-    devMain = 'edu.wpi.first.wpilibj.romi.DevMain'
+    devMain = 'org.wpilib.romi.DevMain'
 }
 
 evaluationDependsOn(":ntcore")
diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle
index 5a83be582a..1b5a8f3347 100644
--- a/shared/javacpp/publish.gradle
+++ b/shared/javacpp/publish.gradle
@@ -3,8 +3,8 @@ apply plugin: 'maven-publish'
 def outputsFolder = file("$buildDir/outputs")
 
 def baseArtifactId = nativeName
-def artifactGroupId = "edu.wpi.first.${nativeName}"
-def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS"
+def artifactGroupId = "org.wpilib.${nativeName}"
+def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS"
 
 def licenseFile = file("$rootDir/license.md")
 
diff --git a/shared/javacpp/setupBuild.gradle b/shared/javacpp/setupBuild.gradle
index c13fc214de..192aced55e 100644
--- a/shared/javacpp/setupBuild.gradle
+++ b/shared/javacpp/setupBuild.gradle
@@ -9,7 +9,7 @@ apply from: "${rootDir}/shared/config.gradle"
 
 ext {
     baseId = nativeName
-    groupId = "edu.wpi.first.${nativeName}"
+    groupId = "org.wpilib.${nativeName}"
 }
 
 apply from: "${rootDir}/shared/java/javacommon.gradle"
diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle
index 0705fa2a98..95927770f3 100644
--- a/shared/jni/publish.gradle
+++ b/shared/jni/publish.gradle
@@ -4,10 +4,10 @@ apply plugin: 'maven-publish'
 def outputsFolder = file("$buildDir/outputs")
 
 def baseArtifactId = nativeName
-def artifactGroupId = "edu.wpi.first.${nativeName}"
-def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS"
+def artifactGroupId = "org.wpilib.${nativeName}"
+def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS"
 ext.zipBaseName = zipBaseName
-def jniCvStaticBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jnicvstatic_CLS"
+def jniCvStaticBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-jnicvstatic_CLS"
 
 def licenseFile = file("$rootDir/license.md")
 
diff --git a/shared/jni/setupBuild.gradle b/shared/jni/setupBuild.gradle
index 60dfbe1fab..e9ce7c0ef9 100644
--- a/shared/jni/setupBuild.gradle
+++ b/shared/jni/setupBuild.gradle
@@ -10,7 +10,7 @@ apply from: "${rootDir}/shared/config.gradle"
 
 ext {
     baseId = nativeName
-    groupId = "edu.wpi.first.${nativeName}"
+    groupId = "org.wpilib.${nativeName}"
 }
 
 apply from: "${rootDir}/shared/java/javacommon.gradle"
diff --git a/shared/plugins/publish.gradle b/shared/plugins/publish.gradle
index 7c7a980b55..6db2b4d584 100644
--- a/shared/plugins/publish.gradle
+++ b/shared/plugins/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = pluginName
-def artifactGroupId = 'edu.wpi.first.halsim'
-def zipBaseName = "_GROUP_edu_wpi_first_halsim_ID_${pluginName}_CLS"
+def artifactGroupId = 'org.wpilib.halsim'
+def zipBaseName = "_GROUP_org_wpilib_halsim_ID_${pluginName}_CLS"
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/simulation/halsim_ds_socket/BUILD.bazel b/simulation/halsim_ds_socket/BUILD.bazel
index 7349c7bab1..212090b3c6 100644
--- a/simulation/halsim_ds_socket/BUILD.bazel
+++ b/simulation/halsim_ds_socket/BUILD.bazel
@@ -88,5 +88,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "halsim_ds_socket",
     maven_artifact_name = "halsim_ds_socket",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_gui/BUILD.bazel b/simulation/halsim_gui/BUILD.bazel
index c72bd44a3b..fdec998e6f 100644
--- a/simulation/halsim_gui/BUILD.bazel
+++ b/simulation/halsim_gui/BUILD.bazel
@@ -144,5 +144,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "halsim_gui",
     maven_artifact_name = "halsim_gui",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_client/BUILD.bazel b/simulation/halsim_ws_client/BUILD.bazel
index 3c485afa71..69cc886f0e 100644
--- a/simulation/halsim_ws_client/BUILD.bazel
+++ b/simulation/halsim_ws_client/BUILD.bazel
@@ -66,5 +66,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "halsim_ws_client",
     maven_artifact_name = "halsim_ws_client",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_core/BUILD.bazel b/simulation/halsim_ws_core/BUILD.bazel
index a148e915b5..dd8df3c531 100644
--- a/simulation/halsim_ws_core/BUILD.bazel
+++ b/simulation/halsim_ws_core/BUILD.bazel
@@ -50,5 +50,5 @@ wpilib_cc_static_library(
 package_minimal_cc_project(
     name = "halsim_ws_core",
     maven_artifact_name = "halsim_ws_core",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_ws_server/BUILD.bazel b/simulation/halsim_ws_server/BUILD.bazel
index 18d3631773..0ce6862652 100644
--- a/simulation/halsim_ws_server/BUILD.bazel
+++ b/simulation/halsim_ws_server/BUILD.bazel
@@ -103,5 +103,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "halsim_ws_server",
     maven_artifact_name = "halsim_ws_server",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/simulation/halsim_xrp/BUILD.bazel b/simulation/halsim_xrp/BUILD.bazel
index 1d3f8cc251..477dda6bed 100644
--- a/simulation/halsim_xrp/BUILD.bazel
+++ b/simulation/halsim_xrp/BUILD.bazel
@@ -79,5 +79,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "halsim_xrp",
     maven_artifact_name = "halsim_xrp",
-    maven_group_id = "edu.wpi.first.halsim",
+    maven_group_id = "org.wpilib.halsim",
 )
diff --git a/tools/datalogtool/BUILD.bazel b/tools/datalogtool/BUILD.bazel
index dbabfdace0..15497fcd07 100644
--- a/tools/datalogtool/BUILD.bazel
+++ b/tools/datalogtool/BUILD.bazel
@@ -60,5 +60,5 @@ cc_binary(
 package_binary_cc_project(
     name = "datalogtool",
     maven_artifact_name = "DataLogTool",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
 )
diff --git a/tools/datalogtool/publish.gradle b/tools/datalogtool/publish.gradle
index 4f433961a9..40d8fdb198 100644
--- a/tools/datalogtool/publish.gradle
+++ b/tools/datalogtool/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'DataLogTool'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_DataLogTool_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_DataLogTool_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/tools/outlineviewer/BUILD.bazel b/tools/outlineviewer/BUILD.bazel
index b66832d7d6..d67f2edcfd 100644
--- a/tools/outlineviewer/BUILD.bazel
+++ b/tools/outlineviewer/BUILD.bazel
@@ -43,5 +43,5 @@ cc_binary(
 package_binary_cc_project(
     name = "outlineviewer",
     maven_artifact_name = "OutlineViewer",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
 )
diff --git a/tools/outlineviewer/publish.gradle b/tools/outlineviewer/publish.gradle
index 824962e690..4e29617b00 100644
--- a/tools/outlineviewer/publish.gradle
+++ b/tools/outlineviewer/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'OutlineViewer'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_OutlineViewer_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_OutlineViewer_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/tools/processstarter/BUILD.bazel b/tools/processstarter/BUILD.bazel
index bf8abb1a3d..8ef48b485b 100644
--- a/tools/processstarter/BUILD.bazel
+++ b/tools/processstarter/BUILD.bazel
@@ -47,5 +47,5 @@ cc_binary(
 package_binary_cc_project(
     name = "processstarter",
     maven_artifact_name = "processstarter",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
 )
diff --git a/tools/processstarter/publish.gradle b/tools/processstarter/publish.gradle
index 1fca11019c..b6e292a4d2 100644
--- a/tools/processstarter/publish.gradle
+++ b/tools/processstarter/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'processstarter'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_processstarter_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_processstarter_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/tools/sysid/BUILD.bazel b/tools/sysid/BUILD.bazel
index 9b2fd1d320..27f682ee9a 100644
--- a/tools/sysid/BUILD.bazel
+++ b/tools/sysid/BUILD.bazel
@@ -60,5 +60,5 @@ cc_test(
 package_binary_cc_project(
     name = "sysid",
     maven_artifact_name = "SysId",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
 )
diff --git a/tools/sysid/publish.gradle b/tools/sysid/publish.gradle
index a891b138d9..ea0ed704d9 100644
--- a/tools/sysid/publish.gradle
+++ b/tools/sysid/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'SysId'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_SysId_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_SysId_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/tools/wpical/BUILD.bazel b/tools/wpical/BUILD.bazel
index 35c8a64705..9d3e6a30f0 100644
--- a/tools/wpical/BUILD.bazel
+++ b/tools/wpical/BUILD.bazel
@@ -243,5 +243,5 @@ package_binary_cc_project(
     name = "wpical",
     extra_files = [":licenses"],
     maven_artifact_name = "wpical",
-    maven_group_id = "edu.wpi.first.tools",
+    maven_group_id = "org.wpilib.tools",
 )
diff --git a/tools/wpical/publish.gradle b/tools/wpical/publish.gradle
index 16875347b8..e324f3f4a3 100644
--- a/tools/wpical/publish.gradle
+++ b/tools/wpical/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'wpical'
-def artifactGroupId = 'edu.wpi.first.tools'
-def zipBaseName = '_GROUP_edu_wpi_first_tools_ID_wpical_CLS'
+def artifactGroupId = 'org.wpilib.tools'
+def zipBaseName = '_GROUP_org_wpilib_tools_ID_wpical_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/wpigui/BUILD.bazel b/wpigui/BUILD.bazel
index cf8e6d3f38..b40adec141 100644
--- a/wpigui/BUILD.bazel
+++ b/wpigui/BUILD.bazel
@@ -86,5 +86,5 @@ wpilib_cc_static_library(
 package_minimal_cc_project(
     name = "wpigui",
     maven_artifact_name = "wpigui-cpp",
-    maven_group_id = "edu.wpi.first.wpigui",
+    maven_group_id = "org.wpilib.wpigui",
 )
diff --git a/wpigui/publish.gradle b/wpigui/publish.gradle
index 6c102cc389..9e0270e566 100644
--- a/wpigui/publish.gradle
+++ b/wpigui/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'wpigui-cpp'
-def artifactGroupId = 'edu.wpi.first.wpigui'
-def zipBaseName = '_GROUP_edu_wpi_first_wpigui_ID_wpigui-cpp_CLS'
+def artifactGroupId = 'org.wpilib.wpigui'
+def zipBaseName = '_GROUP_org_wpilib_wpigui_ID_wpigui-cpp_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/wpilibc/BUILD.bazel b/wpilibc/BUILD.bazel
index 9f428c7a88..c8a8da971c 100644
--- a/wpilibc/BUILD.bazel
+++ b/wpilibc/BUILD.bazel
@@ -197,5 +197,5 @@ cc_binary(
 package_minimal_cc_project(
     name = "wpilibc",
     maven_artifact_name = "wpilibc-cpp",
-    maven_group_id = "edu.wpi.first.wpilibc",
+    maven_group_id = "org.wpilib.wpilibc",
 )
diff --git a/wpilibc/publish.gradle b/wpilibc/publish.gradle
index 9d72ba6024..b3b2dbf112 100644
--- a/wpilibc/publish.gradle
+++ b/wpilibc/publish.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'maven-publish'
 
 def baseArtifactId = 'wpilibc-cpp'
-def artifactGroupId = 'edu.wpi.first.wpilibc'
-def zipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_wpilibc-cpp_CLS'
+def artifactGroupId = 'org.wpilib.wpilibc'
+def zipBaseName = '_GROUP_org_wpilib_wpilibc_ID_wpilibc-cpp_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/wpilibcExamples/BUILD.bazel b/wpilibcExamples/BUILD.bazel
index 04881260ab..9f8ed500f7 100644
--- a/wpilibcExamples/BUILD.bazel
+++ b/wpilibcExamples/BUILD.bazel
@@ -52,21 +52,21 @@ build_tests()
 
 maven_export(
     name = "examples_publish",
-    maven_coordinates = "edu.wpi.first.wpilibc:examples:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibc:examples:$(WPILIB_VERSION)",
     target = ":examples-zip",
     visibility = ["//visibility:public"],
 )
 
 maven_export(
     name = "commands_publish",
-    maven_coordinates = "edu.wpi.first.wpilibc:commands:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibc:commands:$(WPILIB_VERSION)",
     target = ":commands-zip",
     visibility = ["//visibility:public"],
 )
 
 maven_export(
     name = "templates_publish",
-    maven_coordinates = "edu.wpi.first.wpilibc:templates:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibc:templates:$(WPILIB_VERSION)",
     target = ":templates-zip",
     visibility = ["//visibility:public"],
 )
diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle
index 0918ea6921..49a157f56d 100644
--- a/wpilibcExamples/publish.gradle
+++ b/wpilibcExamples/publish.gradle
@@ -3,11 +3,11 @@ apply plugin: 'maven-publish'
 def baseExamplesArtifactId = 'examples'
 def baseTemplatesArtifactId = 'templates'
 def baseCommandsArtifactId = 'commands'
-def artifactGroupId = 'edu.wpi.first.wpilibc'
+def artifactGroupId = 'org.wpilib.wpilibc'
 
-def examplesZipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_examples_CLS'
-def templatesZipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_templates_CLS'
-def commandsZipBaseName = '_GROUP_edu_wpi_first_wpilibc_ID_commands_CLS'
+def examplesZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_examples_CLS'
+def templatesZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_templates_CLS'
+def commandsZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_commands_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/wpilibj/BUILD.bazel b/wpilibj/BUILD.bazel
index 30d28579d2..89c065bde8 100644
--- a/wpilibj/BUILD.bazel
+++ b/wpilibj/BUILD.bazel
@@ -78,7 +78,7 @@ wpilib_java_library(
     ] + glob(["src/main/java/**/*.java"]),
     extra_source_pkgs = ["generated_version_files"],
     maven_artifact_name = "wpilibj-java",
-    maven_group_id = "edu.wpi.first.wpilibj",
+    maven_group_id = "org.wpilib.wpilibj",
     visibility = ["//visibility:public"],
     deps = [
         "//cameraserver:cameraserver-java",
diff --git a/wpilibj/build.gradle b/wpilibj/build.gradle
index 0e5620c10d..1e7ce9c205 100644
--- a/wpilibj/build.gradle
+++ b/wpilibj/build.gradle
@@ -5,8 +5,8 @@ evaluationDependsOn(':cameraserver')
 
 ext {
     baseId = 'wpilibj'
-    groupId = 'edu.wpi.first.wpilibj'
-    devMain = 'edu.wpi.first.wpilibj.DevMain'
+    groupId = 'org.wpilib.wpilibj'
+    devMain = 'org.wpilib.wpilibj.DevMain'
 }
 
 apply from: "${rootDir}/shared/java/javacommon.gradle"
diff --git a/wpilibjExamples/BUILD.bazel b/wpilibjExamples/BUILD.bazel
index bd65719aaf..2ddedb4452 100644
--- a/wpilibjExamples/BUILD.bazel
+++ b/wpilibjExamples/BUILD.bazel
@@ -50,21 +50,21 @@ build_tests()
 
 maven_export(
     name = "examples_publish",
-    maven_coordinates = "edu.wpi.first.wpilibj:examples:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibj:examples:$(WPILIB_VERSION)",
     target = ":examples-zip",
     visibility = ["//visibility:public"],
 )
 
 maven_export(
     name = "commands_publish",
-    maven_coordinates = "edu.wpi.first.wpilibj:commands:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibj:commands:$(WPILIB_VERSION)",
     target = ":commands-zip",
     visibility = ["//visibility:public"],
 )
 
 maven_export(
     name = "templates_publish",
-    maven_coordinates = "edu.wpi.first.wpilibj:templates:$(WPILIB_VERSION)",
+    maven_coordinates = "org.wpilib.wpilibj:templates:$(WPILIB_VERSION)",
     target = ":templates-zip",
     visibility = ["//visibility:public"],
 )
diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle
index 02c82ca847..30ea83a293 100644
--- a/wpilibjExamples/publish.gradle
+++ b/wpilibjExamples/publish.gradle
@@ -3,11 +3,11 @@ apply plugin: 'maven-publish'
 def baseExamplesArtifactId = 'examples'
 def baseTemplatesArtifactId = 'templates'
 def baseCommandsArtifactId = 'commands'
-def artifactGroupId = 'edu.wpi.first.wpilibj'
+def artifactGroupId = 'org.wpilib.wpilibj'
 
-def examplesZipBaseName = '_GROUP_edu_wpi_first_wpilibj_ID_examples_CLS'
-def templatesZipBaseName = '_GROUP_edu_wpi_first_wpilibj_ID_templates_CLS'
-def commandsZipBaseName = '_GROUP_edu_wpi_first_wpilibj_ID_commands_CLS'
+def examplesZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_examples_CLS'
+def templatesZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_templates_CLS'
+def commandsZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_commands_CLS'
 
 def outputsFolder = file("$project.buildDir/outputs")
 
diff --git a/wpimath/BUILD.bazel b/wpimath/BUILD.bazel
index 1a8a02c0ef..61f0b905e6 100644
--- a/wpimath/BUILD.bazel
+++ b/wpimath/BUILD.bazel
@@ -232,7 +232,7 @@ wpilib_jni_java_library(
     name = "wpimath-java",
     srcs = [":generated_java"] + glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "wpimath-java",
-    maven_group_id = "edu.wpi.first.wpimath",
+    maven_group_id = "org.wpilib.wpimath",
     native_libs = [":wpimathjni"],
     resource_strip_prefix = "wpimath/src/main/proto",
     resources = glob(["src/main/proto/**"]),
@@ -317,5 +317,5 @@ py_binary(
 package_default_jni_project(
     name = "wpimath",
     maven_artifact_name = "wpimath-cpp",
-    maven_group_id = "edu.wpi.first.wpimath",
+    maven_group_id = "org.wpilib.wpimath",
 )
diff --git a/wpimath/build.gradle b/wpimath/build.gradle
index b16e9e2826..e797ab482e 100644
--- a/wpimath/build.gradle
+++ b/wpimath/build.gradle
@@ -2,7 +2,7 @@ ext {
     useJava = true
     useCpp = true
     baseId = 'wpimath'
-    groupId = 'edu.wpi.first.wpimath'
+    groupId = 'org.wpilib.wpimath'
 
     nativeName = 'wpimath'
     devMain = 'org.wpilib.math.DevMain'
diff --git a/wpinet/BUILD.bazel b/wpinet/BUILD.bazel
index 6d3c7ede3b..1334f4607f 100644
--- a/wpinet/BUILD.bazel
+++ b/wpinet/BUILD.bazel
@@ -208,7 +208,7 @@ wpilib_jni_java_library(
     name = "wpinet-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "wpinet-java",
-    maven_group_id = "edu.wpi.first.wpinet",
+    maven_group_id = "org.wpilib.wpinet",
     native_libs = [":wpinetjni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -353,5 +353,5 @@ robotpy_py_test(
 package_minimal_jni_project(
     name = "wpinet",
     maven_artifact_name = "wpinet-cpp",
-    maven_group_id = "edu.wpi.first.wpinet",
+    maven_group_id = "org.wpilib.wpinet",
 )
diff --git a/wpinet/build.gradle b/wpinet/build.gradle
index 7edb74a966..0964ea7be1 100644
--- a/wpinet/build.gradle
+++ b/wpinet/build.gradle
@@ -1,9 +1,9 @@
 ext {
     baseId = 'wpinet'
-    groupId = 'edu.wpi.first.net'
+    groupId = 'org.wpilib.net'
 
     nativeName = 'wpinet'
-    devMain = 'edu.wpi.first.net.DevMain'
+    devMain = 'org.wpilib.net.DevMain'
 
     splitSetup = {
         it.sources {
diff --git a/wpiunits/BUILD.bazel b/wpiunits/BUILD.bazel
index db0d7deba7..b97e0e60ce 100644
--- a/wpiunits/BUILD.bazel
+++ b/wpiunits/BUILD.bazel
@@ -34,7 +34,7 @@ wpilib_java_library(
     name = "wpiunits-java",
     srcs = glob(["src/main/java/**/*.java"]) + glob(["src/generated/main/java/**/*.java"]),
     maven_artifact_name = "wpiunits-java",
-    maven_group_id = "edu.wpi.first.wpiunits",
+    maven_group_id = "org.wpilib.wpiunits",
     visibility = ["//visibility:public"],
     deps = [],
 )
diff --git a/wpiunits/build.gradle b/wpiunits/build.gradle
index e6b2338575..bd57203ff3 100644
--- a/wpiunits/build.gradle
+++ b/wpiunits/build.gradle
@@ -2,10 +2,10 @@ ext {
     useJava = true
     useCpp = false
     baseId = 'wpiunits'
-    groupId = 'edu.wpi.first.wpiunits'
+    groupId = 'org.wpilib.wpiunits'
 
     nativeName = 'wpiunits'
-    devMain = 'edu.wpi.first.units.DevMain'
+    devMain = 'org.wpilib.units.DevMain'
 }
 
 apply from: "${rootDir}/shared/java/javacommon.gradle"
diff --git a/wpiutil/BUILD.bazel b/wpiutil/BUILD.bazel
index d4eadd0794..d20ed0c6ec 100644
--- a/wpiutil/BUILD.bazel
+++ b/wpiutil/BUILD.bazel
@@ -262,7 +262,7 @@ wpilib_jni_java_library(
     name = "wpiutil-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "wpiutil-java",
-    maven_group_id = "edu.wpi.first.wpiutil",
+    maven_group_id = "org.wpilib.wpiutil",
     native_libs = [":wpiutiljni"],
     visibility = ["//visibility:public"],
     deps = [
@@ -442,5 +442,5 @@ robotpy_py_test(
 package_default_jni_project(
     name = "wpiutil",
     maven_artifact_name = "wpiutil-cpp",
-    maven_group_id = "edu.wpi.first.wpiutil",
+    maven_group_id = "org.wpilib.wpiutil",
 )
diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
index ddeb8f1784..4c7a5c659b 100644
--- a/wpiutil/build.gradle
+++ b/wpiutil/build.gradle
@@ -7,7 +7,7 @@ ext {
         'Java_org_wpilib_util_CombinedRuntimeLoader_setDllDirectory'
     ]
     baseId = 'wpiutil'
-    groupId = 'edu.wpi.first.wpiutil'
+    groupId = 'org.wpilib.wpiutil'
 
     nativeName = 'wpiutil'
     devMain = 'org.wpilib.util.DevMain'
diff --git a/xrpVendordep/BUILD.bazel b/xrpVendordep/BUILD.bazel
index 0e84c6cabb..9c13c1df64 100644
--- a/xrpVendordep/BUILD.bazel
+++ b/xrpVendordep/BUILD.bazel
@@ -56,7 +56,7 @@ wpilib_java_library(
     name = "xrpVendordep-java",
     srcs = glob(["src/main/java/**/*.java"]),
     maven_artifact_name = "xrpVendordep-java",
-    maven_group_id = "edu.wpi.first.xrpVendordep",
+    maven_group_id = "org.wpilib.xrpVendordep",
     visibility = ["//visibility:public"],
     deps = [
         "//hal:hal-java",
@@ -97,5 +97,5 @@ java_binary(
 package_minimal_cc_project(
     name = "xrpVendordep",
     maven_artifact_name = "xrpVendordep-cpp",
-    maven_group_id = "edu.wpi.first.xrpVendordep",
+    maven_group_id = "org.wpilib.xrpVendordep",
 )
diff --git a/xrpVendordep/build.gradle b/xrpVendordep/build.gradle
index 21278f55de..e0af934544 100644
--- a/xrpVendordep/build.gradle
+++ b/xrpVendordep/build.gradle
@@ -1,6 +1,6 @@
 ext {
     nativeName = 'xrpVendordep'
-    devMain = 'edu.wpi.first.wpilibj.xrp.DevMain'
+    devMain = 'org.wpilib.xrp.DevMain'
 }
 
 evaluationDependsOn(":ntcore")