diff --git a/MAINTAINERS b/MAINTAINERS
index e5048086c6..e7306b5310 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -205,7 +205,7 @@ Codecs:
   wnv1.c                                Kostya Shishkov
   xan.c                                 Mike Melanson
   xl.c                                  Kostya Shishkov
-  xvmcvideo.c                           Ivan Kalvachev
+  xvmc.c                                Ivan Kalvachev
   zmbv*                                 Kostya Shishkov
 
 
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index cd0cf15859..978764eed0 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -103,7 +103,7 @@ OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontr
 OBJS-$(CONFIG_H263P_ENCODER)           += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
-OBJS-$(CONFIG_H264_VDPAU_DECODER)      += vdpauvideo.o h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_H264_VDPAU_DECODER)      += vdpau.o h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
 OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
 OBJS-$(CONFIG_IDCIN_DECODER)           += idcinvideo.o
@@ -252,7 +252,7 @@ OBJS-$(CONFIG_XAN_WC3_DECODER)         += xan.o
 OBJS-$(CONFIG_XAN_WC4_DECODER)         += xan.o
 OBJS-$(CONFIG_XL_DECODER)              += xl.o
 OBJS-$(CONFIG_XSUB_DECODER)            += xsubdec.o
-OBJS-$(CONFIG_XVMC)                    += xvmcvideo.o
+OBJS-$(CONFIG_XVMC)                    += xvmc.o
 OBJS-$(CONFIG_ZLIB_DECODER)            += lcldec.o
 OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.o
 OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.o
diff --git a/libavcodec/vdpauvideo.c b/libavcodec/vdpau.c
similarity index 100%
rename from libavcodec/vdpauvideo.c
rename to libavcodec/vdpau.c
diff --git a/libavcodec/xvmcvideo.c b/libavcodec/xvmc.c
similarity index 98%
rename from libavcodec/xvmcvideo.c
rename to libavcodec/xvmc.c
index 9c4d8d8115..b66320a61f 100644
--- a/libavcodec/xvmcvideo.c
+++ b/libavcodec/xvmc.c
@@ -117,7 +117,7 @@ void XVMC_field_end(MpegEncContext *s){
     assert(render != NULL);
 
     if(render->filled_mv_blocks_num > 0){
-//        printf("xvmcvideo.c: rendering %d left blocks after last slice!!!\n",render->filled_mv_blocks_num );
+//        printf("xvmc: rendering %d left blocks after last slice!!!\n",render->filled_mv_blocks_num );
         ff_draw_horiz_band(s,0,0);
     }
 }