diff --git a/swervelib/parser/json/DeviceJson.java b/swervelib/parser/json/DeviceJson.java
index de9685d..d42c6da 100644
--- a/swervelib/parser/json/DeviceJson.java
+++ b/swervelib/parser/json/DeviceJson.java
@@ -71,11 +71,11 @@ public class DeviceJson
       case "ma3":
       case "ctre_mag":
       case "rev_hex":
+      case "throughbore":
       case "am_mag":
       case "dutycycle":
         return new PWMDutyCycleEncoderSwerve(id);
       case "thrifty":
-      case "throughbore":
       case "analog":
         return new AnalogAbsoluteEncoderSwerve(id);
       case "cancoder":
@@ -107,6 +107,7 @@ public class DeviceJson
         return new ADXRS450Swerve();
       case "analog":
         return new AnalogGyroSwerve(id);
+      case "navx":
       case "navx_spi":
         return new NavXSwerve(SPI.Port.kMXP);
       case "navx_i2c":
@@ -116,12 +117,9 @@ public class DeviceJson
             ".html#onboard-i2c-causing-system-lockups",
             false);
         return new NavXSwerve(I2C.Port.kMXP);
-      case "navx_onborard":
-        return new NavXSwerve(Port.kOnboard);
       case "navx_usb":
         return new NavXSwerve(Port.kUSB);
       case "navx_mxp":
-      case "navx":
         return new NavXSwerve(Port.kMXP);
       case "pigeon":
         return new PigeonSwerve(id);