diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 20fd8f5730..330a6db1aa 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -237,16 +237,16 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"Super Dual Box (from DDRGame.com, Feb 2008)",
 		//NEEDS_DANCE_PAD_MAPPING_CODE,
 		{
-			{ 0, JOY_3,	DANCE_BUTTON_UP,	false },
-			{ 0, JOY_2,	DANCE_BUTTON_DOWN,	false },
-			{ 0, JOY_1,	DANCE_BUTTON_LEFT,	false },
-			{ 0, JOY_4,	DANCE_BUTTON_RIGHT,	false },
-			{ 0, JOY_7,	DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_8,	DANCE_BUTTON_UPRIGHT,	false },
-			//{ 0, JOY_5,	DANCE_BUTTON_DOWNLEFT,	false },
-			//{ 0, JOY_6,	DANCE_BUTTON_DOWNRIGHT,	false },
-			{ 0, JOY_10,	DANCE_BUTTON_BACK,	false },
-			{ 0, JOY_9,	DANCE_BUTTON_START,	false },
+			{ 0, JOY_BUTTON_3,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_BUTTON_2,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_BUTTON_1,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_BUTTON_4,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_BUTTON_7,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_8,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_BUTTON_5,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_BUTTON_6,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_BUTTON_10,	GAME_BUTTON_BACK,	false },
+			{ 0, JOY_BUTTON_9,	GAME_BUTTON_START,	false },
 			END_MARKER
 		}
 	},
@@ -450,16 +450,16 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"USB Dance Pad",
 		"DDRGame Energy Dance Pad",
 		{
-			{ 0, JOY_13,	DANCE_BUTTON_UP,	false },
-			{ 0, JOY_15,	DANCE_BUTTON_DOWN,	false },
-			{ 0, JOY_16,	DANCE_BUTTON_LEFT,	false },
-			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,	false },
-			{ 0, JOY_3,	DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_2,	DANCE_BUTTON_UPRIGHT,	false },
-			//{ 0, JOY_1,	DANCE_BUTTON_DOWNLEFT,	false },
-			//{ 0, JOY_4,	DANCE_BUTTON_DOWNRIGHT,	false },
-			{ 0, JOY_9,	DANCE_BUTTON_BACK,	false },
-			{ 0, JOY_10,	DANCE_BUTTON_START,	false },
+			{ 0, JOY_BUTTON_13,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_BUTTON_15,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_BUTTON_16,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_BUTTON_14,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_BUTTON_3,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_2,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_BUTTON_1,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_BUTTON_4,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_BUTTON_9,	GAME_BUTTON_BACK,	false },
+			{ 0, JOY_BUTTON_10,	GAME_BUTTON_START,	false },
 			END_MARKER
 		}
 	},
@@ -468,16 +468,16 @@ const AutoJoyMapping g_AutoJoyMappings[] =
 		"Dual USB Vibration Joystick",
 		"PC Multi Hub Double Power Box 4",
 		{
-			{ 0, JOY_13,	DANCE_BUTTON_UP,	false },
-			{ 0, JOY_15,	DANCE_BUTTON_DOWN,	false },
-			{ 0, JOY_16,	DANCE_BUTTON_LEFT,	false },
-			{ 0, JOY_14,	DANCE_BUTTON_RIGHT,	false },
-			{ 0, JOY_3,	DANCE_BUTTON_UPLEFT,	false },
-			{ 0, JOY_2,	DANCE_BUTTON_UPRIGHT,	false },
-			//{ 0, JOY_1,	DANCE_BUTTON_DOWNLEFT,	false },
-			//{ 0, JOY_4,	DANCE_BUTTON_DOWNRIGHT,	false },
-			{ 0, JOY_9,	DANCE_BUTTON_BACK,	false },
-			{ 0, JOY_10,	DANCE_BUTTON_START,	false },
+			{ 0, JOY_BUTTON_13,	DANCE_BUTTON_UP,	false },
+			{ 0, JOY_BUTTON_15,	DANCE_BUTTON_DOWN,	false },
+			{ 0, JOY_BUTTON_16,	DANCE_BUTTON_LEFT,	false },
+			{ 0, JOY_BUTTON_14,	DANCE_BUTTON_RIGHT,	false },
+			{ 0, JOY_BUTTON_3,	DANCE_BUTTON_UPLEFT,	false },
+			{ 0, JOY_BUTTON_2,	DANCE_BUTTON_UPRIGHT,	false },
+			//{ 0, JOY_BUTTON_1,	DANCE_BUTTON_DOWNLEFT,	false },
+			//{ 0, JOY_BUTTON_4,	DANCE_BUTTON_DOWNRIGHT,	false },
+			{ 0, JOY_BUTTON_9,	GAME_BUTTON_BACK,	false },
+			{ 0, JOY_BUTTON_10,	GAME_BUTTON_START,	false },
 			END_MARKER
 		}
 	},