diff --git a/jni/libneon/libneon_jni.cc b/jni/libneon/libneon_jni.cc
index 15298e803..763723cf0 100644
--- a/jni/libneon/libneon_jni.cc
+++ b/jni/libneon/libneon_jni.cc
@@ -31,7 +31,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *ajvm, void *reserved)
 	return JNI_VERSION_1_2;
 }
 
-extern "C" jboolean Java_org_linphone_CpuUtils_hasNeon(JNIEnv* env, jobject thiz) {
+extern "C" jboolean Java_org_linphone_mediastream_CpuUtils_hasNeon(JNIEnv* env, jobject thiz) {
 	return android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON;
 }
 }
diff --git a/src/org/linphone/CpuUtils.java b/src/org/linphone/CpuUtils.java
deleted file mode 100644
index 3882f6098..000000000
--- a/src/org/linphone/CpuUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.linphone;
-/*
-CpuUtils.java
-Copyright (C) 2013  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/**
- * @author Sylvain Berfini
- */
-public class CpuUtils {
-	private native boolean hasNeon();
-	
-	public CpuUtils() {
-		
-	}
-	
-	public boolean isCpuNeon() {
-		return hasNeon();
-	}
-}