diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 09c8c4de..17867db4 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -11,8 +11,8 @@ libI810XvMC_la_LIBADD = @DRI_LIBS@
 
 libIntelXvMC_la_SOURCES = intel_xvmc.c \
 			 intel_xvmc.h \
-			 I915XvMC.c \
-                         I915XvMC.h \
+			 i915_xvmc.c \
+                         i915_xvmc.h \
                          intel_batchbuffer.c \
                          intel_batchbuffer.h \
                          xf86dri.c \
diff --git a/src/xvmc/I915XvMC.c b/src/xvmc/i915_xvmc.c
similarity index 99%
rename from src/xvmc/I915XvMC.c
rename to src/xvmc/i915_xvmc.c
index d34808fc..911b80e9 100644
--- a/src/xvmc/I915XvMC.c
+++ b/src/xvmc/i915_xvmc.c
@@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <sys/ioctl.h>
 
-#include "I915XvMC.h"
+#include "i915_xvmc.h"
 #include "i915_structs.h"
 #include "i915_program.h"
 
diff --git a/src/xvmc/I915XvMC.h b/src/xvmc/i915_xvmc.h
similarity index 100%
rename from src/xvmc/I915XvMC.h
rename to src/xvmc/i915_xvmc.h