diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index beb3644803761c9dcaee802dc0809eb1d7ab7ced..e05b28f3d5a7a23ba6451878804e5a979f867787 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -181,7 +181,7 @@ libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 vout_LTLIBRARIES += $(LTLIBdirect3d9)
 EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
 
-libdirectdraw_plugin_la_SOURCES = video_output/msw/directx.c \
+libdirectdraw_plugin_la_SOURCES = video_output/msw/directdraw.c \
 	video_output/msw/common.c video_output/msw/common.h \
 	video_output/msw/events.c video_output/msw/events.h \
 	video_output/msw/win32touch.c video_output/msw/win32touch.h
diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index 96c00102d36a0679c40cbaecacdba88781fd9bc1..75c8a76a2977e12d701bd8e9d8cbc3a630272c47 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -147,7 +147,7 @@ void CommonManage(vout_display_t *vd)
              * an issue. The surface automatically gets moved together
              * with the associated window (hvideownd)
              *
-             * For directx, it is still important to call UpdateRects
+             * For directdraw, it is still important to call UpdateRects
              * on a move of the parent window, even if no resize occurred
              */
             SetWindowPos(sys->hwnd, 0, 0, 0,
diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directdraw.c
similarity index 99%
rename from modules/video_output/msw/directx.c
rename to modules/video_output/msw/directdraw.c
index 8b8e3fb045010eb49fd77d59365d36736250213a..db06565c5afd47943acab993ffdaf42686d6e68b 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directdraw.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * directx.c: Windows DirectDraw video output
+ * directdraw.c: Windows DirectDraw video output
  *****************************************************************************
  * Copyright (C) 2001-2009 VLC authors and VideoLAN
  * $Id$
@@ -94,7 +94,7 @@ static void Close(vlc_object_t *);
 static int FindDevicesCallback(vlc_object_t *, const char *,
                                char ***, char ***);
 vlc_module_begin()
-    set_shortname("DirectX")
+    set_shortname("DirectDraw")
     set_description(N_("DirectX (DirectDraw) video output"))
     set_help(DX_HELP)
     set_category(CAT_VIDEO)
@@ -109,7 +109,7 @@ vlc_module_begin()
         change_string_cb(FindDevicesCallback)
 
     set_capability("vout display", 230)
-    add_shortcut("directx")
+    add_shortcut("directx", "directdraw")
     set_callbacks(Open, Close)
 vlc_module_end()
 
diff --git a/modules/video_output/msw/events.h b/modules/video_output/msw/events.h
index 25372c66915ad98be4c2c2cef994376829a8b821..883d769c28a3df6f831907e7b097d01466302aad 100644
--- a/modules/video_output/msw/events.h
+++ b/modules/video_output/msw/events.h
@@ -31,7 +31,7 @@ typedef struct event_thread_t event_thread_t;
 
 typedef struct {
     bool use_desktop; /* direct3d */
-    bool use_overlay; /* directx */
+    bool use_overlay; /* directdraw */
     int x;
     int y;
     unsigned width;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index de304c8c97139336980e3a87d97c476e22749400..4d861d53e10df1f85bf0ddb81503c9cf16614333 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1172,7 +1172,7 @@ modules/video_output/kva.c
 modules/video_output/macosx.m
 modules/video_output/msw/direct2d.c
 modules/video_output/msw/direct3d9.c
-modules/video_output/msw/directx.c
+modules/video_output/msw/directdraw.c
 modules/video_output/msw/events.c
 modules/video_output/msw/glwin32.c
 modules/video_output/msw/wingdi.c