diff --git a/configure b/configure
index fa4b67c9c9..019ed83ea6 100755
--- a/configure
+++ b/configure
@@ -5545,10 +5545,10 @@ linux && _def_linux='#define TARGET_LINUX 1'
 _def_vidix='#define CONFIG_VIDIX 1'
 test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX'
 if test "$_vidix" = yes; then
-  _vosrc="$_vosrc vo_consolevidix.c"
-  _vomodules="consolevidix $_vomodules"
+  _vosrc="$_vosrc vo_cvidix.c"
+  _vomodules="cvidix $_vomodules"
 else
-  _novomodules="consolevidix $_novomodules"
+  _novomodules="cvidix $_novomodules"
 fi
 if test "$_vidix" = yes && (cygwin || mingw32); then
   _vosrc="$_vosrc vo_winvidix.c"
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 6fc5b4b46c..18594910d4 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -105,7 +105,7 @@ extern vo_functions_t video_out_dfbmga;
 #ifdef CONFIG_VIDIX
 extern vo_functions_t video_out_xvidix;
 extern vo_functions_t video_out_winvidix;
-extern vo_functions_t video_out_consolevidix;
+extern vo_functions_t video_out_cvidix;
 #endif
 #ifdef HAVE_TDFX_VID
 extern vo_functions_t video_out_tdfx_vid;
@@ -217,7 +217,7 @@ vo_functions_t* video_out_drivers[] =
 #ifdef WIN32
     &video_out_winvidix,
 #endif
-    &video_out_consolevidix,
+    &video_out_cvidix,
 #endif
 #ifdef HAVE_TGA
         &video_out_tga,
diff --git a/libvo/vo_consolevidix.c b/libvo/vo_cvidix.c
similarity index 98%
rename from libvo/vo_consolevidix.c
rename to libvo/vo_cvidix.c
index 60170b9181..981f344200 100644
--- a/libvo/vo_consolevidix.c
+++ b/libvo/vo_cvidix.c
@@ -26,12 +26,12 @@
 
 static vo_info_t info = {
     "VIDIX",
-    "consolevidix",
+    "cvidix",
     "Sascha Sommer",
     ""
 };
 
-LIBVO_EXTERN(consolevidix)
+LIBVO_EXTERN(cvidix)
 
 #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */