diff --git a/hal/src/main/native/include/HAL/UsageReporting.h b/hal/src/main/native/include/HAL/UsageReporting.h
index 4618bb4610..a1c5bee372 100644
--- a/hal/src/main/native/include/HAL/UsageReporting.h
+++ b/hal/src/main/native/include/HAL/UsageReporting.h
@@ -1,154 +1,154 @@
-
-#ifndef __UsageReporting_h__
-#define __UsageReporting_h__
-
-#ifdef _WIN32
-#include <stdint.h>
-#define EXPORT_FUNC __declspec(dllexport) __cdecl
-#elif defined (__vxworks)
-#include <vxWorks.h>
-#define EXPORT_FUNC
-#else
-#include <stdint.h>
-#include <stdlib.h>
-#define EXPORT_FUNC
-#endif
-
-#define kUsageReporting_version 1
-
-namespace nUsageReporting
-{
-    typedef enum
-    {
-        kResourceType_Controller,
-        kResourceType_Module,
-        kResourceType_Language,
-        kResourceType_CANPlugin,
-        kResourceType_Accelerometer,
-        kResourceType_ADXL345,
-        kResourceType_AnalogChannel,
-        kResourceType_AnalogTrigger,
-        kResourceType_AnalogTriggerOutput,
-        kResourceType_CANJaguar,
-        kResourceType_Compressor, // 10
-        kResourceType_Counter,
-        kResourceType_Dashboard,
-        kResourceType_DigitalInput,
-        kResourceType_DigitalOutput,
-        kResourceType_DriverStationCIO,
-        kResourceType_DriverStationEIO,
-        kResourceType_DriverStationLCD,
-        kResourceType_Encoder,
-        kResourceType_GearTooth,
-        kResourceType_Gyro, // 20
-        kResourceType_I2C,
-        kResourceType_Framework,
-        kResourceType_Jaguar,
-        kResourceType_Joystick,
-        kResourceType_Kinect,
-        kResourceType_KinectStick,
-        kResourceType_PIDController,
-        kResourceType_Preferences,
-        kResourceType_PWM,
-        kResourceType_Relay, // 30
-        kResourceType_RobotDrive,
-        kResourceType_SerialPort,
-        kResourceType_Servo,
-        kResourceType_Solenoid,
-        kResourceType_SPI,
-        kResourceType_Task,
-        kResourceType_Ultrasonic,
-        kResourceType_Victor,
-        kResourceType_Button,
-        kResourceType_Command, // 40
-        kResourceType_AxisCamera,
-        kResourceType_PCVideoServer,
-        kResourceType_SmartDashboard,
-        kResourceType_Talon,
-        kResourceType_HiTechnicColorSensor,
-        kResourceType_HiTechnicAccel,
-        kResourceType_HiTechnicCompass,
-        kResourceType_SRF08,
-        kResourceType_AnalogOutput,
-        kResourceType_VictorSP, // 50
-        kResourceType_PWMTalonSRX,
-        kResourceType_CANTalonSRX,
-        kResourceType_ADXL362,
-        kResourceType_ADXRS450,
-        kResourceType_RevSPARK,
-        kResourceType_MindsensorsSD540,
-        kResourceType_DigitalFilter,
-        kResourceType_ADIS16448,
-        kResourceType_PDP,
-        kResourceType_PCM, // 60
-        kResourceType_PigeonIMU,
-    } tResourceType;
-
-    typedef enum
-    {
-        kLanguage_LabVIEW = 1,
-        kLanguage_CPlusPlus = 2,
-        kLanguage_Java = 3,
-        kLanguage_Python = 4,
-        kLanguage_DotNet = 5,
-
-        kCANPlugin_BlackJagBridge = 1,
-        kCANPlugin_2CAN = 2,
-
-        kFramework_Iterative = 1,
-        kFramework_Simple = 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,
-    } tInstances;
-
-    /**
-     * Report the usage of a resource of interest.
-     * 
-     * @param resource one of the values in the tResourceType above (max value 51).
-     * @param instanceNumber an index that identifies the resource instance.
-     * @param context an optional additional context number for some cases (such as module number).  Set to 0 to omit.
-     * @param feature a string to be included describing features in use on a specific resource.  Setting the same resource more than once allows you to change the feature string.
-     */
-    uint32_t EXPORT_FUNC report(tResourceType resource, uint8_t instanceNumber, uint8_t context = 0, const char *feature = NULL);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    uint32_t EXPORT_FUNC FRC_NetworkCommunication_nUsageReporting_report(uint8_t resource, uint8_t instanceNumber, uint8_t context, const char *feature);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __UsageReporting_h__
+
+#ifndef __UsageReporting_h__
+#define __UsageReporting_h__
+
+#ifdef _WIN32
+#include <stdint.h>
+#define EXPORT_FUNC __declspec(dllexport) __cdecl
+#elif defined (__vxworks)
+#include <vxWorks.h>
+#define EXPORT_FUNC
+#else
+#include <stdint.h>
+#include <stdlib.h>
+#define EXPORT_FUNC
+#endif
+
+#define kUsageReporting_version 1
+
+namespace nUsageReporting
+{
+    typedef enum
+    {
+        kResourceType_Controller,
+        kResourceType_Module,
+        kResourceType_Language,
+        kResourceType_CANPlugin,
+        kResourceType_Accelerometer,
+        kResourceType_ADXL345,
+        kResourceType_AnalogChannel,
+        kResourceType_AnalogTrigger,
+        kResourceType_AnalogTriggerOutput,
+        kResourceType_CANJaguar,
+        kResourceType_Compressor, // 10
+        kResourceType_Counter,
+        kResourceType_Dashboard,
+        kResourceType_DigitalInput,
+        kResourceType_DigitalOutput,
+        kResourceType_DriverStationCIO,
+        kResourceType_DriverStationEIO,
+        kResourceType_DriverStationLCD,
+        kResourceType_Encoder,
+        kResourceType_GearTooth,
+        kResourceType_Gyro, // 20
+        kResourceType_I2C,
+        kResourceType_Framework,
+        kResourceType_Jaguar,
+        kResourceType_Joystick,
+        kResourceType_Kinect,
+        kResourceType_KinectStick,
+        kResourceType_PIDController,
+        kResourceType_Preferences,
+        kResourceType_PWM,
+        kResourceType_Relay, // 30
+        kResourceType_RobotDrive,
+        kResourceType_SerialPort,
+        kResourceType_Servo,
+        kResourceType_Solenoid,
+        kResourceType_SPI,
+        kResourceType_Task,
+        kResourceType_Ultrasonic,
+        kResourceType_Victor,
+        kResourceType_Button,
+        kResourceType_Command, // 40
+        kResourceType_AxisCamera,
+        kResourceType_PCVideoServer,
+        kResourceType_SmartDashboard,
+        kResourceType_Talon,
+        kResourceType_HiTechnicColorSensor,
+        kResourceType_HiTechnicAccel,
+        kResourceType_HiTechnicCompass,
+        kResourceType_SRF08,
+        kResourceType_AnalogOutput,
+        kResourceType_VictorSP, // 50
+        kResourceType_PWMTalonSRX,
+        kResourceType_CANTalonSRX,
+        kResourceType_ADXL362,
+        kResourceType_ADXRS450,
+        kResourceType_RevSPARK,
+        kResourceType_MindsensorsSD540,
+        kResourceType_DigitalFilter,
+        kResourceType_ADIS16448,
+        kResourceType_PDP,
+        kResourceType_PCM, // 60
+        kResourceType_PigeonIMU,
+    } tResourceType;
+
+    typedef enum
+    {
+        kLanguage_LabVIEW = 1,
+        kLanguage_CPlusPlus = 2,
+        kLanguage_Java = 3,
+        kLanguage_Python = 4,
+        kLanguage_DotNet = 5,
+
+        kCANPlugin_BlackJagBridge = 1,
+        kCANPlugin_2CAN = 2,
+
+        kFramework_Iterative = 1,
+        kFramework_Simple = 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,
+    } tInstances;
+
+    /**
+     * Report the usage of a resource of interest.
+     *
+     * @param resource one of the values in the tResourceType above (max value 51).
+     * @param instanceNumber an index that identifies the resource instance.
+     * @param context an optional additional context number for some cases (such as module number).  Set to 0 to omit.
+     * @param feature a string to be included describing features in use on a specific resource.  Setting the same resource more than once allows you to change the feature string.
+     */
+    uint32_t EXPORT_FUNC report(tResourceType resource, uint8_t instanceNumber, uint8_t context = 0, const char *feature = NULL);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    uint32_t EXPORT_FUNC FRC_NetworkCommunication_nUsageReporting_report(uint8_t resource, uint8_t instanceNumber, uint8_t context, const char *feature);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __UsageReporting_h__
diff --git a/ni-libraries/FileLocations.txt b/ni-libraries/FileLocations.txt
new file mode 100644
index 0000000000..0d49ec81b8
--- /dev/null
+++ b/ni-libraries/FileLocations.txt
@@ -0,0 +1,10 @@
+libFRC_NetworkCommunication.so - \usr\local\frc\lib
+libi2c.so - \usr\local\frc\lib
+libNiFpga.so - \usr\local\natinst\lib
+libNiFpgaLv.so - \usr\local\natinst\lib
+libniriodevenum.so - \usr\local\natinst\lib
+libniriosession.so - \usr\local\natinst\lib
+libNiRioSrv.so - \usr\local\natinst\lib
+libRoboRIO_FRC_ChipObject.so - \usr\local\frc\lib
+libspi.so - \usr\local\frc\lib
+libvisa.so - \usr\local\vxipnp\linux\lib\
diff --git a/ni-libraries/build.gradle b/ni-libraries/build.gradle
index 3fa4f57374..533154cdd8 100644
--- a/ni-libraries/build.gradle
+++ b/ni-libraries/build.gradle
@@ -96,7 +96,7 @@ task patchNiLibraries() {
             from("$rootDir/ni-libraries/include/FRC_NetworkCommunication") {
                 include 'UsageReporting.h'
             }
-            into "$rootDir/hal/src/hal/headers/HAL"
+            into "$rootDir/hal/src/main/native/include/HAL"
         }
 
         delete {
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h b/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
index ff2b5df4b0..0324ec94ef 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h
@@ -4,6 +4,6 @@
 #ifndef __RoboRIO_FRC_ChipObject_Aliases_h__
 #define __RoboRIO_FRC_ChipObject_Aliases_h__
 
-#define nRoboRIO_FPGANamespace nFRC_2017_17_0_2
+#define nRoboRIO_FPGANamespace nFRC_2018_18_0_1
 
 #endif // __RoboRIO_FRC_ChipObject_Aliases_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
index 2b5e5f25d2..dddad68385 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_nInterfaceGlobals_h__
-#define __nFRC_2017_17_0_2_nInterfaceGlobals_h__
+#ifndef __nFRC_2018_18_0_1_nInterfaceGlobals_h__
+#define __nFRC_2018_18_0_1_nInterfaceGlobals_h__
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
    extern unsigned int g_currentTargetClass;
 }
 }
 
-#endif // __nFRC_2017_17_0_2_nInterfaceGlobals_h__
+#endif // __nFRC_2018_18_0_1_nInterfaceGlobals_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
index 3d5a68619c..7ee070a10d 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_AI_h__
-#define __nFRC_2017_17_0_2_AI_h__
+#ifndef __nFRC_2018_18_0_1_AI_h__
+#define __nFRC_2018_18_0_1_AI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAI
@@ -141,4 +141,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_AI_h__
+#endif // __nFRC_2018_18_0_1_AI_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
index 2fd7d5f554..74b0d21dd5 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_AO_h__
-#define __nFRC_2017_17_0_2_AO_h__
+#ifndef __nFRC_2018_18_0_1_AO_h__
+#define __nFRC_2018_18_0_1_AO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAO
@@ -48,4 +48,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_AO_h__
+#endif // __nFRC_2018_18_0_1_AO_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
index 203446d53d..73a43352fe 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Accel_h__
-#define __nFRC_2017_17_0_2_Accel_h__
+#ifndef __nFRC_2018_18_0_1_Accel_h__
+#define __nFRC_2018_18_0_1_Accel_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAccel
@@ -100,4 +100,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Accel_h__
+#endif // __nFRC_2018_18_0_1_Accel_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
index d0c37dd583..bc72f9c0f3 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Accumulator_h__
-#define __nFRC_2017_17_0_2_Accumulator_h__
+#ifndef __nFRC_2018_18_0_1_Accumulator_h__
+#define __nFRC_2018_18_0_1_Accumulator_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAccumulator
@@ -85,4 +85,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Accumulator_h__
+#endif // __nFRC_2018_18_0_1_Accumulator_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
index 6f51f19e7d..f61e572aeb 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Alarm_h__
-#define __nFRC_2017_17_0_2_Alarm_h__
+#ifndef __nFRC_2018_18_0_1_Alarm_h__
+#define __nFRC_2018_18_0_1_Alarm_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAlarm
@@ -55,4 +55,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Alarm_h__
+#endif // __nFRC_2018_18_0_1_Alarm_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
index 9df8ed896f..39ed95382f 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_AnalogTrigger_h__
-#define __nFRC_2017_17_0_2_AnalogTrigger_h__
+#ifndef __nFRC_2018_18_0_1_AnalogTrigger_h__
+#define __nFRC_2018_18_0_1_AnalogTrigger_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tAnalogTrigger
@@ -127,4 +127,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_AnalogTrigger_h__
+#endif // __nFRC_2018_18_0_1_AnalogTrigger_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
index 1b3fa43d33..cda239b541 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_BIST_h__
-#define __nFRC_2017_17_0_2_BIST_h__
+#ifndef __nFRC_2018_18_0_1_BIST_h__
+#define __nFRC_2018_18_0_1_BIST_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tBIST
@@ -88,4 +88,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_BIST_h__
+#endif // __nFRC_2018_18_0_1_BIST_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
index baaf51683c..dd291ad670 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Counter_h__
-#define __nFRC_2017_17_0_2_Counter_h__
+#ifndef __nFRC_2018_18_0_1_Counter_h__
+#define __nFRC_2018_18_0_1_Counter_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tCounter
@@ -217,4 +217,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Counter_h__
+#endif // __nFRC_2018_18_0_1_Counter_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
index 6204e4cc27..57cddf4623 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_DIO_h__
-#define __nFRC_2017_17_0_2_DIO_h__
+#ifndef __nFRC_2018_18_0_1_DIO_h__
+#define __nFRC_2018_18_0_1_DIO_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tDIO
@@ -261,4 +261,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_DIO_h__
+#endif // __nFRC_2018_18_0_1_DIO_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
index f5ce1c79db..65a2a19cdb 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_DMA_h__
-#define __nFRC_2017_17_0_2_DMA_h__
+#ifndef __nFRC_2018_18_0_1_DMA_h__
+#define __nFRC_2018_18_0_1_DMA_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tDMA
@@ -195,4 +195,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_DMA_h__
+#endif // __nFRC_2018_18_0_1_DMA_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
index cb75707064..d5e47c28c8 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Encoder_h__
-#define __nFRC_2017_17_0_2_Encoder_h__
+#ifndef __nFRC_2018_18_0_1_Encoder_h__
+#define __nFRC_2018_18_0_1_Encoder_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tEncoder
@@ -197,4 +197,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Encoder_h__
+#endif // __nFRC_2018_18_0_1_Encoder_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
index 019f9d48be..2fbcbacc2e 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Global_h__
-#define __nFRC_2017_17_0_2_Global_h__
+#ifndef __nFRC_2018_18_0_1_Global_h__
+#define __nFRC_2018_18_0_1_Global_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tGlobal
@@ -98,4 +98,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Global_h__
+#endif // __nFRC_2018_18_0_1_Global_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
index af0ea32c60..78ac0c3143 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Interrupt_h__
-#define __nFRC_2017_17_0_2_Interrupt_h__
+#ifndef __nFRC_2018_18_0_1_Interrupt_h__
+#define __nFRC_2018_18_0_1_Interrupt_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tInterrupt
@@ -98,4 +98,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Interrupt_h__
+#endif // __nFRC_2018_18_0_1_Interrupt_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
index 44e8971e7d..46fd247410 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_PWM_h__
-#define __nFRC_2017_17_0_2_PWM_h__
+#ifndef __nFRC_2018_18_0_1_PWM_h__
+#define __nFRC_2018_18_0_1_PWM_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tPWM
@@ -118,4 +118,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_PWM_h__
+#endif // __nFRC_2018_18_0_1_PWM_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
index 38414c4637..952103ca05 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Power_h__
-#define __nFRC_2017_17_0_2_Power_h__
+#ifndef __nFRC_2018_18_0_1_Power_h__
+#define __nFRC_2018_18_0_1_Power_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tPower
@@ -218,4 +218,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Power_h__
+#endif // __nFRC_2018_18_0_1_Power_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
index 1a4c48a98f..f6f595059c 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_Relay_h__
-#define __nFRC_2017_17_0_2_Relay_h__
+#ifndef __nFRC_2018_18_0_1_Relay_h__
+#define __nFRC_2018_18_0_1_Relay_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tRelay
@@ -66,4 +66,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_Relay_h__
+#endif // __nFRC_2018_18_0_1_Relay_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
index cc2755d18a..e75aecce0a 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_SPI_h__
-#define __nFRC_2017_17_0_2_SPI_h__
+#ifndef __nFRC_2018_18_0_1_SPI_h__
+#define __nFRC_2018_18_0_1_SPI_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tSPI
@@ -74,4 +74,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_SPI_h__
+#endif // __nFRC_2018_18_0_1_SPI_h__
diff --git a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
index 4228de8722..db34e85678 100644
--- a/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
+++ b/ni-libraries/include/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h
@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2017_17_0_2_SysWatchdog_h__
-#define __nFRC_2017_17_0_2_SysWatchdog_h__
+#ifndef __nFRC_2018_18_0_1_SysWatchdog_h__
+#define __nFRC_2018_18_0_1_SysWatchdog_h__
 
 #include "../tSystem.h"
 #include "../tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2017_17_0_2
+namespace nFRC_2018_18_0_1
 {
 
 class tSysWatchdog
@@ -106,4 +106,4 @@ private:
 }
 }
 
-#endif // __nFRC_2017_17_0_2_SysWatchdog_h__
+#endif // __nFRC_2018_18_0_1_SysWatchdog_h__
diff --git a/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 b/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0
index d04a99b2c7..6d72140dc0 100644
Binary files a/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 and b/ni-libraries/lib/libFRC_NetworkCommunication.so.18.0.0 differ
diff --git a/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0
index dfbbf72965..ce2ab435c4 100644
Binary files a/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 and b/ni-libraries/lib/libRoboRIO_FRC_ChipObject.so.18.0.0 differ
diff --git a/ni-libraries/lib/libi2c.so.2.0.0 b/ni-libraries/lib/libi2c.so.2.0.0
index 7f92372481..907f8a7173 100644
Binary files a/ni-libraries/lib/libi2c.so.2.0.0 and b/ni-libraries/lib/libi2c.so.2.0.0 differ