diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 9bd10557a..2fff651f5 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -5305,7 +5305,7 @@ extern "C" void Java_org_linphone_core_LinphonePlayerImpl_destroy(JNIEnv *env, j
 	linphone_player_destroy(player);
 }
 
-extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createPlayer(JNIEnv *env, jobject jobj, jlong ptr, jobject window) {
+extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createLocalPlayer(JNIEnv *env, jobject jobj, jlong ptr, jobject window) {
 	jobject window_ref = NULL;
 	MSSndCard *snd_card = ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get());
 	if(snd_card == NULL) {
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index fced284f8..af878e24f 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -1786,5 +1786,5 @@ public interface LinphoneCore {
 	 * Create a media player
 	 * @return An object that implement LinphonePlayer
 	 */
-	public LinphonePlayer createPlayer(AndroidVideoWindowImpl window);
+	public LinphonePlayer createLocalPlayer(AndroidVideoWindowImpl window);
 }
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 8ba90e937..6e6f5a21f 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -1280,10 +1280,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return getFileTransferServer(nativePtr);
 	}
 
-	private native long createPlayer(long nativePtr, AndroidVideoWindowImpl window);
+	private native long createLocalPlayer(long nativePtr, AndroidVideoWindowImpl window);
 	@Override
-	public synchronized LinphonePlayer createPlayer(AndroidVideoWindowImpl window) {
-		long playerPtr = createPlayer(nativePtr, window);
+	public synchronized LinphonePlayer createLocalPlayer(AndroidVideoWindowImpl window) {
+		long playerPtr = createLocalPlayer(nativePtr, window);
 		if(playerPtr != 0) {
 			return new LinphonePlayerImpl(playerPtr);
 		} else {
diff --git a/mediastreamer2 b/mediastreamer2
index 73ac0e724..0190b1c34 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 73ac0e724ebbd16c3349d460a77c7585d6a294da
+Subproject commit 0190b1c34fead09a19bf1eac6ee72e4b408ec94a