diff --git a/conf/messages.xml b/conf/messages.xml
index ee5ffd25ec..dd8412780a 100644
--- a/conf/messages.xml
+++ b/conf/messages.xml
@@ -1195,15 +1195,15 @@
     </message>
 
     <message name="CONTROLLER_GAINS" id="191">
-      <field name="roll gamma_p"     type="float" />
-      <field name="roll gamma_d"     type="float" />
-      <field name="roll gamma_i"     type="float" />
-      <field name="pitch gamma_p"    type="float" />
-      <field name="pitch gamma_d"    type="float" />
-      <field name="pitch gamma_i"    type="float" />
-      <field name="yaw gamma_p"      type="float" />
-      <field name="yaw gamma_d"      type="float" />
-      <field name="yaw gamma_i"      type="float" />
+      <field name="roll_gamma_p"     type="float" />
+      <field name="roll_gamma_d"     type="float" />
+      <field name="roll_gamma_i"     type="float" />
+      <field name="pitch_gamma_p"    type="float" />
+      <field name="pitch_gamma_d"    type="float" />
+      <field name="pitch_gamma_i"    type="float" />
+      <field name="yaw_gamma_p"      type="float" />
+      <field name="yaw_gamma_d"      type="float" />
+      <field name="yaw_gamma_i"      type="float" />
     </message>
 
 </class>