Move HAL classes to their own base package (#1317)

Needed for modularization.
2026-06-20 00:51:42 +00:00 · 2018-09-20 21:59:46 -07:00
parent 0068b6aea3
commit e210073044
194 changed files with 1027 additions and 1102 deletions
--- a/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AccelerometerJNI.cpp
@@ -7,66 +7,66 @@

 #include <jni.h>

-#include "edu_wpi_first_wpilibj_hal_AccelerometerJNI.h"
+#include "edu_wpi_first_hal_AccelerometerJNI.h"
 #include "hal/Accelerometer.h"

 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AccelerometerJNI
+ * Class:     edu_wpi_first_hal_AccelerometerJNI
 * Method:    setAccelerometerActive
 * Signature: (Z)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerActive
+Java_edu_wpi_first_hal_AccelerometerJNI_setAccelerometerActive
  (JNIEnv*, jclass, jboolean active)
 {
  HAL_SetAccelerometerActive(active);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AccelerometerJNI
+ * Class:     edu_wpi_first_hal_AccelerometerJNI
 * Method:    setAccelerometerRange
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_setAccelerometerRange
+Java_edu_wpi_first_hal_AccelerometerJNI_setAccelerometerRange
  (JNIEnv*, jclass, jint range)
 {
  HAL_SetAccelerometerRange((HAL_AccelerometerRange)range);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AccelerometerJNI
+ * Class:     edu_wpi_first_hal_AccelerometerJNI
 * Method:    getAccelerometerX
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerX
+Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerX
  (JNIEnv*, jclass)
 {
  return HAL_GetAccelerometerX();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AccelerometerJNI
+ * Class:     edu_wpi_first_hal_AccelerometerJNI
 * Method:    getAccelerometerY
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerY
+Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerY
  (JNIEnv*, jclass)
 {
  return HAL_GetAccelerometerY();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AccelerometerJNI
+ * Class:     edu_wpi_first_hal_AccelerometerJNI
 * Method:    getAccelerometerZ
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AccelerometerJNI_getAccelerometerZ
+Java_edu_wpi_first_hal_AccelerometerJNI_getAccelerometerZ
  (JNIEnv*, jclass)
 {
  return HAL_GetAccelerometerZ();
--- a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_AnalogGyroJNI.h"
+#include "edu_wpi_first_hal_AnalogGyroJNI.h"
 #include "hal/AnalogGyro.h"
 #include "hal/cpp/Log.h"
 #include "hal/handles/HandlesInternal.h"
@@ -28,12 +28,12 @@ TLogLevel analogGyroJNILogLevel = logWARNING;

 extern "C" {
 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    initializeAnalogGyro
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_initializeAnalogGyro
+Java_edu_wpi_first_hal_AnalogGyroJNI_initializeAnalogGyro
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI initializeAnalogGyro";
@@ -50,12 +50,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_initializeAnalogGyro
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    setupAnalogGyro
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setupAnalogGyro
+Java_edu_wpi_first_hal_AnalogGyroJNI_setupAnalogGyro
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setupAnalogGyro";
@@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setupAnalogGyro
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    freeAnalogGyro
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_freeAnalogGyro
+Java_edu_wpi_first_hal_AnalogGyroJNI_freeAnalogGyro
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI freeAnalogGyro";
@@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_freeAnalogGyro
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    setAnalogGyroParameters
 * Signature: (IDDI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroParameters
+Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroParameters
  (JNIEnv* env, jclass, jint id, jdouble vPDPS, jdouble offset, jint center)
 {
  ANALOGGYROJNI_LOG(logDEBUG)
@@ -100,12 +100,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroParameters
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    setAnalogGyroVoltsPerDegreePerSecond
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecond
+Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecond
  (JNIEnv* env, jclass, jint id, jdouble vPDPS)
 {
  ANALOGGYROJNI_LOG(logDEBUG)
@@ -119,12 +119,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecon
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    resetAnalogGyro
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_resetAnalogGyro
+Java_edu_wpi_first_hal_AnalogGyroJNI_resetAnalogGyro
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI resetAnalogGyro";
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_resetAnalogGyro
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    calibrateAnalogGyro
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_calibrateAnalogGyro
+Java_edu_wpi_first_hal_AnalogGyroJNI_calibrateAnalogGyro
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI calibrateAnalogGyro";
@@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_calibrateAnalogGyro
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    setAnalogGyroDeadband
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroDeadband
+Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroDeadband
  (JNIEnv* env, jclass, jint id, jdouble deadband)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setAnalogGyroDeadband";
@@ -170,12 +170,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_setAnalogGyroDeadband
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    getAnalogGyroAngle
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroAngle
+Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroAngle
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroAngle";
@@ -189,12 +189,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroAngle
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    getAnalogGyroRate
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroRate
+Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroRate
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroRate";
@@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    getAnalogGyroOffset
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroOffset
+Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroOffset
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroOffset";
@@ -227,12 +227,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroOffset
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogGyroJNI
+ * Class:     edu_wpi_first_hal_AnalogGyroJNI
 * Method:    getAnalogGyroCenter
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogGyroJNI_getAnalogGyroCenter
+Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroCenter
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroCenter";
--- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"
+#include "edu_wpi_first_hal_AnalogJNI.h"
 #include "hal/AnalogAccumulator.h"
 #include "hal/AnalogInput.h"
 #include "hal/AnalogOutput.h"
@@ -33,12 +33,12 @@ TLogLevel analogJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    initializeAnalogInputPort
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort
+Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogInputPort
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id;
@@ -52,12 +52,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    freeAnalogInputPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort
+Java_edu_wpi_first_hal_AnalogJNI_freeAnalogInputPort
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id;
@@ -65,12 +65,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    initializeAnalogOutputPort
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort
+Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogOutputPort
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id;
@@ -85,12 +85,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    freeAnalogOutputPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort
+Java_edu_wpi_first_hal_AnalogJNI_freeAnalogOutputPort
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << id;
@@ -98,12 +98,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    checkAnalogModule
 * Signature: (B)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule
+Java_edu_wpi_first_hal_AnalogJNI_checkAnalogModule
  (JNIEnv*, jclass, jbyte value)
 {
  // ANALOGJNI_LOG(logDEBUG) << "Module = " << (jint)value;
@@ -114,12 +114,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    checkAnalogInputChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel
+Java_edu_wpi_first_hal_AnalogJNI_checkAnalogInputChannel
  (JNIEnv*, jclass, jint value)
 {
  // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value;
@@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    checkAnalogOutputChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel
+Java_edu_wpi_first_hal_AnalogJNI_checkAnalogOutputChannel
  (JNIEnv*, jclass, jint value)
 {
  // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value;
@@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogOutput
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogOutput
  (JNIEnv* env, jclass, jint id, jdouble voltage)
 {
  ANALOGJNI_LOG(logDEBUG) << "Calling setAnalogOutput";
@@ -163,12 +163,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogOutput
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogOutput
  (JNIEnv* env, jclass, jint id)
 {
  int32_t status = 0;
@@ -178,12 +178,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogSampleRate
 * Signature: (D)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogSampleRate
  (JNIEnv* env, jclass, jdouble value)
 {
  ANALOGJNI_LOG(logDEBUG) << "SampleRate = " << value;
@@ -194,12 +194,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogSampleRate
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogSampleRate
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogAverageBits
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogAverageBits
  (JNIEnv* env, jclass, jint id, jint value)
 {
  ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << value;
@@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogAverageBits
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageBits
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -247,12 +247,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogOversampleBits
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogOversampleBits
  (JNIEnv* env, jclass, jint id, jint value)
 {
  ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << value;
@@ -264,12 +264,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogOversampleBits
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogOversampleBits
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -283,12 +283,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogValue
 * Signature: (I)S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogValue
  (JNIEnv* env, jclass, jint id)
 {
  // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id;
@@ -301,12 +301,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogAverageValue
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageValue
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -320,12 +320,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogVoltsToValue
 * Signature: (ID)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltsToValue
  (JNIEnv* env, jclass, jint id, jdouble voltageValue)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -340,12 +340,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogVoltage
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltage
  (JNIEnv* env, jclass, jint id)
 {
  // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id;
@@ -359,12 +359,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogAverageVoltage
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageVoltage
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -378,12 +378,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogLSBWeight
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogLSBWeight
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -397,12 +397,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogOffset
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogOffset
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -416,12 +416,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    isAccumulatorChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel
+Java_edu_wpi_first_hal_AnalogJNI_isAccumulatorChannel
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "isAccumulatorChannel";
@@ -437,12 +437,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    initAccumulator
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator
+Java_edu_wpi_first_hal_AnalogJNI_initAccumulator
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -453,12 +453,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    resetAccumulator
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator
+Java_edu_wpi_first_hal_AnalogJNI_resetAccumulator
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -469,12 +469,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAccumulatorCenter
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter
+Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorCenter
  (JNIEnv* env, jclass, jint id, jint center)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -485,12 +485,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAccumulatorDeadband
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband
+Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorDeadband
  (JNIEnv* env, jclass, jint id, jint deadband)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -501,12 +501,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAccumulatorValue
 * Signature: (I)J
 */
 JNIEXPORT jlong JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue
+Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorValue
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -521,12 +521,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAccumulatorCount
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount
+Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorCount
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -540,12 +540,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAccumulatorOutput
 * Signature: (ILjava/lang/Object;)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput
+Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorOutput
  (JNIEnv* env, jclass, jint id, jobject accumulatorResult)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
@@ -561,12 +561,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    initializeAnalogTrigger
 * Signature: (ILjava/lang/Object;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger
+Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogTrigger
  (JNIEnv* env, jclass, jint id, jobject index)
 {
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id;
@@ -584,12 +584,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    cleanAnalogTrigger
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger
+Java_edu_wpi_first_hal_AnalogJNI_cleanAnalogTrigger
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -600,12 +600,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogTriggerLimitsRaw
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsRaw
  (JNIEnv* env, jclass, jint id, jint lower, jint upper)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -617,12 +617,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogTriggerLimitsVoltage
 * Signature: (IDD)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsVoltage
  (JNIEnv* env, jclass, jint id, jdouble lower, jdouble upper)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -634,12 +634,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogTriggerAveraged
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerAveraged
  (JNIEnv* env, jclass, jint id, jboolean averaged)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -650,12 +650,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    setAnalogTriggerFiltered
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered
+Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerFiltered
  (JNIEnv* env, jclass, jint id, jboolean filtered)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -666,12 +666,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogTriggerInWindow
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerInWindow
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -684,12 +684,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogTriggerTriggerState
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerTriggerState
  (JNIEnv* env, jclass, jint id)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
@@ -702,12 +702,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
+ * Class:     edu_wpi_first_hal_AnalogJNI
 * Method:    getAnalogTriggerOutput
 * Signature: (II)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerOutput
+Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerOutput
  (JNIEnv* env, jclass, jint id, jint type)
 {
  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
--- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
@@ -14,7 +14,7 @@
 #include <wpi/raw_ostream.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_CANAPIJNI.h"
+#include "edu_wpi_first_hal_CANAPIJNI.h"
 #include "hal/CAN.h"
 #include "hal/CANAPI.h"
 #include "hal/Errors.h"
@@ -25,12 +25,12 @@ using namespace wpi::java;

 extern "C" {
 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    initializeCAN
 * Signature: (III)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_initializeCAN
+Java_edu_wpi_first_hal_CANAPIJNI_initializeCAN
  (JNIEnv* env, jclass, jint manufacturer, jint deviceId, jint deviceType)
 {
  int32_t status = 0;
@@ -44,24 +44,24 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_initializeCAN
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    cleanCAN
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_cleanCAN
+Java_edu_wpi_first_hal_CANAPIJNI_cleanCAN
  (JNIEnv* env, jclass, jint handle)
 {
  HAL_CleanCAN(static_cast<HAL_CANHandle>(handle));
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    writeCANPacket
 * Signature: (I[BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacket
+Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacket
  (JNIEnv* env, jclass, jint handle, jbyteArray data, jint apiId)
 {
  auto halHandle = static_cast<HAL_CANHandle>(handle);
@@ -74,12 +74,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacket
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    writeCANPacketRepeating
 * Signature: (I[BII)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacketRepeating
+Java_edu_wpi_first_hal_CANAPIJNI_writeCANPacketRepeating
  (JNIEnv* env, jclass, jint handle, jbyteArray data, jint apiId,
   jint timeoutMs)
 {
@@ -94,12 +94,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_writeCANPacketRepeating
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    stopCANPacketRepeating
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_stopCANPacketRepeating
+Java_edu_wpi_first_hal_CANAPIJNI_stopCANPacketRepeating
  (JNIEnv* env, jclass, jint handle, jint apiId)
 {
  auto halHandle = static_cast<HAL_CANHandle>(handle);
@@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_stopCANPacketRepeating
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    readCANPacketNew
 * Signature: (IILjava/lang/Object;)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketNew
+Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketNew
  (JNIEnv* env, jclass, jint handle, jint apiId, jobject data)
 {
  auto halHandle = static_cast<HAL_CANHandle>(handle);
@@ -141,12 +141,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketNew
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    readCANPacketLatest
 * Signature: (IILjava/lang/Object;)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketLatest
+Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketLatest
  (JNIEnv* env, jclass, jint handle, jint apiId, jobject data)
 {
  auto halHandle = static_cast<HAL_CANHandle>(handle);
@@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketLatest
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    readCANPacketTimeout
 * Signature: (IIILjava/lang/Object;)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketTimeout
+Java_edu_wpi_first_hal_CANAPIJNI_readCANPacketTimeout
  (JNIEnv* env, jclass, jint handle, jint apiId, jint timeoutMs, jobject data)
 {
  auto halHandle = static_cast<HAL_CANHandle>(handle);
@@ -206,12 +206,12 @@ Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPacketTimeout
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CANAPIJNI
+ * Class:     edu_wpi_first_hal_CANAPIJNI
 * Method:    readCANPeriodicPacket
 * Signature: (IIIILjava/lang/Object;)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CANAPIJNI_readCANPeriodicPacket
+Java_edu_wpi_first_hal_CANAPIJNI_readCANPeriodicPacket
  (JNIEnv* env, jclass, jint handle, jint apiId, jint timeoutMs, jint periodMs,
   jobject data)
 {
--- a/hal/src/main/native/cpp/jni/CANJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANJNI.cpp
@@ -14,7 +14,7 @@
 #include <wpi/raw_ostream.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_can_CANJNI.h"
+#include "edu_wpi_first_hal_can_CANJNI.h"
 #include "hal/CAN.h"
 #include "hal/cpp/Log.h"

@@ -34,12 +34,12 @@ TLogLevel canJNILogLevel = logERROR;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_can_CANJNI
+ * Class:     edu_wpi_first_hal_can_CANJNI
 * Method:    FRCNetCommCANSessionMuxSendMessage
 * Signature: (I[BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
+Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
  (JNIEnv* env, jclass, jint messageID, jbyteArray data, jint periodMs)
 {
  CANJNI_LOG(logDEBUG) << "Calling CANJNI FRCNetCommCANSessionMuxSendMessage";
@@ -77,12 +77,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxSendMessage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_can_CANJNI
+ * Class:     edu_wpi_first_hal_can_CANJNI
 * Method:    FRCNetCommCANSessionMuxReceiveMessage
 * Signature: (Ljava/lang/Object;ILjava/lang/Object;)[B
 */
 JNIEXPORT jbyteArray JNICALL
-Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
+Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
  (JNIEnv* env, jclass, jobject messageID, jint messageIDMask,
   jobject timeStamp)
 {
@@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_can_CANJNI
+ * Class:     edu_wpi_first_hal_can_CANJNI
 * Method:    GetCANStatus
 * Signature: (Ljava/lang/Object;)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_can_CANJNI_GetCANStatus
+Java_edu_wpi_first_hal_can_CANJNI_GetCANStatus
  (JNIEnv* env, jclass, jobject canStatus)
 {
  CANJNI_LOG(logDEBUG) << "Calling CANJNI HAL_CAN_GetCANStatus";
--- a/hal/src/main/native/cpp/jni/CompressorJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CompressorJNI.cpp
@@ -6,7 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_CompressorJNI.h"
+#include "edu_wpi_first_hal_CompressorJNI.h"
 #include "hal/Compressor.h"
 #include "hal/Ports.h"
 #include "hal/Solenoid.h"
@@ -17,12 +17,12 @@ using namespace frc;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    initializeCompressor
 * Signature: (B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_initializeCompressor
+Java_edu_wpi_first_hal_CompressorJNI_initializeCompressor
  (JNIEnv* env, jclass, jbyte module)
 {
  int32_t status = 0;
@@ -33,24 +33,24 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_initializeCompressor
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    checkCompressorModule
 * Signature: (B)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_checkCompressorModule
+Java_edu_wpi_first_hal_CompressorJNI_checkCompressorModule
  (JNIEnv* env, jclass, jbyte module)
 {
  return HAL_CheckCompressorModule(module);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressor
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressor
+Java_edu_wpi_first_hal_CompressorJNI_getCompressor
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -60,12 +60,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressor
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    setCompressorClosedLoopControl
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_setCompressorClosedLoopControl
+Java_edu_wpi_first_hal_CompressorJNI_setCompressorClosedLoopControl
  (JNIEnv* env, jclass, jint compressorHandle, jboolean value)
 {
  int32_t status = 0;
@@ -75,12 +75,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_setCompressorClosedLoopControl
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorClosedLoopControl
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorClosedLoopControl
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorClosedLoopControl
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorClosedLoopControl
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorPressureSwitch
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorPressureSwitch
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorPressureSwitch
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -107,12 +107,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorPressureSwitch
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorCurrent
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrent
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrent
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -123,12 +123,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrent
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorCurrentTooHighFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrentTooHighFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -139,12 +139,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighFault
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorCurrentTooHighStickyFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighStickyFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorCurrentTooHighStickyFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -155,12 +155,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorCurrentTooHighStickyFa
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorShortedStickyFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedStickyFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorShortedStickyFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -171,12 +171,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedStickyFault
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorShortedFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorShortedFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorShortedFault
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorNotConnectedStickyFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedStickyFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorNotConnectedStickyFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -203,12 +203,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedStickyFaul
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    getCompressorNotConnectedFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedFault
+Java_edu_wpi_first_hal_CompressorJNI_getCompressorNotConnectedFault
  (JNIEnv* env, jclass, jint compressorHandle)
 {
  int32_t status = 0;
@@ -218,12 +218,12 @@ Java_edu_wpi_first_wpilibj_hal_CompressorJNI_getCompressorNotConnectedFault
  return val;
 }
 /*
- * Class:     edu_wpi_first_wpilibj_hal_CompressorJNI
+ * Class:     edu_wpi_first_hal_CompressorJNI
 * Method:    clearAllPCMStickyFaults
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CompressorJNI_clearAllPCMStickyFaults
+Java_edu_wpi_first_hal_CompressorJNI_clearAllPCMStickyFaults
  (JNIEnv* env, jclass, jbyte module)
 {
  int32_t status = 0;
--- a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_ConstantsJNI.h"
+#include "edu_wpi_first_hal_ConstantsJNI.h"
 #include "hal/Constants.h"
 #include "hal/cpp/Log.h"

@@ -27,12 +27,12 @@ TLogLevel constantsJNILogLevel = logWARNING;

 extern "C" {
 /*
- * Class:     edu_wpi_first_wpilibj_hal_ConstantsJNI
+ * Class:     edu_wpi_first_hal_ConstantsJNI
 * Method:    getSystemClockTicksPerMicrosecond
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond
+Java_edu_wpi_first_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond
  (JNIEnv* env, jclass)
 {
  CONSTANTSJNI_LOG(logDEBUG)
--- a/hal/src/main/native/cpp/jni/CounterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_CounterJNI.h"
+#include "edu_wpi_first_hal_CounterJNI.h"
 #include "hal/Counter.h"
 #include "hal/Errors.h"
 #include "hal/cpp/Log.h"
@@ -29,12 +29,12 @@ TLogLevel counterJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    initializeCounter
 * Signature: (ILjava/lang/Object;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_initializeCounter
+Java_edu_wpi_first_hal_CounterJNI_initializeCounter
  (JNIEnv* env, jclass, jint mode, jobject index)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI initializeCounter";
@@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_initializeCounter
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    freeCounter
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_freeCounter
+Java_edu_wpi_first_hal_CounterJNI_freeCounter
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI freeCounter";
@@ -70,12 +70,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_freeCounter
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterAverageSize
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterAverageSize
+Java_edu_wpi_first_hal_CounterJNI_setCounterAverageSize
  (JNIEnv* env, jclass, jint id, jint value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterAverageSize";
@@ -88,12 +88,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterAverageSize
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterUpSource
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSource
+Java_edu_wpi_first_hal_CounterJNI_setCounterUpSource
  (JNIEnv* env, jclass, jint id, jint digitalSourceHandle,
   jint analogTriggerType)
 {
@@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSource
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterUpSourceEdge
 * Signature: (IZZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSourceEdge
+Java_edu_wpi_first_hal_CounterJNI_setCounterUpSourceEdge
  (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpSourceEdge";
@@ -129,12 +129,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpSourceEdge
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    clearCounterUpSource
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterUpSource
+Java_edu_wpi_first_hal_CounterJNI_clearCounterUpSource
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterUpSource";
@@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterUpSource
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterDownSource
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSource
+Java_edu_wpi_first_hal_CounterJNI_setCounterDownSource
  (JNIEnv* env, jclass, jint id, jint digitalSourceHandle,
   jint analogTriggerType)
 {
@@ -174,12 +174,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSource
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterDownSourceEdge
 * Signature: (IZZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSourceEdge
+Java_edu_wpi_first_hal_CounterJNI_setCounterDownSourceEdge
  (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterDownSourceEdge";
@@ -194,12 +194,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterDownSourceEdge
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    clearCounterDownSource
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterDownSource
+Java_edu_wpi_first_hal_CounterJNI_clearCounterDownSource
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterDownSource";
@@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_clearCounterDownSource
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterUpDownMode
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpDownMode
+Java_edu_wpi_first_hal_CounterJNI_setCounterUpDownMode
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpDownMode";
@@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpDownMode
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterExternalDirectionMode
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterExternalDirectionMode
+Java_edu_wpi_first_hal_CounterJNI_setCounterExternalDirectionMode
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG)
@@ -246,12 +246,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterExternalDirectionMode
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterSemiPeriodMode
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSemiPeriodMode
+Java_edu_wpi_first_hal_CounterJNI_setCounterSemiPeriodMode
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSemiPeriodMode";
@@ -264,12 +264,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSemiPeriodMode
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterPulseLengthMode
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterPulseLengthMode
+Java_edu_wpi_first_hal_CounterJNI_setCounterPulseLengthMode
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterPulseLengthMode";
@@ -282,12 +282,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterPulseLengthMode
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    getCounterSamplesToAverage
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterSamplesToAverage
+Java_edu_wpi_first_hal_CounterJNI_getCounterSamplesToAverage
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterSamplesToAverage";
@@ -303,12 +303,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterSamplesToAverage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterSamplesToAverage
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSamplesToAverage
+Java_edu_wpi_first_hal_CounterJNI_setCounterSamplesToAverage
  (JNIEnv* env, jclass, jint id, jint value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSamplesToAverage";
@@ -325,12 +325,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterSamplesToAverage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    resetCounter
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_resetCounter
+Java_edu_wpi_first_hal_CounterJNI_resetCounter
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI resetCounter";
@@ -342,12 +342,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_resetCounter
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    getCounter
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounter
+Java_edu_wpi_first_hal_CounterJNI_getCounter
  (JNIEnv* env, jclass, jint id)
 {
  // COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounter";
@@ -361,12 +361,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounter
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    getCounterPeriod
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterPeriod
+Java_edu_wpi_first_hal_CounterJNI_getCounterPeriod
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterPeriod";
@@ -380,12 +380,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterPeriod
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterMaxPeriod
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterMaxPeriod
+Java_edu_wpi_first_hal_CounterJNI_setCounterMaxPeriod
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod";
@@ -398,12 +398,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterMaxPeriod
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterUpdateWhenEmpty
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpdateWhenEmpty
+Java_edu_wpi_first_hal_CounterJNI_setCounterUpdateWhenEmpty
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod";
@@ -416,12 +416,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterUpdateWhenEmpty
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    getCounterStopped
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterStopped
+Java_edu_wpi_first_hal_CounterJNI_getCounterStopped
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterStopped";
@@ -435,12 +435,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterStopped
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    getCounterDirection
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterDirection
+Java_edu_wpi_first_hal_CounterJNI_getCounterDirection
  (JNIEnv* env, jclass, jint id)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterDirection";
@@ -456,12 +456,12 @@ Java_edu_wpi_first_wpilibj_hal_CounterJNI_getCounterDirection
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_CounterJNI
+ * Class:     edu_wpi_first_hal_CounterJNI
 * Method:    setCounterReverseDirection
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_CounterJNI_setCounterReverseDirection
+Java_edu_wpi_first_hal_CounterJNI_setCounterReverseDirection
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterReverseDirection";
--- a/hal/src/main/native/cpp/jni/DIOJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_DIOJNI.h"
+#include "edu_wpi_first_hal_DIOJNI.h"
 #include "hal/DIO.h"
 #include "hal/PWM.h"
 #include "hal/Ports.h"
@@ -31,12 +31,12 @@ TLogLevel dioJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    initializeDIOPort
 * Signature: (IZ)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_initializeDIOPort
+Java_edu_wpi_first_hal_DIOJNI_initializeDIOPort
  (JNIEnv* env, jclass, jint id, jboolean input)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI initializeDIOPort";
@@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_initializeDIOPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    checkDIOChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_checkDIOChannel
+Java_edu_wpi_first_hal_DIOJNI_checkDIOChannel
  (JNIEnv* env, jclass, jint channel)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI checkDIOChannel";
@@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_checkDIOChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    freeDIOPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDIOPort
+Java_edu_wpi_first_hal_DIOJNI_freeDIOPort
  (JNIEnv* env, jclass, jint id)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDIOPort";
@@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDIOPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    setDIO
 * Signature: (IS)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIO
+Java_edu_wpi_first_hal_DIOJNI_setDIO
  (JNIEnv* env, jclass, jint id, jshort value)
 {
  // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO";
@@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIO
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    setDIODirection
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIODirection
+Java_edu_wpi_first_hal_DIOJNI_setDIODirection
  (JNIEnv* env, jclass, jint id, jboolean input)
 {
  // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO";
@@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDIODirection
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    getDIO
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO
+Java_edu_wpi_first_hal_DIOJNI_getDIO
  (JNIEnv* env, jclass, jint id)
 {
  // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIO";
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    getDIODirection
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection
+Java_edu_wpi_first_hal_DIOJNI_getDIODirection
  (JNIEnv* env, jclass, jint id)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIODirection (RR upd)";
@@ -155,12 +155,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    pulse
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse
+Java_edu_wpi_first_hal_DIOJNI_pulse
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI pulse (RR upd)";
@@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    isPulsing
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing
+Java_edu_wpi_first_hal_DIOJNI_isPulsing
  (JNIEnv* env, jclass, jint id)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isPulsing (RR upd)";
@@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    isAnyPulsing
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing
+Java_edu_wpi_first_hal_DIOJNI_isAnyPulsing
  (JNIEnv* env, jclass)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isAnyPulsing (RR upd)";
@@ -210,12 +210,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    getLoopTiming
 * Signature: ()S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_getLoopTiming
+Java_edu_wpi_first_hal_DIOJNI_getLoopTiming
  (JNIEnv* env, jclass)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getLoopTimeing";
@@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_getLoopTiming
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    allocateDigitalPWM
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_allocateDigitalPWM
+Java_edu_wpi_first_hal_DIOJNI_allocateDigitalPWM
  (JNIEnv* env, jclass)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI allocateDigitalPWM";
@@ -246,12 +246,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_allocateDigitalPWM
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    freeDigitalPWM
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDigitalPWM
+Java_edu_wpi_first_hal_DIOJNI_freeDigitalPWM
  (JNIEnv* env, jclass, jint id)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDigitalPWM";
@@ -263,12 +263,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_freeDigitalPWM
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    setDigitalPWMRate
 * Signature: (D)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMRate
+Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMRate
  (JNIEnv* env, jclass, jdouble value)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMRate";
@@ -280,12 +280,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    setDigitalPWMDutyCycle
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMDutyCycle
+Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMDutyCycle
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMDutyCycle";
@@ -298,12 +298,12 @@ Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMDutyCycle
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DIOJNI
+ * Class:     edu_wpi_first_hal_DIOJNI
 * Method:    setDigitalPWMOutputChannel
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DIOJNI_setDigitalPWMOutputChannel
+Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMOutputChannel
  (JNIEnv* env, jclass, jint id, jint value)
 {
  DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMOutputChannel";
--- a/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DigitalGlitchFilterJNI.cpp
@@ -8,18 +8,18 @@
 #include <jni.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI.h"
+#include "edu_wpi_first_hal_DigitalGlitchFilterJNI.h"
 #include "hal/DIO.h"

 using namespace frc;

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI
+ * Class:     edu_wpi_first_hal_DigitalGlitchFilterJNI
 * Method:    setFilterSelect
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterSelect
+Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_setFilterSelect
  (JNIEnv* env, jclass, jint id, jint filter_index)
 {
  int32_t status = 0;
@@ -30,12 +30,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterSelect
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI
+ * Class:     edu_wpi_first_hal_DigitalGlitchFilterJNI
 * Method:    getFilterSelect
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterSelect
+Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_getFilterSelect
  (JNIEnv* env, jclass, jint id)
 {
  int32_t status = 0;
@@ -47,12 +47,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterSelect
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI
+ * Class:     edu_wpi_first_hal_DigitalGlitchFilterJNI
 * Method:    setFilterPeriod
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterPeriod
+Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_setFilterPeriod
  (JNIEnv* env, jclass, jint filter_index, jint fpga_cycles)
 {
  int32_t status = 0;
@@ -62,12 +62,12 @@ Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_setFilterPeriod
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI
+ * Class:     edu_wpi_first_hal_DigitalGlitchFilterJNI
 * Method:    getFilterPeriod
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_DigitalGlitchFilterJNI_getFilterPeriod
+Java_edu_wpi_first_hal_DigitalGlitchFilterJNI_getFilterPeriod
  (JNIEnv* env, jclass, jint filter_index)
 {
  int32_t status = 0;
--- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp
+++ b/hal/src/main/native/cpp/jni/EncoderJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_EncoderJNI.h"
+#include "edu_wpi_first_hal_EncoderJNI.h"
 #include "hal/Encoder.h"
 #include "hal/Errors.h"
 #include "hal/cpp/Log.h"
@@ -29,12 +29,12 @@ TLogLevel encoderJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    initializeEncoder
 * Signature: (IIIIZI)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_initializeEncoder
+Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder
  (JNIEnv* env, jclass, jint digitalSourceHandleA, jint analogTriggerTypeA,
   jint digitalSourceHandleB, jint analogTriggerTypeB,
   jboolean reverseDirection, jint encodingType)
@@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_initializeEncoder
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    freeEncoder
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_freeEncoder
+Java_edu_wpi_first_hal_EncoderJNI_freeEncoder
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI freeEncoder";
@@ -78,12 +78,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_freeEncoder
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoder
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoder
+Java_edu_wpi_first_hal_EncoderJNI_getEncoder
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoder";
@@ -97,12 +97,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoder
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderRaw
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRaw
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderRaw
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRaw";
@@ -116,12 +116,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncodingScaleFactor
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncodingScaleFactor
+Java_edu_wpi_first_hal_EncoderJNI_getEncodingScaleFactor
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncodingScaleFactor";
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncodingScaleFactor
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    resetEncoder
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_resetEncoder
+Java_edu_wpi_first_hal_EncoderJNI_resetEncoder
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI resetEncoder";
@@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_resetEncoder
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderPeriod
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderPeriod
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderPeriod
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderPeriod";
@@ -172,12 +172,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderPeriod
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderMaxPeriod
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMaxPeriod
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderMaxPeriod
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMaxPeriod";
@@ -189,12 +189,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMaxPeriod
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderStopped
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderStopped
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderStopped
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderStopped";
@@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderStopped
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderDirection
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDirection
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderDirection
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDirection";
@@ -228,12 +228,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDirection
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderDistance
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistance
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistance
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDistance";
@@ -247,12 +247,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistance
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderRate
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRate
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderRate
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRate";
@@ -266,12 +266,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderMinRate
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMinRate
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderMinRate
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMinRate";
@@ -283,12 +283,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderMinRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderDistancePerPulse
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderDistancePerPulse
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderDistancePerPulse
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderDistancePerPulse";
@@ -300,12 +300,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderDistancePerPulse
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderReverseDirection
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderReverseDirection
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderReverseDirection
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderReverseDirection";
@@ -317,12 +317,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderReverseDirection
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderSamplesToAverage
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderSamplesToAverage
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderSamplesToAverage
  (JNIEnv* env, jclass, jint id, jint value)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderSamplesToAverage";
@@ -338,12 +338,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderSamplesToAverage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderSamplesToAverage
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderSamplesToAverage
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderSamplesToAverage
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
@@ -359,12 +359,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderSamplesToAverage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    setEncoderIndexSource
 * Signature: (IIII)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderIndexSource
+Java_edu_wpi_first_hal_EncoderJNI_setEncoderIndexSource
  (JNIEnv* env, jclass, jint id, jint digitalSourceHandle,
   jint analogTriggerType, jint type)
 {
@@ -383,12 +383,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_setEncoderIndexSource
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderFPGAIndex
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderFPGAIndex
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderFPGAIndex
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
@@ -403,12 +403,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderFPGAIndex
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderEncodingScale
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingScale
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingScale
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
@@ -424,12 +424,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingScale
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderDecodingScaleFactor
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDecodingScaleFactor
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderDecodingScaleFactor
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
@@ -445,12 +445,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDecodingScaleFactor
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderDistancePerPulse
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistancePerPulse
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistancePerPulse
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
@@ -466,12 +466,12 @@ Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderDistancePerPulse
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_EncoderJNI
+ * Class:     edu_wpi_first_hal_EncoderJNI
 * Method:    getEncoderEncodingType
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_EncoderJNI_getEncoderEncodingType
+Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingType
  (JNIEnv* env, jclass, jint id)
 {
  ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage";
--- a/hal/src/main/native/cpp/jni/HAL.cpp
+++ b/hal/src/main/native/cpp/jni/HAL.cpp
@@ -15,7 +15,7 @@
 #include <wpi/jni_util.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_HAL.h"
+#include "edu_wpi_first_hal_HAL.h"
 #include "hal/DriverStation.h"
 #include "hal/cpp/Log.h"

@@ -34,84 +34,84 @@ static TLogLevel netCommLogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    initialize
 * Signature: (II)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_initialize
+Java_edu_wpi_first_hal_HAL_initialize
  (JNIEnv*, jclass, jint timeout, jint mode)
 {
  return HAL_Initialize(timeout, mode);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    observeUserProgramStarting
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramStarting
+Java_edu_wpi_first_hal_HAL_observeUserProgramStarting
  (JNIEnv*, jclass)
 {
  HAL_ObserveUserProgramStarting();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    observeUserProgramDisabled
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramDisabled
+Java_edu_wpi_first_hal_HAL_observeUserProgramDisabled
  (JNIEnv*, jclass)
 {
  HAL_ObserveUserProgramDisabled();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    observeUserProgramAutonomous
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramAutonomous
+Java_edu_wpi_first_hal_HAL_observeUserProgramAutonomous
  (JNIEnv*, jclass)
 {
  HAL_ObserveUserProgramAutonomous();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    observeUserProgramTeleop
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramTeleop
+Java_edu_wpi_first_hal_HAL_observeUserProgramTeleop
  (JNIEnv*, jclass)
 {
  HAL_ObserveUserProgramTeleop();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    observeUserProgramTest
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_observeUserProgramTest
+Java_edu_wpi_first_hal_HAL_observeUserProgramTest
  (JNIEnv*, jclass)
 {
  HAL_ObserveUserProgramTest();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    report
 * Signature: (IIILjava/lang/String;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_report
+Java_edu_wpi_first_hal_HAL_report
  (JNIEnv* paramEnv, jclass, jint paramResource, jint paramInstanceNumber,
   jint paramContext, jstring paramFeature)
 {
@@ -127,12 +127,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_report
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    nativeGetControlWord
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetControlWord
+Java_edu_wpi_first_hal_HAL_nativeGetControlWord
  (JNIEnv*, jclass)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL Control Word";
@@ -147,12 +147,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetControlWord
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    nativeGetAllianceStation
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetAllianceStation
+Java_edu_wpi_first_hal_HAL_nativeGetAllianceStation
  (JNIEnv*, jclass)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL Alliance Station";
@@ -162,12 +162,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_nativeGetAllianceStation
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickAxes
 * Signature: (B[F)S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxes
+Java_edu_wpi_first_hal_HAL_getJoystickAxes
  (JNIEnv* env, jclass, jbyte joystickNum, jfloatArray axesArray)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HALJoystickAxes";
@@ -186,12 +186,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxes
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickPOVs
 * Signature: (B[S)S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickPOVs
+Java_edu_wpi_first_hal_HAL_getJoystickPOVs
  (JNIEnv* env, jclass, jbyte joystickNum, jshortArray povsArray)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HALJoystickPOVs";
@@ -210,12 +210,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickPOVs
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickButtons
 * Signature: (BLjava/lang/Object;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickButtons
+Java_edu_wpi_first_hal_HAL_getJoystickButtons
  (JNIEnv* env, jclass, jbyte joystickNum, jobject count)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HALJoystickButtons";
@@ -231,12 +231,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickButtons
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    setJoystickOutputs
 * Signature: (BISS)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_setJoystickOutputs
+Java_edu_wpi_first_hal_HAL_setJoystickOutputs
  (JNIEnv*, jclass, jbyte port, jint outputs, jshort leftRumble,
   jshort rightRumble)
 {
@@ -248,12 +248,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_setJoystickOutputs
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickIsXbox
 * Signature: (B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickIsXbox
+Java_edu_wpi_first_hal_HAL_getJoystickIsXbox
  (JNIEnv*, jclass, jbyte port)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickIsXbox";
@@ -261,12 +261,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickIsXbox
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickType
 * Signature: (B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickType
+Java_edu_wpi_first_hal_HAL_getJoystickType
  (JNIEnv*, jclass, jbyte port)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickType";
@@ -274,12 +274,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickType
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickName
 * Signature: (B)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickName
+Java_edu_wpi_first_hal_HAL_getJoystickName
  (JNIEnv* env, jclass, jbyte port)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickName";
@@ -290,12 +290,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickName
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getJoystickAxisType
 * Signature: (BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxisType
+Java_edu_wpi_first_hal_HAL_getJoystickAxisType
  (JNIEnv*, jclass, jbyte joystickNum, jbyte axis)
 {
  NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickAxisType";
@@ -303,60 +303,60 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getJoystickAxisType
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    isNewControlData
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_isNewControlData
+Java_edu_wpi_first_hal_HAL_isNewControlData
  (JNIEnv*, jclass)
 {
  return static_cast<jboolean>(HAL_IsNewControlData());
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    waitForDSData
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_waitForDSData
+Java_edu_wpi_first_hal_HAL_waitForDSData
  (JNIEnv* env, jclass)
 {
  HAL_WaitForDSData();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    releaseDSMutex
 * Signature: ()V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_releaseDSMutex
+Java_edu_wpi_first_hal_HAL_releaseDSMutex
  (JNIEnv* env, jclass)
 {
  HAL_ReleaseDSMutex();
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    waitForDSDataTimeout
 * Signature: (D)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_waitForDSDataTimeout
+Java_edu_wpi_first_hal_HAL_waitForDSDataTimeout
  (JNIEnv*, jclass, jdouble timeout)
 {
  return static_cast<jboolean>(HAL_WaitForDSDataTimeout(timeout));
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getMatchTime
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getMatchTime
+Java_edu_wpi_first_hal_HAL_getMatchTime
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -364,12 +364,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getMatchTime
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getSystemActive
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getSystemActive
+Java_edu_wpi_first_hal_HAL_getSystemActive
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -379,12 +379,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getSystemActive
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getBrownedOut
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getBrownedOut
+Java_edu_wpi_first_hal_HAL_getBrownedOut
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -394,12 +394,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getBrownedOut
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getMatchInfo
 * Signature: (Ljava/lang/Object;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getMatchInfo
+Java_edu_wpi_first_hal_HAL_getMatchInfo
  (JNIEnv* env, jclass, jobject info)
 {
  HAL_MatchInfo matchInfo;
@@ -411,12 +411,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getMatchInfo
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    sendError
 * Signature: (ZIZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_sendError
+Java_edu_wpi_first_hal_HAL_sendError
  (JNIEnv* env, jclass, jboolean isError, jint errorCode, jboolean isLVCode,
   jstring details, jstring location, jstring callStack, jboolean printMsg)
 {
@@ -434,12 +434,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_sendError
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getPortWithModule
 * Signature: (BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getPortWithModule
+Java_edu_wpi_first_hal_HAL_getPortWithModule
  (JNIEnv* env, jclass, jbyte module, jbyte channel)
 {
  // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue";
@@ -451,12 +451,12 @@ Java_edu_wpi_first_wpilibj_hal_HAL_getPortWithModule
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HAL
+ * Class:     edu_wpi_first_hal_HAL
 * Method:    getPort
 * Signature: (B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HAL_getPort
+Java_edu_wpi_first_hal_HAL_getPort
  (JNIEnv* env, jclass, jbyte channel)
 {
  // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue";
--- a/hal/src/main/native/cpp/jni/HALUtil.cpp
+++ b/hal/src/main/native/cpp/jni/HALUtil.cpp
@@ -19,7 +19,7 @@
 #include <wpi/jni_util.h>
 #include <wpi/raw_ostream.h>

-#include "edu_wpi_first_wpilibj_hal_HALUtil.h"
+#include "edu_wpi_first_hal_HALUtil.h"
 #include "hal/CAN.h"
 #include "hal/DriverStation.h"
 #include "hal/Errors.h"
@@ -61,26 +61,25 @@ static JClass accumulatorResultCls;
 static JClass canDataCls;

 static const JClassInit classes[] = {
-    {"edu/wpi/first/wpilibj/PWMConfigDataResult", &pwmConfigDataResultCls},
-    {"edu/wpi/first/wpilibj/can/CANStatus", &canStatusCls},
-    {"edu/wpi/first/wpilibj/hal/MatchInfoData", &matchInfoDataCls},
-    {"edu/wpi/first/wpilibj/AccumulatorResult", &accumulatorResultCls},
-    {"edu/wpi/first/wpilibj/CANData", &canDataCls}};
+    {"edu/wpi/first/hal/PWMConfigDataResult", &pwmConfigDataResultCls},
+    {"edu/wpi/first/hal/can/CANStatus", &canStatusCls},
+    {"edu/wpi/first/hal/MatchInfoData", &matchInfoDataCls},
+    {"edu/wpi/first/hal/AccumulatorResult", &accumulatorResultCls},
+    {"edu/wpi/first/hal/CANData", &canDataCls}};

 static const JExceptionInit exceptions[] = {
    {"java/lang/IllegalArgumentException", &illegalArgExCls},
-    {"edu/wpi/first/wpilibj/util/BoundaryException", &boundaryExCls},
-    {"edu/wpi/first/wpilibj/util/AllocationException", &allocationExCls},
-    {"edu/wpi/first/wpilibj/util/HalHandleException", &halHandleExCls},
-    {"edu/wpi/first/wpilibj/can/CANInvalidBufferException",
-     &canInvalidBufferExCls},
-    {"edu/wpi/first/wpilibj/can/CANMessageNotFoundException",
+    {"edu/wpi/first/hal/util/BoundaryException", &boundaryExCls},
+    {"edu/wpi/first/hal/util/AllocationException", &allocationExCls},
+    {"edu/wpi/first/hal/util/HalHandleException", &halHandleExCls},
+    {"edu/wpi/first/hal/can/CANInvalidBufferException", &canInvalidBufferExCls},
+    {"edu/wpi/first/hal/can/CANMessageNotFoundException",
     &canMessageNotFoundExCls},
-    {"edu/wpi/first/wpilibj/can/CANMessageNotAllowedException",
+    {"edu/wpi/first/hal/can/CANMessageNotAllowedException",
     &canMessageNotAllowedExCls},
-    {"edu/wpi/first/wpilibj/can/CANNotInitializedException",
+    {"edu/wpi/first/hal/can/CANNotInitializedException",
     &canNotInitializedExCls},
-    {"edu/wpi/first/wpilibj/util/UncleanStatusException", &uncleanStatusExCls}};
+    {"edu/wpi/first/hal/util/UncleanStatusException", &uncleanStatusExCls}};

 namespace frc {

@@ -339,12 +338,12 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved) {
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getFPGAVersion
 * Signature: ()S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAVersion
+Java_edu_wpi_first_hal_HALUtil_getFPGAVersion
  (JNIEnv* env, jclass)
 {
  HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGAVersion";
@@ -357,12 +356,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAVersion
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getFPGARevision
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGARevision
+Java_edu_wpi_first_hal_HALUtil_getFPGARevision
  (JNIEnv* env, jclass)
 {
  HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGARevision";
@@ -375,12 +374,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGARevision
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getFPGATime
 * Signature: ()J
 */
 JNIEXPORT jlong JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGATime
+Java_edu_wpi_first_hal_HALUtil_getFPGATime
  (JNIEnv* env, jclass)
 {
  // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime";
@@ -393,12 +392,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGATime
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getHALRuntimeType
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALRuntimeType
+Java_edu_wpi_first_hal_HALUtil_getHALRuntimeType
  (JNIEnv* env, jclass)
 {
  // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getHALRuntimeType";
@@ -408,12 +407,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALRuntimeType
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getFPGAButton
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAButton
+Java_edu_wpi_first_hal_HALUtil_getFPGAButton
  (JNIEnv* env, jclass)
 {
  // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime";
@@ -426,12 +425,12 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAButton
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getHALErrorMessage
 * Signature: (I)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrorMessage
+Java_edu_wpi_first_hal_HALUtil_getHALErrorMessage
  (JNIEnv* paramEnv, jclass, jint paramId)
 {
  const char* msg = HAL_GetErrorMessage(paramId);
@@ -441,24 +440,24 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrorMessage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getHALErrno
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrno
+Java_edu_wpi_first_hal_HALUtil_getHALErrno
  (JNIEnv*, jclass)
 {
  return errno;
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_HALUtil
+ * Class:     edu_wpi_first_hal_HALUtil
 * Method:    getHALstrerror
 * Signature: (I)Ljava/lang/String;
 */
 JNIEXPORT jstring JNICALL
-Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALstrerror
+Java_edu_wpi_first_hal_HALUtil_getHALstrerror
  (JNIEnv* env, jclass, jint errorCode)
 {
  const char* msg = std::strerror(errno);
--- a/hal/src/main/native/cpp/jni/I2CJNI.cpp
+++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp
@@ -12,7 +12,7 @@
 #include <wpi/jni_util.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_I2CJNI.h"
+#include "edu_wpi_first_hal_I2CJNI.h"
 #include "hal/I2C.h"
 #include "hal/cpp/Log.h"

@@ -31,12 +31,12 @@ TLogLevel i2cJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CInitialize
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CInitialize
+Java_edu_wpi_first_hal_I2CJNI_i2CInitialize
  (JNIEnv* env, jclass, jint port)
 {
  I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CInititalize";
@@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CInitialize
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CTransaction
 * Signature: (IBLjava/lang/Object;BLjava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransaction
+Java_edu_wpi_first_hal_I2CJNI_i2CTransaction
  (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend,
   jbyte sendSize, jobject dataReceived, jbyte receiveSize)
 {
@@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransaction
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CTransactionB
 * Signature: (IB[BB[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransactionB
+Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB
  (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend,
   jbyte sendSize, jbyteArray dataReceived, jbyte receiveSize)
 {
@@ -109,12 +109,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CTransactionB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CWrite
 * Signature: (IBLjava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWrite
+Java_edu_wpi_first_hal_I2CJNI_i2CWrite
  (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend,
   jbyte sendSize)
 {
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWrite
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CWriteB
 * Signature: (IB[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWriteB
+Java_edu_wpi_first_hal_I2CJNI_i2CWriteB
  (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend,
   jbyte sendSize)
 {
@@ -159,12 +159,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CWriteB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CRead
 * Signature: (IBLjava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CRead
+Java_edu_wpi_first_hal_I2CJNI_i2CRead
  (JNIEnv* env, jclass, jint port, jbyte address, jobject dataReceived,
   jbyte receiveSize)
 {
@@ -182,12 +182,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CRead
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CReadB
 * Signature: (IB[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CReadB
+Java_edu_wpi_first_hal_I2CJNI_i2CReadB
  (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataReceived,
   jbyte receiveSize)
 {
@@ -206,12 +206,12 @@ Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CReadB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_I2CJNI
+ * Class:     edu_wpi_first_hal_I2CJNI
 * Method:    i2CClose
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_I2CJNI_i2CClose
+Java_edu_wpi_first_hal_I2CJNI_i2CClose
  (JNIEnv*, jclass, jint port)
 {
  I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CClose";
--- a/hal/src/main/native/cpp/jni/InterruptJNI.cpp
+++ b/hal/src/main/native/cpp/jni/InterruptJNI.cpp
@@ -15,7 +15,7 @@
 #include <wpi/mutex.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_InterruptJNI.h"
+#include "edu_wpi_first_hal_InterruptJNI.h"
 #include "hal/Interrupts.h"
 #include "hal/cpp/Log.h"

@@ -121,12 +121,12 @@ void interruptHandler(uint32_t mask, void* param) {
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    initializeInterrupts
 * Signature: (Z)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_initializeInterrupts
+Java_edu_wpi_first_hal_InterruptJNI_initializeInterrupts
  (JNIEnv* env, jclass, jboolean watcher)
 {
  INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI initializeInterrupts";
@@ -143,12 +143,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_initializeInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    cleanInterrupts
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_cleanInterrupts
+Java_edu_wpi_first_hal_InterruptJNI_cleanInterrupts
  (JNIEnv* env, jclass, jint interruptHandle)
 {
  INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI cleanInterrupts";
@@ -168,12 +168,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_cleanInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    waitForInterrupt
 * Signature: (IDZ)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_waitForInterrupt
+Java_edu_wpi_first_hal_InterruptJNI_waitForInterrupt
  (JNIEnv* env, jclass, jint interruptHandle, jdouble timeout,
   jboolean ignorePrevious)
 {
@@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_waitForInterrupt
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    enableInterrupts
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_enableInterrupts
+Java_edu_wpi_first_hal_InterruptJNI_enableInterrupts
  (JNIEnv* env, jclass, jint interruptHandle)
 {
  INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI enableInterrupts";
@@ -213,12 +213,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_enableInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    disableInterrupts
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_disableInterrupts
+Java_edu_wpi_first_hal_InterruptJNI_disableInterrupts
  (JNIEnv* env, jclass, jint interruptHandle)
 {
  INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI disableInterrupts";
@@ -234,12 +234,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_disableInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    readInterruptRisingTimestamp
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptRisingTimestamp
+Java_edu_wpi_first_hal_InterruptJNI_readInterruptRisingTimestamp
  (JNIEnv* env, jclass, jint interruptHandle)
 {
  INTERRUPTJNI_LOG(logDEBUG)
@@ -257,12 +257,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptRisingTimestamp
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    readInterruptFallingTimestamp
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptFallingTimestamp
+Java_edu_wpi_first_hal_InterruptJNI_readInterruptFallingTimestamp
  (JNIEnv* env, jclass, jint interruptHandle)
 {
  INTERRUPTJNI_LOG(logDEBUG)
@@ -280,12 +280,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_readInterruptFallingTimestamp
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    requestInterrupts
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_requestInterrupts
+Java_edu_wpi_first_hal_InterruptJNI_requestInterrupts
  (JNIEnv* env, jclass, jint interruptHandle, jint digitalSourceHandle,
   jint analogTriggerType)
 {
@@ -305,12 +305,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_requestInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    attachInterruptHandler
 * Signature: (ILjava/lang/Object;Ljava/lang/Object;)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_attachInterruptHandler
+Java_edu_wpi_first_hal_InterruptJNI_attachInterruptHandler
  (JNIEnv* env, jclass, jint interruptHandle, jobject handler, jobject param)
 {
  INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI attachInterruptHandler";
@@ -347,12 +347,12 @@ Java_edu_wpi_first_wpilibj_hal_InterruptJNI_attachInterruptHandler
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_InterruptJNI
+ * Class:     edu_wpi_first_hal_InterruptJNI
 * Method:    setInterruptUpSourceEdge
 * Signature: (IZZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_InterruptJNI_setInterruptUpSourceEdge
+Java_edu_wpi_first_hal_InterruptJNI_setInterruptUpSourceEdge
  (JNIEnv* env, jclass, jint interruptHandle, jboolean risingEdge,
   jboolean fallingEdge)
 {
--- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp
+++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp
@@ -11,7 +11,7 @@
 #include <cstdio>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_NotifierJNI.h"
+#include "edu_wpi_first_hal_NotifierJNI.h"
 #include "hal/Notifier.h"
 #include "hal/cpp/Log.h"

@@ -29,12 +29,12 @@ TLogLevel notifierJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    initializeNotifier
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_initializeNotifier
+Java_edu_wpi_first_hal_NotifierJNI_initializeNotifier
  (JNIEnv* env, jclass)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI initializeNotifier";
@@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_initializeNotifier
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    stopNotifier
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_stopNotifier
+Java_edu_wpi_first_hal_NotifierJNI_stopNotifier
  (JNIEnv* env, jclass cls, jint notifierHandle)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI stopNotifier";
@@ -72,12 +72,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_stopNotifier
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    cleanNotifier
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cleanNotifier
+Java_edu_wpi_first_hal_NotifierJNI_cleanNotifier
  (JNIEnv* env, jclass, jint notifierHandle)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cleanNotifier";
@@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cleanNotifier
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    updateNotifierAlarm
 * Signature: (IJ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_updateNotifierAlarm
+Java_edu_wpi_first_hal_NotifierJNI_updateNotifierAlarm
  (JNIEnv* env, jclass cls, jint notifierHandle, jlong triggerTime)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI updateNotifierAlarm";
@@ -113,12 +113,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_updateNotifierAlarm
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    cancelNotifierAlarm
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cancelNotifierAlarm
+Java_edu_wpi_first_hal_NotifierJNI_cancelNotifierAlarm
  (JNIEnv* env, jclass cls, jint notifierHandle)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cancelNotifierAlarm";
@@ -132,12 +132,12 @@ Java_edu_wpi_first_wpilibj_hal_NotifierJNI_cancelNotifierAlarm
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_NotifierJNI
+ * Class:     edu_wpi_first_hal_NotifierJNI
 * Method:    waitForNotifierAlarm
 * Signature: (I)J
 */
 JNIEXPORT jlong JNICALL
-Java_edu_wpi_first_wpilibj_hal_NotifierJNI_waitForNotifierAlarm
+Java_edu_wpi_first_hal_NotifierJNI_waitForNotifierAlarm
  (JNIEnv* env, jclass cls, jint notifierHandle)
 {
  NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI waitForNotifierAlarm";
--- a/hal/src/main/native/cpp/jni/PDPJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PDPJNI.cpp
@@ -6,7 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_PDPJNI.h"
+#include "edu_wpi_first_hal_PDPJNI.h"
 #include "hal/PDP.h"
 #include "hal/Ports.h"

@@ -15,12 +15,12 @@ using namespace frc;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    initializePDP
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_initializePDP
+Java_edu_wpi_first_hal_PDPJNI_initializePDP
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -30,36 +30,36 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_initializePDP
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    checkPDPChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_checkPDPChannel
+Java_edu_wpi_first_hal_PDPJNI_checkPDPChannel
  (JNIEnv* env, jclass, jint channel)
 {
  return HAL_CheckPDPChannel(channel);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    checkPDPModule
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_checkPDPModule
+Java_edu_wpi_first_hal_PDPJNI_checkPDPModule
  (JNIEnv* env, jclass, jint module)
 {
  return HAL_CheckPDPModule(module);
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPTemperature
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTemperature
+Java_edu_wpi_first_hal_PDPJNI_getPDPTemperature
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -69,12 +69,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTemperature
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPVoltage
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPVoltage
+Java_edu_wpi_first_hal_PDPJNI_getPDPVoltage
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -84,12 +84,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPVoltage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPChannelCurrent
 * Signature: (BI)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPChannelCurrent
+Java_edu_wpi_first_hal_PDPJNI_getPDPChannelCurrent
  (JNIEnv* env, jclass, jbyte channel, jint handle)
 {
  int32_t status = 0;
@@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPChannelCurrent
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPTotalCurrent
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalCurrent
+Java_edu_wpi_first_hal_PDPJNI_getPDPTotalCurrent
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -114,12 +114,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalCurrent
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPTotalPower
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalPower
+Java_edu_wpi_first_hal_PDPJNI_getPDPTotalPower
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -129,12 +129,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalPower
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    getPDPTotalEnergy
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalEnergy
+Java_edu_wpi_first_hal_PDPJNI_getPDPTotalEnergy
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -144,12 +144,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalEnergy
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    resetPDPTotalEnergy
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_resetPDPTotalEnergy
+Java_edu_wpi_first_hal_PDPJNI_resetPDPTotalEnergy
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
@@ -158,12 +158,12 @@ Java_edu_wpi_first_wpilibj_hal_PDPJNI_resetPDPTotalEnergy
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PDPJNI
+ * Class:     edu_wpi_first_hal_PDPJNI
 * Method:    clearPDPStickyFaults
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PDPJNI_clearPDPStickyFaults
+Java_edu_wpi_first_hal_PDPJNI_clearPDPStickyFaults
  (JNIEnv* env, jclass, jint handle)
 {
  int32_t status = 0;
--- a/hal/src/main/native/cpp/jni/PWMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_PWMJNI.h"
+#include "edu_wpi_first_hal_PWMJNI.h"
 #include "hal/DIO.h"
 #include "hal/PWM.h"
 #include "hal/Ports.h"
@@ -31,12 +31,12 @@ TLogLevel pwmJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    initializePWMPort
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_initializePWMPort
+Java_edu_wpi_first_hal_PWMJNI_initializePWMPort
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "Calling PWMJNI initializePWMPort";
@@ -51,12 +51,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_initializePWMPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    checkPWMChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_checkPWMChannel
+Java_edu_wpi_first_hal_PWMJNI_checkPWMChannel
  (JNIEnv* env, jclass, jint channel)
 {
  PWMJNI_LOG(logDEBUG) << "Calling PWMJNI checkPWMChannel";
@@ -65,12 +65,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_checkPWMChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    freePWMPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_freePWMPort
+Java_edu_wpi_first_hal_PWMJNI_freePWMPort
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "Calling PWMJNI freePWMPort";
@@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_freePWMPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMConfigRaw
 * Signature: (IIIIII)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfigRaw
+Java_edu_wpi_first_hal_PWMJNI_setPWMConfigRaw
  (JNIEnv* env, jclass, jint id, jint maxPwm, jint deadbandMaxPwm,
   jint centerPwm, jint deadbandMinPwm, jint minPwm)
 {
@@ -99,12 +99,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfigRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMConfig
 * Signature: (IDDDDD)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfig
+Java_edu_wpi_first_hal_PWMJNI_setPWMConfig
  (JNIEnv* env, jclass, jint id, jdouble maxPwm, jdouble deadbandMaxPwm,
   jdouble centerPwm, jdouble deadbandMinPwm, jdouble minPwm)
 {
@@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMConfig
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    getPWMConfigRaw
 * Signature: (I)Ljava/lang/Object;
 */
 JNIEXPORT jobject JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMConfigRaw
+Java_edu_wpi_first_hal_PWMJNI_getPWMConfigRaw
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "Calling PWMJNI getPWMConfigRaw";
@@ -141,12 +141,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMConfigRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMEliminateDeadband
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMEliminateDeadband
+Java_edu_wpi_first_hal_PWMJNI_setPWMEliminateDeadband
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -157,12 +157,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMEliminateDeadband
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    getPWMEliminateDeadband
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMEliminateDeadband
+Java_edu_wpi_first_hal_PWMJNI_getPWMEliminateDeadband
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -174,12 +174,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMEliminateDeadband
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMRaw
 * Signature: (IS)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMRaw
+Java_edu_wpi_first_hal_PWMJNI_setPWMRaw
  (JNIEnv* env, jclass, jint id, jshort value)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -191,12 +191,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMSpeed
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMSpeed
+Java_edu_wpi_first_hal_PWMJNI_setPWMSpeed
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMSpeed
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMPosition
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPosition
+Java_edu_wpi_first_hal_PWMJNI_setPWMPosition
  (JNIEnv* env, jclass, jint id, jdouble value)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -225,12 +225,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPosition
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    getPWMRaw
 * Signature: (I)S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMRaw
+Java_edu_wpi_first_hal_PWMJNI_getPWMRaw
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -243,12 +243,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMRaw
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    getPWMSpeed
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMSpeed
+Java_edu_wpi_first_hal_PWMJNI_getPWMSpeed
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -261,12 +261,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMSpeed
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    getPWMPosition
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMPosition
+Java_edu_wpi_first_hal_PWMJNI_getPWMPosition
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -279,12 +279,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMPosition
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMDisabled
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMDisabled
+Java_edu_wpi_first_hal_PWMJNI_setPWMDisabled
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -295,12 +295,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMDisabled
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    latchPWMZero
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_latchPWMZero
+Java_edu_wpi_first_hal_PWMJNI_latchPWMZero
  (JNIEnv* env, jclass, jint id)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
@@ -311,12 +311,12 @@ Java_edu_wpi_first_wpilibj_hal_PWMJNI_latchPWMZero
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PWMJNI
+ * Class:     edu_wpi_first_hal_PWMJNI
 * Method:    setPWMPeriodScale
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMPeriodScale
+Java_edu_wpi_first_hal_PWMJNI_setPWMPeriodScale
  (JNIEnv* env, jclass, jint id, jint value)
 {
  PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id;
--- a/hal/src/main/native/cpp/jni/PortsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_PortsJNI.h"
+#include "edu_wpi_first_hal_PortsJNI.h"
 #include "hal/Ports.h"
 #include "hal/cpp/Log.h"

@@ -27,12 +27,12 @@ TLogLevel portsJNILogLevel = logWARNING;

 extern "C" {
 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumAccumulators
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAccumulators
+Java_edu_wpi_first_hal_PortsJNI_getNumAccumulators
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAccumulators";
@@ -42,12 +42,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAccumulators
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumAnalogTriggers
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogTriggers
+Java_edu_wpi_first_hal_PortsJNI_getNumAnalogTriggers
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogTriggers";
@@ -57,12 +57,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogTriggers
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumAnalogInputs
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogInputs
+Java_edu_wpi_first_hal_PortsJNI_getNumAnalogInputs
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogInputs";
@@ -72,12 +72,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogInputs
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumAnalogOutputs
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogOutputs
+Java_edu_wpi_first_hal_PortsJNI_getNumAnalogOutputs
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogOutputs";
@@ -87,12 +87,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumAnalogOutputs
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumCounters
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumCounters
+Java_edu_wpi_first_hal_PortsJNI_getNumCounters
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumCounters";
@@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumCounters
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumDigitalHeaders
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalHeaders
+Java_edu_wpi_first_hal_PortsJNI_getNumDigitalHeaders
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalHeaders";
@@ -117,12 +117,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalHeaders
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumPWMHeaders
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMHeaders
+Java_edu_wpi_first_hal_PortsJNI_getNumPWMHeaders
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMHeaders";
@@ -132,12 +132,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMHeaders
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumDigitalChannels
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalChannels
+Java_edu_wpi_first_hal_PortsJNI_getNumDigitalChannels
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalChannels";
@@ -147,12 +147,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalChannels
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumPWMChannels
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMChannels
+Java_edu_wpi_first_hal_PortsJNI_getNumPWMChannels
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMChannels";
@@ -162,12 +162,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPWMChannels
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumDigitalPWMOutputs
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalPWMOutputs
+Java_edu_wpi_first_hal_PortsJNI_getNumDigitalPWMOutputs
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalPWMOutputs";
@@ -177,12 +177,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumDigitalPWMOutputs
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumEncoders
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumEncoders
+Java_edu_wpi_first_hal_PortsJNI_getNumEncoders
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumEncoders";
@@ -192,12 +192,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumEncoders
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumInterrupts
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumInterrupts
+Java_edu_wpi_first_hal_PortsJNI_getNumInterrupts
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumInterrupts";
@@ -207,12 +207,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumInterrupts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumRelayChannels
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayChannels
+Java_edu_wpi_first_hal_PortsJNI_getNumRelayChannels
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayChannels";
@@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayChannels
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumRelayHeaders
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayHeaders
+Java_edu_wpi_first_hal_PortsJNI_getNumRelayHeaders
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayHeaders";
@@ -237,12 +237,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumRelayHeaders
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumPCMModules
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPCMModules
+Java_edu_wpi_first_hal_PortsJNI_getNumPCMModules
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPCMModules";
@@ -252,12 +252,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPCMModules
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumSolenoidChannels
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumSolenoidChannels
+Java_edu_wpi_first_hal_PortsJNI_getNumSolenoidChannels
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumSolenoidChannels";
@@ -267,12 +267,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumSolenoidChannels
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumPDPModules
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPModules
+Java_edu_wpi_first_hal_PortsJNI_getNumPDPModules
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPModules";
@@ -282,12 +282,12 @@ Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPModules
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PortsJNI
+ * Class:     edu_wpi_first_hal_PortsJNI
 * Method:    getNumPDPChannels
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PortsJNI_getNumPDPChannels
+Java_edu_wpi_first_hal_PortsJNI_getNumPDPChannels
  (JNIEnv* env, jclass)
 {
  PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPChannels";
--- a/hal/src/main/native/cpp/jni/PowerJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PowerJNI.cpp
@@ -8,7 +8,7 @@
 #include <jni.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_PowerJNI.h"
+#include "edu_wpi_first_hal_PowerJNI.h"
 #include "hal/Power.h"

 using namespace frc;
@@ -16,12 +16,12 @@ using namespace frc;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getVinVoltage
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinVoltage
+Java_edu_wpi_first_hal_PowerJNI_getVinVoltage
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -31,12 +31,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinVoltage
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getVinCurrent
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinCurrent
+Java_edu_wpi_first_hal_PowerJNI_getVinCurrent
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -46,12 +46,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getVinCurrent
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserVoltage6V
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage6V
+Java_edu_wpi_first_hal_PowerJNI_getUserVoltage6V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage6V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrent6V
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent6V
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrent6V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -76,12 +76,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent6V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserActive6V
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive6V
+Java_edu_wpi_first_hal_PowerJNI_getUserActive6V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -91,12 +91,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive6V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrentFaults6V
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults6V
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults6V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -106,12 +106,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults6V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserVoltage5V
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage5V
+Java_edu_wpi_first_hal_PowerJNI_getUserVoltage5V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -121,12 +121,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage5V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrent5V
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent5V
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrent5V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent5V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserActive5V
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive5V
+Java_edu_wpi_first_hal_PowerJNI_getUserActive5V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -151,12 +151,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive5V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrentFaults5V
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults5V
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults5V
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -166,12 +166,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults5V
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserVoltage3V3
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage3V3
+Java_edu_wpi_first_hal_PowerJNI_getUserVoltage3V3
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -181,12 +181,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserVoltage3V3
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrent3V3
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent3V3
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrent3V3
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -196,12 +196,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrent3V3
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserActive3V3
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive3V3
+Java_edu_wpi_first_hal_PowerJNI_getUserActive3V3
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
@@ -211,12 +211,12 @@ Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserActive3V3
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_PowerJNI
+ * Class:     edu_wpi_first_hal_PowerJNI
 * Method:    getUserCurrentFaults3V3
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFaults3V3
+Java_edu_wpi_first_hal_PowerJNI_getUserCurrentFaults3V3
  (JNIEnv* env, jclass)
 {
  int32_t status = 0;
--- a/hal/src/main/native/cpp/jni/RelayJNI.cpp
+++ b/hal/src/main/native/cpp/jni/RelayJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_RelayJNI.h"
+#include "edu_wpi_first_hal_RelayJNI.h"
 #include "hal/Ports.h"
 #include "hal/Relay.h"
 #include "hal/cpp/Log.h"
@@ -30,12 +30,12 @@ TLogLevel relayJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_RelayJNI
+ * Class:     edu_wpi_first_hal_RelayJNI
 * Method:    initializeRelayPort
 * Signature: (IZ)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_RelayJNI_initializeRelayPort
+Java_edu_wpi_first_hal_RelayJNI_initializeRelayPort
  (JNIEnv* env, jclass, jint id, jboolean fwd)
 {
  RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI initializeRelayPort";
@@ -52,12 +52,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_initializeRelayPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_RelayJNI
+ * Class:     edu_wpi_first_hal_RelayJNI
 * Method:    freeRelayPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_RelayJNI_freeRelayPort
+Java_edu_wpi_first_hal_RelayJNI_freeRelayPort
  (JNIEnv* env, jclass, jint id)
 {
  RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI freeRelayPort";
@@ -66,12 +66,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_freeRelayPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_RelayJNI
+ * Class:     edu_wpi_first_hal_RelayJNI
 * Method:    checkRelayChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_RelayJNI_checkRelayChannel
+Java_edu_wpi_first_hal_RelayJNI_checkRelayChannel
  (JNIEnv* env, jclass, jint channel)
 {
  RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI checkRelayChannel";
@@ -80,12 +80,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_checkRelayChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_RelayJNI
+ * Class:     edu_wpi_first_hal_RelayJNI
 * Method:    setRelay
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_RelayJNI_setRelay
+Java_edu_wpi_first_hal_RelayJNI_setRelay
  (JNIEnv* env, jclass, jint id, jboolean value)
 {
  RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI setRelay";
@@ -98,12 +98,12 @@ Java_edu_wpi_first_wpilibj_hal_RelayJNI_setRelay
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_RelayJNI
+ * Class:     edu_wpi_first_hal_RelayJNI
 * Method:    getRelay
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_RelayJNI_getRelay
+Java_edu_wpi_first_hal_RelayJNI_getRelay
  (JNIEnv* env, jclass, jint id)
 {
  RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI getRelay";
--- a/hal/src/main/native/cpp/jni/SPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SPIJNI.cpp
@@ -12,7 +12,7 @@
 #include <wpi/jni_util.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_SPIJNI.h"
+#include "edu_wpi_first_hal_SPIJNI.h"
 #include "hal/SPI.h"
 #include "hal/cpp/Log.h"

@@ -31,12 +31,12 @@ TLogLevel spiJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiInitialize
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitialize
+Java_edu_wpi_first_hal_SPIJNI_spiInitialize
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitialize";
@@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitialize
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiTransaction
 * Signature: (ILjava/lang/Object;Ljava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransaction
+Java_edu_wpi_first_hal_SPIJNI_spiTransaction
  (JNIEnv* env, jclass, jint port, jobject dataToSend, jobject dataReceived,
   jbyte size)
 {
@@ -76,12 +76,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransaction
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiTransactionB
 * Signature: (I[B[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransactionB
+Java_edu_wpi_first_hal_SPIJNI_spiTransactionB
  (JNIEnv* env, jclass, jint port, jbyteArray dataToSend,
   jbyteArray dataReceived, jbyte size)
 {
@@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiTransactionB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiWrite
 * Signature: (ILjava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWrite
+Java_edu_wpi_first_hal_SPIJNI_spiWrite
  (JNIEnv* env, jclass, jint port, jobject dataToSend, jbyte size)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWrite";
@@ -126,12 +126,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWrite
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiWriteB
 * Signature: (I[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWriteB
+Java_edu_wpi_first_hal_SPIJNI_spiWriteB
  (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jbyte size)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWriteB";
@@ -146,12 +146,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiWriteB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiRead
 * Signature: (IZLjava/lang/Object;B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiRead
+Java_edu_wpi_first_hal_SPIJNI_spiRead
  (JNIEnv* env, jclass, jint port, jboolean initiate, jobject dataReceived,
   jbyte size)
 {
@@ -177,12 +177,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiRead
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiReadB
 * Signature: (IZ[BB)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadB
+Java_edu_wpi_first_hal_SPIJNI_spiReadB
  (JNIEnv* env, jclass, jint port, jboolean initiate, jbyteArray dataReceived,
   jbyte size)
 {
@@ -208,12 +208,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadB
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiClose
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiClose
+Java_edu_wpi_first_hal_SPIJNI_spiClose
  (JNIEnv*, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiClose";
@@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiClose
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiSetSpeed
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetSpeed
+Java_edu_wpi_first_hal_SPIJNI_spiSetSpeed
  (JNIEnv*, jclass, jint port, jint speed)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetSpeed";
@@ -237,12 +237,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetSpeed
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiSetOpts
 * Signature: (IIII)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetOpts
+Java_edu_wpi_first_hal_SPIJNI_spiSetOpts
  (JNIEnv*, jclass, jint port, jint msb_first, jint sample_on_trailing,
   jint clk_idle_high)
 {
@@ -256,12 +256,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetOpts
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiSetChipSelectActiveHigh
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveHigh
+Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveHigh
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveHigh";
@@ -273,12 +273,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveHigh
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiSetChipSelectActiveLow
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveLow
+Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveLow
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveLow";
@@ -290,12 +290,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetChipSelectActiveLow
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiInitAuto
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitAuto
+Java_edu_wpi_first_hal_SPIJNI_spiInitAuto
  (JNIEnv* env, jclass, jint port, jint bufferSize)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitAuto";
@@ -308,12 +308,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiInitAuto
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiFreeAuto
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiFreeAuto
+Java_edu_wpi_first_hal_SPIJNI_spiFreeAuto
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiFreeAuto";
@@ -325,12 +325,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiFreeAuto
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiStartAutoRate
 * Signature: (ID)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoRate
+Java_edu_wpi_first_hal_SPIJNI_spiStartAutoRate
  (JNIEnv* env, jclass, jint port, jdouble period)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStartAutoRate";
@@ -343,12 +343,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiStartAutoTrigger
 * Signature: (IIIZZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoTrigger
+Java_edu_wpi_first_hal_SPIJNI_spiStartAutoTrigger
  (JNIEnv* env, jclass, jint port, jint digitalSourceHandle,
   jint analogTriggerType, jboolean triggerRising, jboolean triggerFalling)
 {
@@ -367,12 +367,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStartAutoTrigger
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiStopAuto
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStopAuto
+Java_edu_wpi_first_hal_SPIJNI_spiStopAuto
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStopAuto";
@@ -384,12 +384,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiStopAuto
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiSetAutoTransmitData
 * Signature: (I[BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetAutoTransmitData
+Java_edu_wpi_first_hal_SPIJNI_spiSetAutoTransmitData
  (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jint zeroSize)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetAutoTransmitData";
@@ -406,12 +406,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiSetAutoTransmitData
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiForceAutoRead
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiForceAutoRead
+Java_edu_wpi_first_hal_SPIJNI_spiForceAutoRead
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiForceAutoRead";
@@ -423,12 +423,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiForceAutoRead
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiReadAutoReceivedData
 * Signature: (ILjava/lang/Object;ID)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBuffer_2ID
+Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBuffer_2ID
  (JNIEnv* env, jclass, jint port, jobject buffer, jint numToRead,
   jdouble timeout)
 {
@@ -448,12 +448,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBu
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiReadAutoReceivedData
 * Signature: (I[BID)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__I_3BID
+Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__I_3BID
  (JNIEnv* env, jclass, jint port, jbyteArray buffer, jint numToRead,
   jdouble timeout)
 {
@@ -478,12 +478,12 @@ Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiReadAutoReceivedData__I_3BID
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SPIJNI
+ * Class:     edu_wpi_first_hal_SPIJNI
 * Method:    spiGetAutoDroppedCount
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SPIJNI_spiGetAutoDroppedCount
+Java_edu_wpi_first_hal_SPIJNI_spiGetAutoDroppedCount
  (JNIEnv* env, jclass, jint port)
 {
  SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiGetAutoDroppedCount";
--- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
@@ -12,7 +12,7 @@
 #include <wpi/jni_util.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_SerialPortJNI.h"
+#include "edu_wpi_first_hal_SerialPortJNI.h"
 #include "hal/SerialPort.h"
 #include "hal/cpp/Log.h"

@@ -31,12 +31,12 @@ TLogLevel serialJNILogLevel = logWARNING;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialInitializePort
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePort
+Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePort
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize";
@@ -48,12 +48,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialInitializePortDirect
 * Signature: (BLjava/lang/String;)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePortDirect
+Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePortDirect
  (JNIEnv* env, jclass, jbyte port, jstring portName)
 {
  SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize Direct";
@@ -68,12 +68,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialInitializePortDirect
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetBaudRate
 * Signature: (BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetBaudRate
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetBaudRate
  (JNIEnv* env, jclass, jbyte port, jint rate)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Baud Rate";
@@ -85,12 +85,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetBaudRate
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetDataBits
 * Signature: (BB)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetDataBits
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetDataBits
  (JNIEnv* env, jclass, jbyte port, jbyte bits)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Data Bits";
@@ -102,12 +102,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetDataBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetParity
 * Signature: (BB)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetParity
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetParity
  (JNIEnv* env, jclass, jbyte port, jbyte parity)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Parity";
@@ -119,12 +119,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetParity
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetStopBits
 * Signature: (BB)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetStopBits
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetStopBits
  (JNIEnv* env, jclass, jbyte port, jbyte bits)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Stop Bits";
@@ -136,12 +136,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetStopBits
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetWriteMode
 * Signature: (BB)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteMode
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteMode
  (JNIEnv* env, jclass, jbyte port, jbyte mode)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Mode";
@@ -153,12 +153,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteMode
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetFlowControl
 * Signature: (BB)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetFlowControl
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetFlowControl
  (JNIEnv* env, jclass, jbyte port, jbyte flow)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Flow Control";
@@ -170,12 +170,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetFlowControl
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetTimeout
 * Signature: (BD)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetTimeout
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetTimeout
  (JNIEnv* env, jclass, jbyte port, jdouble timeout)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Timeout";
@@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetTimeout
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialEnableTermination
 * Signature: (BC)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialEnableTermination
+Java_edu_wpi_first_hal_SerialPortJNI_serialEnableTermination
  (JNIEnv* env, jclass, jbyte port, jchar terminator)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Enable Termination";
@@ -205,12 +205,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialEnableTermination
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialDisableTermination
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialDisableTermination
+Java_edu_wpi_first_hal_SerialPortJNI_serialDisableTermination
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Disable termination";
@@ -221,12 +221,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialDisableTermination
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetReadBufferSize
 * Signature: (BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetReadBufferSize
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetReadBufferSize
  (JNIEnv* env, jclass, jbyte port, jint size)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Read Buffer Size";
@@ -238,12 +238,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetReadBufferSize
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialSetWriteBufferSize
 * Signature: (BI)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteBufferSize
+Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteBufferSize
  (JNIEnv* env, jclass, jbyte port, jint size)
 {
  SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Buffer Size";
@@ -256,12 +256,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialSetWriteBufferSize
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialGetBytesReceived
 * Signature: (B)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialGetBytesReceived
+Java_edu_wpi_first_hal_SerialPortJNI_serialGetBytesReceived
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Get Bytes Received";
@@ -274,12 +274,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialGetBytesReceived
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialRead
 * Signature: (B[BI)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialRead
+Java_edu_wpi_first_hal_SerialPortJNI_serialRead
  (JNIEnv* env, jclass, jbyte port, jbyteArray dataReceived, jint size)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Read";
@@ -297,12 +297,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialRead
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialWrite
 * Signature: (B[BI)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialWrite
+Java_edu_wpi_first_hal_SerialPortJNI_serialWrite
  (JNIEnv* env, jclass, jbyte port, jbyteArray dataToSend, jint size)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Write";
@@ -319,12 +319,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialWrite
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialFlush
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialFlush
+Java_edu_wpi_first_hal_SerialPortJNI_serialFlush
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Flush";
@@ -335,12 +335,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialFlush
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialClear
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClear
+Java_edu_wpi_first_hal_SerialPortJNI_serialClear
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Clear";
@@ -351,12 +351,12 @@ Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClear
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SerialPortJNI
+ * Class:     edu_wpi_first_hal_SerialPortJNI
 * Method:    serialClose
 * Signature: (B)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SerialPortJNI_serialClose
+Java_edu_wpi_first_hal_SerialPortJNI_serialClose
  (JNIEnv* env, jclass, jbyte port)
 {
  SERIALJNI_LOG(logDEBUG) << "Serial Close";
--- a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp
@@ -8,7 +8,7 @@
 #include <jni.h>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h"
+#include "edu_wpi_first_hal_SolenoidJNI.h"
 #include "hal/Ports.h"
 #include "hal/Solenoid.h"
 #include "hal/cpp/Log.h"
@@ -27,12 +27,12 @@ TLogLevel solenoidJNILogLevel = logERROR;
 extern "C" {

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    initializeSolenoidPort
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_initializeSolenoidPort
+Java_edu_wpi_first_hal_SolenoidJNI_initializeSolenoidPort
  (JNIEnv* env, jclass, jint id)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort";
@@ -53,12 +53,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_initializeSolenoidPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    checkSolenoidChannel
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidChannel
+Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidChannel
  (JNIEnv* env, jclass, jint channel)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidChannel";
@@ -67,12 +67,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidChannel
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    checkSolenoidModule
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidModule
+Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidModule
  (JNIEnv* env, jclass, jint module)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidModule";
@@ -81,12 +81,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_checkSolenoidModule
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    freeSolenoidPort
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_freeSolenoidPort
+Java_edu_wpi_first_hal_SolenoidJNI_freeSolenoidPort
  (JNIEnv* env, jclass, jint id)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort";
@@ -96,12 +96,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_freeSolenoidPort
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    setSolenoid
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setSolenoid
+Java_edu_wpi_first_hal_SolenoidJNI_setSolenoid
  (JNIEnv* env, jclass, jint solenoid_port, jboolean value)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetSolenoid";
@@ -115,12 +115,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setSolenoid
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    getSolenoid
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getSolenoid
+Java_edu_wpi_first_hal_SolenoidJNI_getSolenoid
  (JNIEnv* env, jclass, jint solenoid_port)
 {
  int32_t status = 0;
@@ -130,12 +130,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getSolenoid
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    getAllSolenoids
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getAllSolenoids
+Java_edu_wpi_first_hal_SolenoidJNI_getAllSolenoids
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -145,12 +145,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getAllSolenoids
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    getPCMSolenoidBlackList
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidBlackList
+Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidBlackList
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -159,12 +159,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidBlackList
  return val;
 }
 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    getPCMSolenoidVoltageStickyFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault
+Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -173,12 +173,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageStickyFault
  return val;
 }
 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    getPCMSolenoidVoltageFault
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageFault
+Java_edu_wpi_first_hal_SolenoidJNI_getPCMSolenoidVoltageFault
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -187,12 +187,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPCMSolenoidVoltageFault
  return val;
 }
 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    clearAllPCMStickyFaults
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_clearAllPCMStickyFaults
+Java_edu_wpi_first_hal_SolenoidJNI_clearAllPCMStickyFaults
  (JNIEnv* env, jclass, jint module)
 {
  int32_t status = 0;
@@ -201,12 +201,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_clearAllPCMStickyFaults
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    setOneShotDuration
 * Signature: (IJ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setOneShotDuration
+Java_edu_wpi_first_hal_SolenoidJNI_setOneShotDuration
  (JNIEnv* env, jclass, jint solenoid_port, jlong durationMS)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetOneShotDuration";
@@ -222,12 +222,12 @@ Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_setOneShotDuration
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_SolenoidJNI
+ * Class:     edu_wpi_first_hal_SolenoidJNI
 * Method:    fireOneShot
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_fireOneShot
+Java_edu_wpi_first_hal_SolenoidJNI_fireOneShot
  (JNIEnv* env, jclass, jint solenoid_port)
 {
  SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI fireOneShot";
--- a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp
@@ -10,7 +10,7 @@
 #include <cassert>

 #include "HALUtil.h"
-#include "edu_wpi_first_wpilibj_hal_ThreadsJNI.h"
+#include "edu_wpi_first_hal_ThreadsJNI.h"
 #include "hal/Threads.h"
 #include "hal/cpp/Log.h"

@@ -27,12 +27,12 @@ TLogLevel threadsJNILogLevel = logWARNING;

 extern "C" {
 /*
- * Class:     edu_wpi_first_wpilibj_hal_ThreadsJNI
+ * Class:     edu_wpi_first_hal_ThreadsJNI
 * Method:    getCurrentThreadPriority
 * Signature: ()I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadPriority
+Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadPriority
  (JNIEnv* env, jclass)
 {
  THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadPriority";
@@ -44,12 +44,12 @@ Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadPriority
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_ThreadsJNI
+ * Class:     edu_wpi_first_hal_ThreadsJNI
 * Method:    getCurrentThreadIsRealTime
 * Signature: ()Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadIsRealTime
+Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadIsRealTime
  (JNIEnv* env, jclass)
 {
  THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadIsRealTime";
@@ -61,12 +61,12 @@ Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_getCurrentThreadIsRealTime
 }

 /*
- * Class:     edu_wpi_first_wpilibj_hal_ThreadsJNI
+ * Class:     edu_wpi_first_hal_ThreadsJNI
 * Method:    setCurrentThreadPriority
 * Signature: (ZI)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_ThreadsJNI_setCurrentThreadPriority
+Java_edu_wpi_first_hal_ThreadsJNI_setCurrentThreadPriority
  (JNIEnv* env, jclass, jboolean realTime, jint priority)
 {
  THREADSJNI_LOG(logDEBUG) << "Callling SetCurrentThreadPriority";