diff --git a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
index fae53ad3dc..6f3c52d142 100644
--- a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
@@ -38,7 +38,7 @@ Java_org_wpilib_hardware_hal_AddressableLEDJNI_initialize
   (JNIEnv* env, jclass, jint channel)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto ret = HAL_InitializeAddressableLED(channel, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
   return ret;
diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
index 41d93aa8fb..30bcb78a46 100644
--- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
@@ -27,7 +27,7 @@ Java_org_wpilib_hardware_hal_AnalogJNI_initializeAnalogInputPort
   (JNIEnv* env, jclass, jint channel)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto analog = HAL_InitializeAnalogInputPort(channel, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
   return (jint)analog;
diff --git a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
index bd15963e36..1636c1c18b 100644
--- a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
@@ -25,7 +25,7 @@ Java_org_wpilib_hardware_hal_CTREPCMJNI_initialize
   (JNIEnv* env, jclass, jint busId, jint module)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto handle = HAL_InitializeCTREPCM(busId, module, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
   return handle;
diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp
index c2c622856c..c2218aafd2 100644
--- a/hal/src/main/native/cpp/jni/CounterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp
@@ -26,7 +26,7 @@ Java_org_wpilib_hardware_hal_CounterJNI_initializeCounter
   (JNIEnv* env, jclass, jint channel, jboolean risingEdge)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto counter =
       HAL_InitializeCounter(channel, risingEdge, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp
index eba3d05b7e..3059682a90 100644
--- a/hal/src/main/native/cpp/jni/DIOJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp
@@ -28,7 +28,7 @@ Java_org_wpilib_hardware_hal_DIOJNI_initializeDIOPort
   (JNIEnv* env, jclass, jint channel, jboolean input)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto dio = HAL_InitializeDIOPort(channel, static_cast<uint8_t>(input),
                                    stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
diff --git a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
index f7a1c874dc..8191654d5b 100644
--- a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
@@ -22,7 +22,7 @@ Java_org_wpilib_hardware_hal_DutyCycleJNI_initialize
   (JNIEnv* env, jclass, jint channel)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto handle = HAL_InitializeDutyCycle(channel, stack.c_str(), &status);
   CheckStatus(env, status);
   return handle;
diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp
index 60b3e30b56..3e0c71c581 100644
--- a/hal/src/main/native/cpp/jni/HALUtil.cpp
+++ b/hal/src/main/native/cpp/jni/HALUtil.cpp
@@ -117,7 +117,7 @@ void ReportError(JNIEnv* env, int32_t status, bool doThrow) {
         env, fmt::format(" Code: {}. {}", status, message).c_str(), status);
   } else {
     std::string func;
-    auto stack = GetJavaStackTrace(env, &func, "edu.wpi.first");
+    auto stack = GetJavaStackTrace(env, &func, "org.wpilib");
     // Make a copy of message for safety, calling back into the HAL might
     // invalidate the string.
     std::string lastMessage{message};
diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp
index e412cfa4e3..446316fd4b 100644
--- a/hal/src/main/native/cpp/jni/PWMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp
@@ -28,7 +28,7 @@ Java_org_wpilib_hardware_hal_PWMJNI_initializePWMPort
   (JNIEnv* env, jclass, jint channel)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto pwm = HAL_InitializePWMPort(channel, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
   return (jint)pwm;
diff --git a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
index e956a641a1..2700aca811 100644
--- a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
@@ -33,7 +33,7 @@ Java_org_wpilib_hardware_hal_PowerDistributionJNI_initialize
   (JNIEnv* env, jclass, jint busId, jint module, jint type)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto handle = HAL_InitializePowerDistribution(
       busId, module, static_cast<HAL_PowerDistributionType>(type),
       stack.c_str(), &status);
diff --git a/hal/src/main/native/cpp/jni/REVPHJNI.cpp b/hal/src/main/native/cpp/jni/REVPHJNI.cpp
index 6797db8870..de93b03405 100644
--- a/hal/src/main/native/cpp/jni/REVPHJNI.cpp
+++ b/hal/src/main/native/cpp/jni/REVPHJNI.cpp
@@ -38,7 +38,7 @@ Java_org_wpilib_hardware_hal_REVPHJNI_initialize
   (JNIEnv* env, jclass, jint busId, jint module)
 {
   int32_t status = 0;
-  auto stack = wpi::util::java::GetJavaStackTrace(env, "edu.wpi.first");
+  auto stack = wpi::util::java::GetJavaStackTrace(env, "org.wpilib");
   auto handle = HAL_InitializeREVPH(busId, module, stack.c_str(), &status);
   CheckStatusForceThrow(env, status);
   return handle;
diff --git a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
index 683238704b..6b06e961fe 100644
--- a/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
+++ b/wpilibj/src/main/java/org/wpilib/driverstation/DriverStation.java
@@ -600,7 +600,7 @@ public final class DriverStation {
         String loc = stackTrace[i].toString();
         traceString.append("\tat ").append(loc).append('\n');
         // get first user function
-        if (!haveLoc && !loc.startsWith("edu.wpi.first")) {
+        if (!haveLoc && !loc.startsWith("org.wpilib")) {
           locString = loc;
           haveLoc = true;
         }