diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 3add254b2ffbb4fa0c4f689b3b13fc8f4e7347a7..e43ba768247d6e9f39082d062cb5b2755b1763c1 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -428,7 +428,8 @@ libomxil_plugin_la_SOURCES = \
 	codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h \
 	video_chroma/copy.c
 if HAVE_ANDROID
-libomxil_plugin_la_SOURCES += video_output/android/utils.c video_output/android/utils.h
+libomxil_plugin_la_SOURCES += video_output/android/utils.c video_output/android/utils.h \
+	video_output/android/display.h
 endif
 libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil)
 libomxil_plugin_la_LIBADD = $(LIBDL)
@@ -448,6 +449,7 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode
 	codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \
 	video_chroma/copy.c \
 	video_output/android/utils.c video_output/android/utils.h \
+	video_output/android/display.h \
 	packetizer/hxxx_nal.h packetizer/h264_nal.c packetizer/h264_nal.h \
 	packetizer/hevc_nal.c packetizer/hevc_nal.h
 
diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index cbe4473d1ce0a443422438d7c253f46dfd97864b..605f4c7cfd5c0c558dc5e876fc2720ac0e39d9e6 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -47,7 +47,7 @@
 #include <OMX_Core.h>
 #include <OMX_Component.h>
 #include "omxil_utils.h"
-#include "../../video_output/android/android_window.h"
+#include "../../video_output/android/display.h"
 
 #define BLOCK_FLAG_CSD (0x01 << BLOCK_FLAG_PRIVATE_SHIFT)
 
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index b5e6e3c29fc29227f19398675c923fbf3d9cab03..2ffaa6aed765acda3d9fb048c90bc2019c5fa3ec 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -45,7 +45,7 @@
 #if defined(USE_IOMX)
 #include <dlfcn.h>
 #include <jni.h>
-#include "../../video_output/android/android_window.h"
+#include "../../video_output/android/display.h"
 #endif
 
 #ifndef NDEBUG
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index ccf439e4a25dd62201c163bca7567ff8ffee1953..d1bb161fade51519bbae40fffd8c8ea38bdb435a 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -277,14 +277,14 @@ libandroid_native_window_plugin_la_SOURCES = video_output/android/nativewindow.c
 libandroid_native_window_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_native_window_plugin_la_LIBADD = $(LIBDL)
 
-libandroid_window_plugin_la_SOURCES = video_output/android/android_window.c video_output/android/android_window.h video_output/android/utils.c video_output/android/utils.h
-libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS)
-libandroid_window_plugin_la_LIBADD = $(LIBDL)
-libandroid_window_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+libandroid_display_plugin_la_SOURCES = video_output/android/display.c \
+	video_output/android/display.h \
+	video_output/android/utils.c video_output/android/utils.h
+libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
+libandroid_display_plugin_la_LIBADD = $(LIBDL)
 
 if HAVE_ANDROID
-vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_window_plugin.la
-vout_LTLIBRARIES += $(LTLIBandroid_window)
+vout_LTLIBRARIES += libandroid_native_window_plugin.la libandroid_display_plugin.la
 if HAVE_EGL
 vout_LTLIBRARIES += libegl_android_plugin.la
 endif
diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/display.c
similarity index 99%
rename from modules/video_output/android/android_window.c
rename to modules/video_output/android/display.c
index 03e51efd6e63963cca43a86ac1aad08650af38f1..d723b4132140c643fdfdccf87fbdf372463a0b0d 100644
--- a/modules/video_output/android/android_window.c
+++ b/modules/video_output/android/display.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * android_window.c: Android video output module
+ * display.c: Android video output module
  *****************************************************************************
  * Copyright (C) 2014 VLC authors and VideoLAN
  *
@@ -36,7 +36,7 @@
 
 #include <dlfcn.h>
 
-#include "android_window.h"
+#include "display.h"
 #include "utils.h"
 
 /*****************************************************************************
@@ -47,7 +47,7 @@
 #define CHROMA_LONGTEXT N_(\
     "Force use of a specific chroma for output. Default is RGB32.")
 
-#define CFG_PREFIX "androidwindow-"
+#define CFG_PREFIX "android-display-"
 static int  Open (vlc_object_t *);
 static void Close(vlc_object_t *);
 static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture);
@@ -55,10 +55,9 @@ static void SubpicturePrepare(vout_display_t *vd, subpicture_t *subpicture);
 vlc_module_begin()
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VOUT)
-    set_shortname("android_window")
     set_description(N_("Android video output"))
     set_capability("vout display", 260)
-    add_shortcut("androidwindow", "android")
+    add_shortcut("android-display")
     add_string(CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
     set_callbacks(Open, Close)
 vlc_module_end()
@@ -67,7 +66,7 @@ vlc_module_end()
  * Local prototypes
  *****************************************************************************/
 
-#define THREAD_NAME "android_window"
+#define THREAD_NAME "android-display"
 
 static const vlc_fourcc_t subpicture_chromas[] =
 {
@@ -1129,7 +1128,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_SUCCESS;
     }
     default:
-        msg_Warn(vd, "Unknown request in android_window");
+        msg_Warn(vd, "Unknown request in android-display: %d", query);
     case VOUT_DISPLAY_CHANGE_ZOOM:
     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         return VLC_EGENERIC;
diff --git a/modules/video_output/android/android_window.h b/modules/video_output/android/display.h
similarity index 98%
rename from modules/video_output/android/android_window.h
rename to modules/video_output/android/display.h
index aceb5cbe8a0553aa44ffaf3bb3999a4eeccd8b6a..8d2b97118af6a979bff2752987c32dfc1668668d 100644
--- a/modules/video_output/android/android_window.h
+++ b/modules/video_output/android/display.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * android_window.c: Android video output module
+ * display.h: Android video output module
  *****************************************************************************
  * Copyright (C) 2014 VLC authors and VideoLAN
  *
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 73262d064c3ade9512d7114c5aafa93a836057bd..db8d119de582ae96f1054b1be659bec71a338c75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1140,7 +1140,7 @@ modules/video_filter/transform.c
 modules/video_filter/vhs.c
 modules/video_filter/wave.c
 modules/video_output/aa.c
-modules/video_output/android/android_window.c
+modules/video_output/android/display.c
 modules/video_output/android/nativewindow.c
 modules/video_output/caca.c
 modules/video_output/caopengllayer.m