diff --git a/console/retroarch_console_input.h b/console/retroarch_console_input.h
index 3e34334112..fd32e36479 100644
--- a/console/retroarch_console_input.h
+++ b/console/retroarch_console_input.h
@@ -89,7 +89,7 @@ enum ps3_device_id
 
 enum xdk_device_id
 {
-   XDKK_DEVICE_ID_JOYPAD_B = 0,
+   XDK_DEVICE_ID_JOYPAD_B = 0,
    XDK_DEVICE_ID_JOYPAD_A,
    XDK_DEVICE_ID_JOYPAD_Y,
    XDK_DEVICE_ID_JOYPAD_X,
diff --git a/input/xinput2_input.c b/input/xinput2_input.c
index b6daf3cfc9..3aab8fad7a 100644
--- a/input/xinput2_input.c
+++ b/input/xinput2_input.c
@@ -81,22 +81,22 @@ void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_
    switch(map_dpad_enum)
    {
       case DPAD_EMULATION_NONE:
-         g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK360_DEVICE_ID_JOYPAD_UP].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK360_DEVICE_ID_JOYPAD_DOWN].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK360_DEVICE_ID_JOYPAD_LEFT].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK360_DEVICE_ID_JOYPAD_RIGHT].joykey;
+         g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK_DEVICE_ID_JOYPAD_UP].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK_DEVICE_ID_JOYPAD_DOWN].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK_DEVICE_ID_JOYPAD_LEFT].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK_DEVICE_ID_JOYPAD_RIGHT].joykey;
 	 break;
       case DPAD_EMULATION_LSTICK:
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK360_DEVICE_ID_LSTICK_UP_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK360_DEVICE_ID_LSTICK_DOWN_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK360_DEVICE_ID_LSTICK_LEFT_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK360_DEVICE_ID_LSTICK_RIGHT_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK_DEVICE_ID_LSTICK_UP_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK_DEVICE_ID_LSTICK_DOWN_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK_DEVICE_ID_LSTICK_LEFT_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK_DEVICE_ID_LSTICK_RIGHT_DPAD].joykey;
 	 break;
       case DPAD_EMULATION_RSTICK:
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK360_DEVICE_ID_RSTICK_UP_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK360_DEVICE_ID_RSTICK_DOWN_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK360_DEVICE_ID_RSTICK_LEFT_DPAD].joykey;
-	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK360_DEVICE_ID_RSTICK_RIGHT_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey	= platform_keys[XDK_DEVICE_ID_RSTICK_UP_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey	= platform_keys[XDK_DEVICE_ID_RSTICK_DOWN_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey	= platform_keys[XDK_DEVICE_ID_RSTICK_LEFT_DPAD].joykey;
+	 g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey	= platform_keys[XDK_DEVICE_ID_RSTICK_RIGHT_DPAD].joykey;
 	 break;
    }
 }