diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index fd4e8da185..cf3b7f70d9 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -73,10 +73,10 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"GIC USB Joystick",
 		"Boom USB convertor (black/gray)",
 		{
-			{ 0, JOY_16,		DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_14,		DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_13,		DANCE_BUTTON_UP,		false },
-			{ 0, JOY_15,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_16,		DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_14,		DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_BUTTON_13,		DANCE_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_15,		DANCE_BUTTON_DOWN,		false },
 			END_MARKER
 		}
 	},
@@ -85,10 +85,10 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"4 axis 16 button joystick",
 		"PC Magic Box",
 		{
-			{ 0, JOY_16,		DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_14,		DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_13,		DANCE_BUTTON_UP,		false },
-			{ 0, JOY_15,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_16,		DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_14,		DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_BUTTON_13,		DANCE_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_15,		DANCE_BUTTON_DOWN,		false },
 			END_MARKER
 		}
 	},
@@ -101,14 +101,14 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			{ 0, JOY_RIGHT,		DANCE_BUTTON_RIGHT,		false },
 			{ 0, JOY_UP,		DANCE_BUTTON_UP,		false },
 			{ 0, JOY_DOWN,		DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_1,			DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_3,			DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_4,			DANCE_BUTTON_UP,		false },
-			{ 1, JOY_2,			DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_5,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_6,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_9,			DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_10,		DANCE_BUTTON_START,		false },
+			{ 1, JOY_BUTTON_1,			DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_3,			DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_4,			DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_2,			DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_5,			DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_6,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -121,14 +121,14 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			{ 0, JOY_RIGHT,		DANCE_BUTTON_RIGHT,		false },
 			{ 0, JOY_UP,		DANCE_BUTTON_UP,		false },
 			{ 0, JOY_DOWN,		DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_4,			DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_2,			DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_5,			DANCE_BUTTON_UP,		false },
-			{ 1, JOY_1,			DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_7,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_8,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_9,			DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_10,		DANCE_BUTTON_START,		false },
+			{ 1, JOY_BUTTON_4,			DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_2,			DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_5,			DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_1,			DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_7,			DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_8,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -137,20 +137,20 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"4 axis 12 button joystick with hat switch",
 		"Super Joy Box 5",
 		{
-			{ 0, JOY_HAT_LEFT,	DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_HAT_RIGHT,	DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_HAT_UP,	DANCE_BUTTON_UP,		false },
-			{ 0, JOY_HAT_DOWN,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_4,			DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_2,			DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_1,			DANCE_BUTTON_UP,		false },
-			{ 1, JOY_3,			DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_5,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_6,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 1, JOY_7,			DANCE_BUTTON_UPLEFT,	false },
-			{ 1, JOY_8,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_10,		DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_9,			DANCE_BUTTON_START,		false },
+			{ 0, JOY_LEFT,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_RIGHT,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_UP,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_DOWN,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_BUTTON_4,			DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_2,			DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_1,			DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_3,			DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_5,			DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_6,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 1, JOY_BUTTON_7,			DANCE_BUTTON_UPLEFT,	false },
+			{ 1, JOY_BUTTON_8,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -159,20 +159,20 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"MP-8866 Dual USB Joypad",
 		"Super Dual Box",
 		{
-			{ 0, JOY_HAT_LEFT,	DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_HAT_RIGHT,	DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_HAT_UP,	DANCE_BUTTON_UP,		false },
-			{ 0, JOY_HAT_DOWN,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_4,			DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_2,			DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_1,			DANCE_BUTTON_UP,		false },
-			{ 1, JOY_3,			DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_5,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_6,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 1, JOY_7,			DANCE_BUTTON_UPLEFT,	false },
-			{ 1, JOY_8,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_10,		DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_9,			DANCE_BUTTON_START,		false },
+			{ 0, JOY_LEFT,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_RIGHT,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_UP,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_DOWN,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_BUTTON_4,			DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_2,			DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_1,			DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_3,			DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_5,			DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_6,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 1, JOY_BUTTON_7,			DANCE_BUTTON_UPLEFT,	false },
+			{ 1, JOY_BUTTON_8,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -181,20 +181,20 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"NTPAD",
 		"NTPAD",
 		{
-			{ 0, JOY_13,	DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_15,	DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_16,	DANCE_BUTTON_UP,		false },
-			{ 0, JOY_14,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_1,		DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_3,		DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_4,		DANCE_BUTTON_UP,		false },
-			{ 1, JOY_2,		DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_5,		DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_6,		DANCE_BUTTON_UPRIGHT,	false },
-			{ 1, JOY_7,		DANCE_BUTTON_UPLEFT,	false },
-			{ 1, JOY_8,		DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_9,		DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_10,	DANCE_BUTTON_START,		false },
+			{ 0, JOY_BUTTON_13,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_15,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_BUTTON_16,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_14,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_BUTTON_1,		DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_3,		DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_4,		DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_2,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_5,		DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_6,		DANCE_BUTTON_UPRIGHT,	false },
+			{ 1, JOY_BUTTON_7,		DANCE_BUTTON_UPLEFT,	false },
+			{ 1, JOY_BUTTON_8,		DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_9,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_10,	DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -207,16 +207,16 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 			{ 0, JOY_RIGHT,	DANCE_BUTTON_RIGHT,		false },
 			{ 0, JOY_UP,	DANCE_BUTTON_UP,		false },
 			{ 0, JOY_DOWN,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_2,		DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_1,		DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_4,		DANCE_BUTTON_UP,		false },
-			{ 1, JOY_3,		DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_7,		DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_5,		DANCE_BUTTON_UPRIGHT,	false },
-			{ 1, JOY_8,		DANCE_BUTTON_UPLEFT,	false },
-			{ 1, JOY_6,		DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_10,	DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_9,		DANCE_BUTTON_START,		false },
+			{ 1, JOY_BUTTON_2,		DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_1,		DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_4,		DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_3,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_7,		DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_5,		DANCE_BUTTON_UPRIGHT,	false },
+			{ 1, JOY_BUTTON_8,		DANCE_BUTTON_UPLEFT,	false },
+			{ 1, JOY_BUTTON_6,		DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_10,	DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_9,		DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -225,18 +225,18 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"XBOX Gamepad Plugin V0.01",
 		"X-Box gamepad",
 		{
-			{ 0, JOY_HAT_LEFT,	DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_HAT_RIGHT,	DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_HAT_UP,	DANCE_BUTTON_UP,		false },
-			{ 0, JOY_HAT_DOWN,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_1,			DANCE_BUTTON_DOWN,		false },	// A
-			{ 1, JOY_2,			DANCE_BUTTON_RIGHT,		false },	// B
-			{ 1, JOY_3,			DANCE_BUTTON_LEFT,		false },	// X
-			{ 1, JOY_4,			DANCE_BUTTON_UP,		false },	// Y
-			{ 0, JOY_7,			DANCE_BUTTON_UPLEFT,	false },	// L shoulder
-			{ 0, JOY_8,			DANCE_BUTTON_UPRIGHT,	false },	// R shoulder
-			{ 0, JOY_9,			DANCE_BUTTON_START,		false },
-			{ 0, JOY_10,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_LEFT,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_RIGHT,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_UP,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_DOWN,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_BUTTON_1,			DANCE_BUTTON_DOWN,		false },	// A
+			{ 1, JOY_BUTTON_2,			DANCE_BUTTON_RIGHT,		false },	// B
+			{ 1, JOY_BUTTON_3,			DANCE_BUTTON_LEFT,		false },	// X
+			{ 1, JOY_BUTTON_4,			DANCE_BUTTON_UP,		false },	// Y
+			{ 0, JOY_BUTTON_7,			DANCE_BUTTON_UPLEFT,	false },	// L shoulder
+			{ 0, JOY_BUTTON_8,			DANCE_BUTTON_UPRIGHT,	false },	// R shoulder
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_START,		false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_BACK,		false },
 			END_MARKER
 		}
 	},
@@ -247,35 +247,35 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"EMS USB2",
 		{
 			// Player 1.
-			{ 0, JOY_16,	DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_13,	DANCE_BUTTON_UP,		false },
-			{ 0, JOY_15,	DANCE_BUTTON_DOWN,		false },
-			{ 1, JOY_4,		DANCE_BUTTON_LEFT,		false },
-			{ 1, JOY_2,		DANCE_BUTTON_RIGHT,		false },
-			{ 1, JOY_1,		DANCE_BUTTON_UP,		false },
-			{ 1, JOY_3,		DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_7,		DANCE_BUTTON_UPLEFT,    false },
-			{ 0, JOY_8,		DANCE_BUTTON_UPRIGHT,   false },
-			{ 0, JOY_9,		DANCE_BUTTON_SELECT,	false },
-			{ 0, JOY_10,	DANCE_BUTTON_START,		false },
-			{ 0, JOY_5,		DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_6,		DANCE_BUTTON_COIN,		false },
+			{ 0, JOY_BUTTON_16,	DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_14,	DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_BUTTON_13,	DANCE_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_15,	DANCE_BUTTON_DOWN,		false },
+			{ 1, JOY_BUTTON_4,		DANCE_BUTTON_LEFT,		false },
+			{ 1, JOY_BUTTON_2,		DANCE_BUTTON_RIGHT,		false },
+			{ 1, JOY_BUTTON_1,		DANCE_BUTTON_UP,		false },
+			{ 1, JOY_BUTTON_3,		DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_7,		DANCE_BUTTON_UPLEFT,    false },
+			{ 0, JOY_BUTTON_8,		DANCE_BUTTON_UPRIGHT,   false },
+			{ 0, JOY_BUTTON_9,		DANCE_BUTTON_SELECT,	false },
+			{ 0, JOY_BUTTON_10,	DANCE_BUTTON_START,		false },
+			{ 0, JOY_BUTTON_5,		DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_6,		DANCE_BUTTON_COIN,		false },
 			// Player 2.
-			{ 0, JOY_32,	DANCE_BUTTON_LEFT,		true },
-			{ 0, JOY_30,	DANCE_BUTTON_RIGHT,		true },
-			{ 0, JOY_29,	DANCE_BUTTON_UP,		true },
-			{ 0, JOY_31,	DANCE_BUTTON_DOWN,		true },
-			{ 1, JOY_20,	DANCE_BUTTON_LEFT,		true },
-			{ 1, JOY_18,	DANCE_BUTTON_RIGHT,		true },
-			{ 1, JOY_17,	DANCE_BUTTON_UP,		true },
-			{ 1, JOY_19,	DANCE_BUTTON_DOWN,		true },
-			{ 0, JOY_23,	DANCE_BUTTON_UPRIGHT,	true },
-			{ 0, JOY_24,	DANCE_BUTTON_UPLEFT,	true },
-			{ 0, JOY_25,	DANCE_BUTTON_SELECT,	true },
-			{ 0, JOY_26,	DANCE_BUTTON_START,		true },
-			{ 0, JOY_21,	DANCE_BUTTON_BACK,		true },
-			{ 0, JOY_22,	DANCE_BUTTON_COIN,		true },
+			{ 0, JOY_BUTTON_32,	DANCE_BUTTON_LEFT,		true },
+			{ 0, JOY_BUTTON_30,	DANCE_BUTTON_RIGHT,		true },
+			{ 0, JOY_BUTTON_29,	DANCE_BUTTON_UP,		true },
+			{ 0, JOY_BUTTON_31,	DANCE_BUTTON_DOWN,		true },
+			{ 1, JOY_BUTTON_20,	DANCE_BUTTON_LEFT,		true },
+			{ 1, JOY_BUTTON_18,	DANCE_BUTTON_RIGHT,		true },
+			{ 1, JOY_BUTTON_17,	DANCE_BUTTON_UP,		true },
+			{ 1, JOY_BUTTON_19,	DANCE_BUTTON_DOWN,		true },
+			{ 0, JOY_BUTTON_23,	DANCE_BUTTON_UPRIGHT,	true },
+			{ 0, JOY_BUTTON_24,	DANCE_BUTTON_UPLEFT,	true },
+			{ 0, JOY_BUTTON_25,	DANCE_BUTTON_SELECT,	true },
+			{ 0, JOY_BUTTON_26,	DANCE_BUTTON_START,		true },
+			{ 0, JOY_BUTTON_21,	DANCE_BUTTON_BACK,		true },
+			{ 0, JOY_BUTTON_22,	DANCE_BUTTON_COIN,		true },
 			END_MARKER
 		}
 	},
@@ -284,14 +284,14 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"Dance ", //Notice extra space at end
 		"LevelSix USB Pad (DDR638)",
 		{
-			{ 0, JOY_1,			DANCE_BUTTON_UP,		false },
-			{ 0, JOY_2,			DANCE_BUTTON_DOWN,		false },
-			{ 0, JOY_3,			DANCE_BUTTON_LEFT,		false },
-			{ 0, JOY_4,			DANCE_BUTTON_RIGHT,		false },
-			{ 0, JOY_7,			DANCE_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_8,			DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_9,			DANCE_BUTTON_BACK,		false },
-			{ 0, JOY_10,		DANCE_BUTTON_START,		false },
+			{ 0, JOY_BUTTON_1,			DANCE_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_2,			DANCE_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_3,			DANCE_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_4,			DANCE_BUTTON_RIGHT,		false },
+			{ 0, JOY_BUTTON_7,			DANCE_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_8,			DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_9,			DANCE_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_10,		DANCE_BUTTON_START,		false },
 			END_MARKER
 		}
 	},
@@ -319,16 +319,16 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"Dance ", //Notice the extra space at end
 		"LevelSix USB Pad (DDR638)",
 		{
-			{ 0, JOY_1,			TECHNO_BUTTON_UP,		false },
-			{ 0, JOY_2,			TECHNO_BUTTON_DOWN,		false },
-			{ 0, JOY_3,			TECHNO_BUTTON_LEFT,		false },
-			{ 0, JOY_4,			TECHNO_BUTTON_RIGHT,	false },
-			{ 0, JOY_5,			TECHNO_BUTTON_DOWNRIGHT,false },
-			{ 0, JOY_6,			TECHNO_BUTTON_DOWNLEFT,	false },
-			{ 0, JOY_7,			TECHNO_BUTTON_UPRIGHT,	false },
-			{ 0, JOY_8,			TECHNO_BUTTON_UPLEFT,	false },
-			{ 0, JOY_9,			TECHNO_BUTTON_BACK,		false },
-			{ 0, JOY_10,		TECHNO_BUTTON_START,	false },
+			{ 0, JOY_BUTTON_1,			TECHNO_BUTTON_UP,		false },
+			{ 0, JOY_BUTTON_2,			TECHNO_BUTTON_DOWN,		false },
+			{ 0, JOY_BUTTON_3,			TECHNO_BUTTON_LEFT,		false },
+			{ 0, JOY_BUTTON_4,			TECHNO_BUTTON_RIGHT,	false },
+			{ 0, JOY_BUTTON_5,			TECHNO_BUTTON_DOWNRIGHT,false },
+			{ 0, JOY_BUTTON_6,			TECHNO_BUTTON_DOWNLEFT,	false },
+			{ 0, JOY_BUTTON_7,			TECHNO_BUTTON_UPRIGHT,	false },
+			{ 0, JOY_BUTTON_8,			TECHNO_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_9,			TECHNO_BUTTON_BACK,		false },
+			{ 0, JOY_BUTTON_10,		TECHNO_BUTTON_START,	false },
 			END_MARKER
 		}
 	},
diff --git a/stepmania/src/RageInputDevice.h b/stepmania/src/RageInputDevice.h
index 41d63111bc..1881a00087 100644
--- a/stepmania/src/RageInputDevice.h
+++ b/stepmania/src/RageInputDevice.h
@@ -252,10 +252,10 @@ enum JoystickButton
 	JOY_AUX_1, JOY_AUX_2, JOY_AUX_3, JOY_AUX_4,
 
 	/* Buttons: */
-	JOY_1,	JOY_2,	JOY_3,	JOY_4,	JOY_5,	JOY_6,	JOY_7,	JOY_8,	JOY_9,	JOY_10,
-	JOY_11,	JOY_12,	JOY_13,	JOY_14,	JOY_15,	JOY_16,	JOY_17,	JOY_18,	JOY_19,	JOY_20,
-	JOY_21,	JOY_22,	JOY_23,	JOY_24, JOY_25, JOY_26, JOY_27, JOY_28, JOY_29, JOY_30,
-	JOY_31,	JOY_32,
+	JOY_BUTTON_1,	JOY_BUTTON_2,	JOY_BUTTON_3,	JOY_BUTTON_4,	JOY_BUTTON_5,	JOY_BUTTON_6,	JOY_BUTTON_7,	JOY_BUTTON_8,	JOY_BUTTON_9,	JOY_BUTTON_10,
+	JOY_BUTTON_11,	JOY_BUTTON_12,	JOY_BUTTON_13,	JOY_BUTTON_14,	JOY_BUTTON_15,	JOY_BUTTON_16,	JOY_BUTTON_17,	JOY_BUTTON_18,	JOY_BUTTON_19,	JOY_BUTTON_20,
+	JOY_BUTTON_21,	JOY_BUTTON_22,	JOY_BUTTON_23,	JOY_BUTTON_24,	JOY_BUTTON_25,	JOY_BUTTON_26,	JOY_BUTTON_27,	JOY_BUTTON_28,	JOY_BUTTON_29,	JOY_BUTTON_30,
+	JOY_BUTTON_31,	JOY_BUTTON_32,
 
 	NUM_JOYSTICK_BUTTONS,
 	JOYSTICK_BUTTON_INVALID
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index f01392c638..0e29007b12 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -189,8 +189,8 @@ void ScreenMapControllers::Input( const InputEventPlus &input )
 			button = KEY_ENTER;
 		else if( input.DeviceI.button == JOY_AUX_2 )
 			button = KEY_ESC;
-		else if( input.DeviceI.button == JOY_1 || input.DeviceI.button == JOY_2 ||
-				input.DeviceI.button == JOY_3 || input.DeviceI.button == JOY_4 )
+		else if( input.DeviceI.button == JOY_BUTTON_1 || input.DeviceI.button == JOY_BUTTON_2 ||
+				input.DeviceI.button == JOY_BUTTON_3 || input.DeviceI.button == JOY_BUTTON_4 )
 			button = KEY_DEL;
 	}
 #endif
diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
index e3749e1f6c..ad68d327ab 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp
@@ -265,7 +265,7 @@ void InputHandler_DInput::UpdatePolled(DIDevice &device, const RageTimer &tm)
 		{
 		case in.BUTTON:
 		{
-			DeviceInput di(dev, JOY_1 + in.num, -1, tm);
+			DeviceInput di(dev, JOY_BUTTON_1 + in.num, -1, tm);
 			ButtonPressed(di, !!state.rgbButtons[in.ofs - DIJOFS_BUTTON0]);
 			break;
 		}
@@ -371,7 +371,7 @@ void InputHandler_DInput::UpdateBuffered(DIDevice &device, const RageTimer &tm)
 				break;
 
 			case in.BUTTON:
-				ButtonPressed(DeviceInput(dev, JOY_1 + in.num, -1, tm), !!evtbuf[i].dwData);
+				ButtonPressed(DeviceInput(dev, JOY_BUTTON_1 + in.num, -1, tm), !!evtbuf[i].dwData);
 				break;
 
 			case in.AXIS: