diff --git a/Makefile.common b/Makefile.common
index 164085f4b1..904a56dacb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -166,7 +166,7 @@ OBJ += frontend/frontend.o \
 		audio/drivers/nullaudio.o \
 		input/drivers/nullinput.o \
 		input/drivers_hid/null_hid.o \
-		input/drivers_joypad/nullinput_joypad.o \
+		input/drivers_joypad/null_joypad.o \
 		input/drivers_joypad/hid_joypad.o \
 		playlist.o \
 		movie.o \
@@ -370,7 +370,7 @@ endif
 
 ifeq ($(HAVE_WINXINPUT), 1)
    DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
-   OBJ += input/drivers_joypad/winxinput_joypad.o \
+   OBJ += input/drivers_joypad/xinput_joypad.o \
           input/autoconf/builtin_win.o
 endif
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7cbdf5be07..f715f967ca 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -371,7 +371,7 @@ INPUT
 #endif
 
 #include "../input/drivers/nullinput.c"
-#include "../input/drivers_joypad/nullinput_joypad.c"
+#include "../input/drivers_joypad/null_joypad.c"
 
 /*============================================================
 INPUT (HID)
diff --git a/input/drivers_joypad/nullinput_joypad.c b/input/drivers_joypad/null_joypad.c
similarity index 100%
rename from input/drivers_joypad/nullinput_joypad.c
rename to input/drivers_joypad/null_joypad.c