diff --git a/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja b/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja
index 77b198a800..bfa7c6ea1f 100644
--- a/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja
+++ b/wpilibc/src/generate/main/native/cpp/hid.cpp.jinja
@@ -96,7 +96,7 @@ void {{ ConsoleName }}Controller::InitSendable(wpi::SendableBuilder& builder) {
   builder.SetSmartDashboardType("HID");
   builder.PublishConstString("ControllerType", "{{ ConsoleName }}");
 {%- for trigger in triggers %}
-  builder.AddDoubleProperty("{{ capitalize_first(trigger.name) }}", [this] { return Get{{ capitalize_first(trigger.name) }}Axis(); }, nullptr);
+  builder.AddDoubleProperty("{{ capitalize_first(trigger.name) }} Axis", [this] { return Get{{ capitalize_first(trigger.name) }}Axis(); }, nullptr);
 {%- endfor -%}
 {% for stick in sticks %}
   builder.AddDoubleProperty("{{ stick.NameParts|map("capitalize")|join }}", [this] { return Get{{ stick.NameParts|map("capitalize")|join }}(); }, nullptr);
diff --git a/wpilibc/src/generated/main/native/cpp/PS4Controller.cpp b/wpilibc/src/generated/main/native/cpp/PS4Controller.cpp
index 1b2b88b182..cf93820c75 100644
--- a/wpilibc/src/generated/main/native/cpp/PS4Controller.cpp
+++ b/wpilibc/src/generated/main/native/cpp/PS4Controller.cpp
@@ -280,8 +280,8 @@ bool PS4Controller::GetTouchpadReleased() {
 void PS4Controller::InitSendable(wpi::SendableBuilder& builder) {
   builder.SetSmartDashboardType("HID");
   builder.PublishConstString("ControllerType", "PS4");
-  builder.AddDoubleProperty("L2", [this] { return GetL2Axis(); }, nullptr);
-  builder.AddDoubleProperty("R2", [this] { return GetR2Axis(); }, nullptr);
+  builder.AddDoubleProperty("L2 Axis", [this] { return GetL2Axis(); }, nullptr);
+  builder.AddDoubleProperty("R2 Axis", [this] { return GetR2Axis(); }, nullptr);
   builder.AddDoubleProperty("LeftX", [this] { return GetLeftX(); }, nullptr);
   builder.AddDoubleProperty("LeftY", [this] { return GetLeftY(); }, nullptr);
   builder.AddDoubleProperty("RightX", [this] { return GetRightX(); }, nullptr);
diff --git a/wpilibc/src/generated/main/native/cpp/PS5Controller.cpp b/wpilibc/src/generated/main/native/cpp/PS5Controller.cpp
index 56d50e37ee..325de4b86e 100644
--- a/wpilibc/src/generated/main/native/cpp/PS5Controller.cpp
+++ b/wpilibc/src/generated/main/native/cpp/PS5Controller.cpp
@@ -280,8 +280,8 @@ bool PS5Controller::GetTouchpadReleased() {
 void PS5Controller::InitSendable(wpi::SendableBuilder& builder) {
   builder.SetSmartDashboardType("HID");
   builder.PublishConstString("ControllerType", "PS5");
-  builder.AddDoubleProperty("L2", [this] { return GetL2Axis(); }, nullptr);
-  builder.AddDoubleProperty("R2", [this] { return GetR2Axis(); }, nullptr);
+  builder.AddDoubleProperty("L2 Axis", [this] { return GetL2Axis(); }, nullptr);
+  builder.AddDoubleProperty("R2 Axis", [this] { return GetR2Axis(); }, nullptr);
   builder.AddDoubleProperty("LeftX", [this] { return GetLeftX(); }, nullptr);
   builder.AddDoubleProperty("LeftY", [this] { return GetLeftY(); }, nullptr);
   builder.AddDoubleProperty("RightX", [this] { return GetRightX(); }, nullptr);
diff --git a/wpilibc/src/generated/main/native/cpp/XboxController.cpp b/wpilibc/src/generated/main/native/cpp/XboxController.cpp
index 4b220170a6..dccd673f15 100644
--- a/wpilibc/src/generated/main/native/cpp/XboxController.cpp
+++ b/wpilibc/src/generated/main/native/cpp/XboxController.cpp
@@ -244,8 +244,8 @@ bool XboxController::GetRightBumperReleased() {
 void XboxController::InitSendable(wpi::SendableBuilder& builder) {
   builder.SetSmartDashboardType("HID");
   builder.PublishConstString("ControllerType", "Xbox");
-  builder.AddDoubleProperty("LeftTrigger", [this] { return GetLeftTriggerAxis(); }, nullptr);
-  builder.AddDoubleProperty("RightTrigger", [this] { return GetRightTriggerAxis(); }, nullptr);
+  builder.AddDoubleProperty("LeftTrigger Axis", [this] { return GetLeftTriggerAxis(); }, nullptr);
+  builder.AddDoubleProperty("RightTrigger Axis", [this] { return GetRightTriggerAxis(); }, nullptr);
   builder.AddDoubleProperty("LeftX", [this] { return GetLeftX(); }, nullptr);
   builder.AddDoubleProperty("RightX", [this] { return GetRightX(); }, nullptr);
   builder.AddDoubleProperty("LeftY", [this] { return GetLeftY(); }, nullptr);
diff --git a/wpilibj/src/generate/main/java/hid.java.jinja b/wpilibj/src/generate/main/java/hid.java.jinja
index 4becaf48b6..b032b14893 100644
--- a/wpilibj/src/generate/main/java/hid.java.jinja
+++ b/wpilibj/src/generate/main/java/hid.java.jinja
@@ -309,7 +309,7 @@ public class {{ ConsoleName }}Controller extends GenericHID implements Sendable
     builder.setSmartDashboardType("HID");
     builder.publishConstString("ControllerType", "{{ ConsoleName }}");
 {%- for trigger in triggers %}
-    builder.addDoubleProperty("{{ capitalize_first(trigger.name) }}", this::get{{ capitalize_first(trigger.name) }}Axis, null);
+    builder.addDoubleProperty("{{ capitalize_first(trigger.name) }} Axis", this::get{{ capitalize_first(trigger.name) }}Axis, null);
 {%- endfor -%}
 {% for stick in sticks %}
     builder.addDoubleProperty("{{ stick.NameParts|map("capitalize")|join }}", this::get{{ stick.NameParts|map("capitalize")|join }}, null);
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 bf5ee2d59c..e1992e2f20 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
@@ -758,8 +758,8 @@ public class PS4Controller extends GenericHID implements Sendable {
   public void initSendable(SendableBuilder builder) {
     builder.setSmartDashboardType("HID");
     builder.publishConstString("ControllerType", "PS4");
-    builder.addDoubleProperty("L2", this::getL2Axis, null);
-    builder.addDoubleProperty("R2", this::getR2Axis, null);
+    builder.addDoubleProperty("L2 Axis", this::getL2Axis, null);
+    builder.addDoubleProperty("R2 Axis", this::getR2Axis, null);
     builder.addDoubleProperty("LeftX", this::getLeftX, null);
     builder.addDoubleProperty("LeftY", this::getLeftY, null);
     builder.addDoubleProperty("RightX", this::getRightX, null);
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 48da8e8415..1911e1495e 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
@@ -758,8 +758,8 @@ public class PS5Controller extends GenericHID implements Sendable {
   public void initSendable(SendableBuilder builder) {
     builder.setSmartDashboardType("HID");
     builder.publishConstString("ControllerType", "PS5");
-    builder.addDoubleProperty("L2", this::getL2Axis, null);
-    builder.addDoubleProperty("R2", this::getR2Axis, null);
+    builder.addDoubleProperty("L2 Axis", this::getL2Axis, null);
+    builder.addDoubleProperty("R2 Axis", this::getR2Axis, null);
     builder.addDoubleProperty("LeftX", this::getLeftX, null);
     builder.addDoubleProperty("LeftY", this::getLeftY, null);
     builder.addDoubleProperty("RightX", this::getRightX, null);
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 04efec2217..8c7d37eee1 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
@@ -688,8 +688,8 @@ public class XboxController extends GenericHID implements Sendable {
   public void initSendable(SendableBuilder builder) {
     builder.setSmartDashboardType("HID");
     builder.publishConstString("ControllerType", "Xbox");
-    builder.addDoubleProperty("LeftTrigger", this::getLeftTriggerAxis, null);
-    builder.addDoubleProperty("RightTrigger", this::getRightTriggerAxis, null);
+    builder.addDoubleProperty("LeftTrigger Axis", this::getLeftTriggerAxis, null);
+    builder.addDoubleProperty("RightTrigger Axis", this::getRightTriggerAxis, null);
     builder.addDoubleProperty("LeftX", this::getLeftX, null);
     builder.addDoubleProperty("RightX", this::getRightX, null);
     builder.addDoubleProperty("LeftY", this::getLeftY, null);