diff --git a/engine/src/core-data/joystick-mapping.properties b/engine/src/core-data/joystick-mapping.properties
index d3efbba11..29fa9f464 100644
--- a/engine/src/core-data/joystick-mapping.properties
+++ b/engine/src/core-data/joystick-mapping.properties
@@ -2,21 +2,21 @@
 #   Add compatibility entries for different joysticks
 #   to map button and axis arrangments when possible.
 #   This is keyed off of the reported joystick name and
-#   reported button or axis name.  The value half is
+#   reported button or axis logical ID.  The value half is
 #   the new name as it will be reported through the Joystick
 #   interface.
 #
 #   Keys with spaces in them should have those spaces escaped. 
 #   Values do not need their spaces escaped.  For example:
 #
-#   Some\ Joystick.Button\ 0=Button 3
+#   Some\ Joystick.0=3
 #
 
 
 # Final Fantasy XIV mapping
-FF-GP1.Button\ 0=Button 3
-FF-GP1.Button\ 1=Button 2
-FF-GP1.Button\ 2=Button 1
-FF-GP1.Button\ 3=Button 0
+FF-GP1.0=3
+FF-GP1.1=2
+FF-GP1.2=1
+FF-GP1.3=0