diff --git a/hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h b/hal/include/FRC_NetworkCommunication/UsageReporting.h
similarity index 100%
rename from hal/lib/athena/FRC_NetworkCommunication/UsageReporting.h
rename to hal/include/FRC_NetworkCommunication/UsageReporting.h
diff --git a/hal/include/HAL/HAL.h b/hal/include/HAL/HAL.h
index fea749cd66..932c268ac3 100644
--- a/hal/include/HAL/HAL.h
+++ b/hal/include/HAL/HAL.h
@@ -19,6 +19,7 @@
 #include "DIO.h"
 #include "Encoder.h"
 #include "Errors.h"
+#include "FRC_NetworkCommunication/UsageReporting.h"
 #include "Handles.h"
 #include "I2C.h"
 #include "Interrupts.h"
@@ -33,6 +34,8 @@
 #include "Solenoid.h"
 #include "Task.h"
 
+namespace HALUsageReporting = nUsageReporting;
+
 #define HAL_IO_CONFIG_DATA_SIZE 32
 #define HAL_SYS_STATUS_DATA_SIZE 44
 #define HAL_USER_STATUS_DATA_SIZE \
@@ -48,113 +51,6 @@
 #define HALFRC_NetworkCommunication_DynamicType_Kinect_Joystick 24
 #define HALFRC_NetworkCommunication_DynamicType_Kinect_Custom 25
 
-namespace HALUsageReporting {
-enum tResourceType {
-  kResourceType_Controller,
-  kResourceType_Module,
-  kResourceType_Language,
-  kResourceType_CANPlugin,
-  kResourceType_Accelerometer,
-  kResourceType_ADXL345,
-  kResourceType_AnalogChannel,
-  kResourceType_AnalogTrigger,
-  kResourceType_AnalogTriggerOutput,
-  kResourceType_CANJaguar,
-  kResourceType_Compressor,
-  kResourceType_Counter,
-  kResourceType_Dashboard,
-  kResourceType_DigitalInput,
-  kResourceType_DigitalOutput,
-  kResourceType_DriverStationCIO,
-  kResourceType_DriverStationEIO,
-  kResourceType_DriverStationLCD,
-  kResourceType_Encoder,
-  kResourceType_GearTooth,
-  kResourceType_Gyro,
-  kResourceType_I2C,
-  kResourceType_Framework,
-  kResourceType_Jaguar,
-  kResourceType_Joystick,
-  kResourceType_Kinect,
-  kResourceType_KinectStick,
-  kResourceType_PIDController,
-  kResourceType_Preferences,
-  kResourceType_PWM,
-  kResourceType_Relay,
-  kResourceType_RobotDrive,
-  kResourceType_SerialPort,
-  kResourceType_Servo,
-  kResourceType_Solenoid,
-  kResourceType_SPI,
-  kResourceType_Task,
-  kResourceType_Ultrasonic,
-  kResourceType_Victor,
-  kResourceType_Button,
-  kResourceType_Command,
-  kResourceType_AxisCamera,
-  kResourceType_PCVideoServer,
-  kResourceType_SmartDashboard,
-  kResourceType_Talon,
-  kResourceType_HiTechnicColorSensor,
-  kResourceType_HiTechnicAccel,
-  kResourceType_HiTechnicCompass,
-  kResourceType_SRF08,
-  kResourceType_AnalogOutput,
-  kResourceType_VictorSP,
-  kResourceType_TalonSRX,
-  kResourceType_CANTalonSRX,
-  kResourceType_ADXL362,
-  kResourceType_ADXRS450,
-  kResourceType_RevSPARK,
-  kResourceType_MindsensorsSD540,
-  kResourceType_DigitalFilter,
-};
-
-enum tInstances {
-  kLanguage_LabVIEW = 1,
-  kLanguage_CPlusPlus = 2,
-  kLanguage_Java = 3,
-  kLanguage_Python = 4,
-
-  kCANPlugin_BlackJagBridge = 1,
-  kCANPlugin_2CAN = 2,
-
-  kFramework_Iterative = 1,
-  kFramework_Sample = 2,
-  kFramework_CommandControl = 3,
-
-  kRobotDrive_ArcadeStandard = 1,
-  kRobotDrive_ArcadeButtonSpin = 2,
-  kRobotDrive_ArcadeRatioCurve = 3,
-  kRobotDrive_Tank = 4,
-  kRobotDrive_MecanumPolar = 5,
-  kRobotDrive_MecanumCartesian = 6,
-
-  kDriverStationCIO_Analog = 1,
-  kDriverStationCIO_DigitalIn = 2,
-  kDriverStationCIO_DigitalOut = 3,
-
-  kDriverStationEIO_Acceleration = 1,
-  kDriverStationEIO_AnalogIn = 2,
-  kDriverStationEIO_AnalogOut = 3,
-  kDriverStationEIO_Button = 4,
-  kDriverStationEIO_LED = 5,
-  kDriverStationEIO_DigitalIn = 6,
-  kDriverStationEIO_DigitalOut = 7,
-  kDriverStationEIO_FixedDigitalOut = 8,
-  kDriverStationEIO_PWM = 9,
-  kDriverStationEIO_Encoder = 10,
-  kDriverStationEIO_TouchSlider = 11,
-
-  kADXL345_SPI = 1,
-  kADXL345_I2C = 2,
-
-  kCommand_Scheduler = 1,
-
-  kSmartDashboard_Instance = 1,
-};
-}
-
 struct HALControlWord {
   uint32_t enabled : 1;
   uint32_t autonomous : 1;
diff --git a/hal/lib/athena/HALAthena.cpp b/hal/lib/athena/HALAthena.cpp
index 4e37dfd68c..f7de0e4e83 100644
--- a/hal/lib/athena/HALAthena.cpp
+++ b/hal/lib/athena/HALAthena.cpp
@@ -22,7 +22,6 @@
 #include "FRC_NetworkCommunication/CANSessionMux.h"
 #include "FRC_NetworkCommunication/FRCComm.h"
 #include "FRC_NetworkCommunication/LoadOut.h"
-#include "FRC_NetworkCommunication/UsageReporting.h"
 #include "HAL/Errors.h"
 #include "ctre/ctre.h"
 #include "handles/HandlesInternal.h"
diff --git a/wpilibc/athena/src/SampleRobot.cpp b/wpilibc/athena/src/SampleRobot.cpp
index 93d40c32c2..23e605cf31 100644
--- a/wpilibc/athena/src/SampleRobot.cpp
+++ b/wpilibc/athena/src/SampleRobot.cpp
@@ -102,7 +102,7 @@ void SampleRobot::StartCompetition() {
   LiveWindow* lw = LiveWindow::GetInstance();
 
   HALReport(HALUsageReporting::kResourceType_Framework,
-            HALUsageReporting::kFramework_Sample);
+            HALUsageReporting::kFramework_Simple);
 
   SmartDashboard::init();
   NetworkTable::GetTable("LiveWindow")