diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
index 9f3d48a5f6..f9936096c4 100644
--- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
+++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandJoystick.java
@@ -9,7 +9,7 @@ import edu.wpi.first.wpilibj.event.EventLoop;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
 
 /**
- * A subclass of {@link Joystick} with {@link Trigger} factories for command-based.
+ * A version of {@link Joystick} with {@link Trigger} factories for command-based.
  *
  * @see Joystick
  */
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
index 1e83e83183..822e972486 100644
--- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
+++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/CommandXboxController.java
@@ -9,7 +9,7 @@ import edu.wpi.first.wpilibj.event.EventLoop;
 import edu.wpi.first.wpilibj2.command.CommandScheduler;
 
 /**
- * A subclass of {@link XboxController} with {@link Trigger} factories for command-based.
+ * A version of {@link XboxController} with {@link Trigger} factories for command-based.
  *
  * @see XboxController
  */
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h
index c335f89012..5b51e86604 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandJoystick.h
@@ -10,7 +10,7 @@
 
 namespace frc2 {
 /**
- * A subclass of {@link Joystick} with {@link Trigger} factories for
+ * A version of {@link Joystick} with {@link Trigger} factories for
  * command-based.
  *
  * @see Joystick
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandPS4Controller.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandPS4Controller.h
index befb6671f7..22c54ad22e 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandPS4Controller.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandPS4Controller.h
@@ -10,7 +10,7 @@
 
 namespace frc2 {
 /**
- * A subclass of {@link PS4Controller} with {@link Trigger} factories for
+ * A version of {@link PS4Controller} with {@link Trigger} factories for
  * command-based.
  *
  * @see PS4Controller
diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandXboxController.h b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandXboxController.h
index 337ec2fba8..94a3c2c505 100644
--- a/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandXboxController.h
+++ b/wpilibNewCommands/src/main/native/include/frc2/command/button/CommandXboxController.h
@@ -10,7 +10,7 @@
 
 namespace frc2 {
 /**
- * A subclass of {@link XboxController} with {@link Trigger} factories for
+ * A version of {@link XboxController} with {@link Trigger} factories for
  * command-based.
  *
  * @see XboxController