diff --git a/wpilibj/src/generate/main/java/hid.java.jinja b/wpilibj/src/generate/main/java/hid.java.jinja
index 452fdb970d2..242bf13f752 100644
--- a/wpilibj/src/generate/main/java/hid.java.jinja
+++ b/wpilibj/src/generate/main/java/hid.java.jinja
@@ -194,7 +194,7 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return The state of the button.
    * @deprecated Use {@link getLeftBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumper() {
@@ -206,7 +206,7 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return The state of the button.
    * @deprecated Use {@link getRightBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumper() {
@@ -218,8 +218,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getLeftBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperPressed() {
@@ -231,8 +231,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getRightBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperPressed() {
@@ -244,8 +244,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getLeftBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperReleased() {
@@ -257,8 +257,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getRightBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperReleased() {
@@ -270,7 +270,7 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return The state of the touchpad.
    * @deprecated Use {@link getTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpad() {
@@ -282,8 +282,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the touchpad was pressed since the last check.
    * @deprecated Use {@link getTouchpadButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadPressed() {
@@ -295,8 +295,8 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
    *
    * @return Whether the touchpad was released since the last check.
    * @deprecated Use {@link getTouchpadButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadReleased() {
diff --git a/wpilibj/src/generate/main/java/hidsim.java.jinja b/wpilibj/src/generate/main/java/hidsim.java.jinja
index f5f18972ed3..fa041ca828c 100644
--- a/wpilibj/src/generate/main/java/hidsim.java.jinja
+++ b/wpilibj/src/generate/main/java/hidsim.java.jinja
@@ -73,7 +73,7 @@ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim {
    *
    * @param state the new value
    * @deprecated Use {@link setLeftBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setLeftBumper(boolean state) {
@@ -85,7 +85,7 @@ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim {
    *
    * @param state the new value
    * @deprecated Use {@link setRightBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setRightBumper(boolean state) {
@@ -97,7 +97,7 @@ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim {
    *
    * @param value the new value
    * @deprecated Use {@link setTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setTouchpad(boolean value) {
@@ -109,7 +109,7 @@ public class {{ ConsoleName }}ControllerSim extends GenericHIDSim {
    *
    * @param value the new value
    * @deprecated Use {@link setTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setTouchpad(boolean value) {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java
index 548f0318f30..70c1ce1c166 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS4Controller.java
@@ -721,7 +721,7 @@ public BooleanEvent touchpad(EventLoop loop) {
    *
    * @return The state of the touchpad.
    * @deprecated Use {@link getTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpad() {
@@ -733,8 +733,8 @@ public boolean getTouchpad() {
    *
    * @return Whether the touchpad was pressed since the last check.
    * @deprecated Use {@link getTouchpadButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadPressed() {
@@ -746,8 +746,8 @@ public boolean getTouchpadPressed() {
    *
    * @return Whether the touchpad was released since the last check.
    * @deprecated Use {@link getTouchpadButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadReleased() {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java
index 4fade52f671..7cd5bfd5f18 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/PS5Controller.java
@@ -721,7 +721,7 @@ public BooleanEvent touchpad(EventLoop loop) {
    *
    * @return The state of the touchpad.
    * @deprecated Use {@link getTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpad() {
@@ -733,8 +733,8 @@ public boolean getTouchpad() {
    *
    * @return Whether the touchpad was pressed since the last check.
    * @deprecated Use {@link getTouchpadButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadPressed() {
@@ -746,8 +746,8 @@ public boolean getTouchpadPressed() {
    *
    * @return Whether the touchpad was released since the last check.
    * @deprecated Use {@link getTouchpadButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getTouchpadReleased() {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java
index 642eca48055..5443e5755b4 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/StadiaController.java
@@ -737,7 +737,7 @@ public BooleanEvent frame(EventLoop loop) {
    *
    * @return The state of the button.
    * @deprecated Use {@link getLeftBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumper() {
@@ -749,7 +749,7 @@ public boolean getLeftBumper() {
    *
    * @return The state of the button.
    * @deprecated Use {@link getRightBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumper() {
@@ -761,8 +761,8 @@ public boolean getRightBumper() {
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getLeftBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperPressed() {
@@ -774,8 +774,8 @@ public boolean getLeftBumperPressed() {
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getRightBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperPressed() {
@@ -787,8 +787,8 @@ public boolean getRightBumperPressed() {
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getLeftBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperReleased() {
@@ -800,8 +800,8 @@ public boolean getLeftBumperReleased() {
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getRightBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperReleased() {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java
index d834b79b6c4..78abae8ed7c 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/XboxController.java
@@ -613,7 +613,7 @@ public BooleanEvent rightStick(EventLoop loop) {
    *
    * @return The state of the button.
    * @deprecated Use {@link getLeftBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumper() {
@@ -625,7 +625,7 @@ public boolean getLeftBumper() {
    *
    * @return The state of the button.
    * @deprecated Use {@link getRightBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumper() {
@@ -637,8 +637,8 @@ public boolean getRightBumper() {
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getLeftBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperPressed() {
@@ -650,8 +650,8 @@ public boolean getLeftBumperPressed() {
    *
    * @return Whether the button was pressed since the last check.
    * @deprecated Use {@link getRightBumperButtonPressed} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperPressed() {
@@ -663,8 +663,8 @@ public boolean getRightBumperPressed() {
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getLeftBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getLeftBumperReleased() {
@@ -676,8 +676,8 @@ public boolean getLeftBumperReleased() {
    *
    * @return Whether the button was released since the last check.
    * @deprecated Use {@link getRightBumperButtonReleased} instead. This function is deprecated for
-   * removal to make function names consistent to allow the HID classes to be automatically
-   * generated.
+   *     removal to make function names consistent to allow the HID classes to be automatically
+   *     generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public boolean getRightBumperReleased() {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java
index 25abd1f4de8..889eb18d80a 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS4ControllerSim.java
@@ -221,7 +221,7 @@ public void setTouchpadButton(boolean value) {
    *
    * @param value the new value
    * @deprecated Use {@link setTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setTouchpad(boolean value) {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java
index 3c32fa37701..6e614a327d7 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/PS5ControllerSim.java
@@ -221,7 +221,7 @@ public void setTouchpadButton(boolean value) {
    *
    * @param value the new value
    * @deprecated Use {@link setTouchpadButton} instead. This function is deprecated for removal to
-   * make function names consistent to allow the HID classes to be automatically generated.
+   *     make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setTouchpad(boolean value) {
diff --git a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java
index e13eaffa540..d52fdd84d2e 100644
--- a/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java
+++ b/wpilibj/src/generated/main/java/edu/wpi/first/wpilibj/simulation/XboxControllerSim.java
@@ -185,7 +185,7 @@ public void setRightStickButton(boolean value) {
    *
    * @param state the new value
    * @deprecated Use {@link setLeftBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setLeftBumper(boolean state) {
@@ -197,7 +197,7 @@ public void setLeftBumper(boolean state) {
    *
    * @param state the new value
    * @deprecated Use {@link setRightBumperButton} instead. This function is deprecated for removal
-   * to make function names consistent to allow the HID classes to be automatically generated.
+   *     to make function names consistent to allow the HID classes to be automatically generated.
    */
   @Deprecated(since = "2025", forRemoval = true)
   public void setRightBumper(boolean state) {