diff --git a/wpilibc/athena/src/RobotDrive.cpp b/wpilibc/athena/src/RobotDrive.cpp
index c8c1897f66..73011a446b 100644
--- a/wpilibc/athena/src/RobotDrive.cpp
+++ b/wpilibc/athena/src/RobotDrive.cpp
@@ -140,14 +140,14 @@ RobotDrive::RobotDrive(std::shared_ptr<SpeedController> leftMotor,
  *
  * Speed controller input version of RobotDrive (see previous comments).
  *
- * @param rearLeftMotor   The back left SpeedController object used to drive
- *                        the robot.
  * @param frontLeftMotor  The front left SpeedController object used to drive
  *                        the robot.
- * @param rearRightMotor  The back right SpeedController object used to drive
+ * @param rearLeftMotor   The back left SpeedController object used to drive
  *                        the robot.
  * @param frontRightMotor The front right SpeedController object used to drive
  *                        the robot.
+ * @param rearRightMotor  The back right SpeedController object used to drive
+ *                        the robot.
  */
 RobotDrive::RobotDrive(SpeedController* frontLeftMotor,
                        SpeedController* rearLeftMotor,
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotDrive.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotDrive.java
index 9fb3213272..51b55a3294 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotDrive.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotDrive.java
@@ -128,10 +128,10 @@ public class RobotDrive implements MotorSafety {
    * Constructor for RobotDrive with 4 motors specified as SpeedController objects. Speed controller
    * input version of RobotDrive (see previous comments).
    *
-   * @param rearLeftMotor   The back left SpeedController object used to drive the robot.
    * @param frontLeftMotor  The front left SpeedController object used to drive the robot
-   * @param rearRightMotor  The back right SpeedController object used to drive the robot.
+   * @param rearLeftMotor   The back left SpeedController object used to drive the robot.
    * @param frontRightMotor The front right SpeedController object used to drive the robot.
+   * @param rearRightMotor  The back right SpeedController object used to drive the robot.
    */
   public RobotDrive(SpeedController frontLeftMotor, SpeedController rearLeftMotor,
                     SpeedController frontRightMotor, SpeedController rearRightMotor) {