diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index adb24ac8a5..2f7067bc2f 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -686,7 +686,7 @@ input_driver_t input_dinput = {
 };
 
 /* Keep track of which pad indexes are 360 controllers.
- * Not static, will be read in winxinput_joypad.c
+ * Not static, will be read in xinput_joypad.c
  * -1 = not xbox pad, otherwise 0..3
  */
 
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index e7498d4a4a..dba6f7db14 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -59,7 +59,7 @@ static const char* sdl_pad_name(unsigned id)
 static uint8_t sdl_pad_get_button(sdl_joypad_t *pad, unsigned button)
 {
 #ifdef HAVE_SDL2
-   /* TODO: see if a LUT like winxinput_joypad.c's button_index_to_bitmap_code is needed. */
+   /* TODO: see if a LUT like xinput_joypad.c's button_index_to_bitmap_code is needed. */
    if (pad->controller)
       return SDL_GameControllerGetButton(pad->controller, (SDL_GameControllerButton)button);
 #endif
diff --git a/input/input_joypad_driver.c b/input/input_joypad_driver.c
index 92faea93ed..1e8c301e7d 100644
--- a/input/input_joypad_driver.c
+++ b/input/input_joypad_driver.c
@@ -27,7 +27,7 @@ static rarch_joypad_driver_t *joypad_drivers[] = {
    &ps3_joypad,
 #endif
 #ifdef HAVE_WINXINPUT
-   &winxinput_joypad,
+   &xinput_joypad,
 #endif
 #ifdef GEKKO
    &gx_joypad,
diff --git a/input/input_joypad_driver.h b/input/input_joypad_driver.h
index 352f04f156..8f64a24789 100644
--- a/input/input_joypad_driver.h
+++ b/input/input_joypad_driver.h
@@ -48,7 +48,7 @@ extern rarch_joypad_driver_t dinput_joypad;
 extern rarch_joypad_driver_t linuxraw_joypad;
 extern rarch_joypad_driver_t parport_joypad;
 extern rarch_joypad_driver_t udev_joypad;
-extern rarch_joypad_driver_t winxinput_joypad;
+extern rarch_joypad_driver_t xinput_joypad;
 extern rarch_joypad_driver_t sdl_joypad;
 extern rarch_joypad_driver_t ps3_joypad;
 extern rarch_joypad_driver_t psp_joypad;