diff --git a/build/android/Android.mk b/build/android/Android.mk
index 1edc91fac1e1a83509fa8fae60831018a36653cc..e634d3fa02716687156af5fdfb12995078083f72 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -69,7 +69,7 @@ LOCAL_SRC_FILES := \
 	call_log.c \
 	call_params.c \
 	player.c \
-	fileplayer.c
+	localplayer.c
 
 ifndef LIBLINPHONE_VERSION
 LIBLINPHONE_VERSION = "Devel"
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index c1cc56e47c22701d76f864f3e0ceba956db1c226..eb90870eb261529c1c911e752babc6eb28d36466 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -28,7 +28,7 @@ extern "C" {
 #include "mediastreamer2/mediastream.h"
 #include "mediastreamer2/mscommon.h"
 #include "mediastreamer2/dsptools.h"
-#include "mediastreamer2/fileplayer.h"
+#include "mediastreamer2/msmediaplayer.h"
 }
 #include "mediastreamer2/msjava.h"
 #include "private.h"
diff --git a/mediastreamer2 b/mediastreamer2
index 04fa73768107968abf6ff8440e5dff20f6a4a0c9..83bceea35319df31971ae3dede509f02fdf7df9b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 04fa73768107968abf6ff8440e5dff20f6a4a0c9
+Subproject commit 83bceea35319df31971ae3dede509f02fdf7df9b