diff --git a/misc/mkandroid b/misc/mkandroid
index 4b6ae73f1..660db823d 100755
--- a/misc/mkandroid
+++ b/misc/mkandroid
@@ -2,9 +2,15 @@
 #
 # script to compile yap for Android.
 
-export SDK_ROOT=$HOME/Yap/android-sdk-linux
+if test -d $HOME/Yap/android-sdk-linux
+then
+  export SDK_ROOT=$HOME/Yap/android-sdk-linux
+elif test -d $HOME/Yap/android-sdk-macosx
+then
+  export SDK_ROOT=$HOME/Yap/android-sdk-macosx
+fi
+
 export NDK_ROOT=$HOME/Yap/android-ndk-r9d
-export PATH=$PATH:"$SDK_ROOT"/tools:"$NDK_ROOT"
 
 export GMPDIR=$HOME/Yap/gmp-android
 
@@ -28,7 +34,7 @@ else
                                  --install-dir="$HOME"/Yap/my-android-toolchain
 fi
 
-export PATH=$HOME/Yap/my-android-toolchain/bin:"$NDK_ROOT":"$SDK_ROOT/tools":"$SDK_ROOT/platform-tools":$PATH
+export PATH="$HOME"/Yap/my-android-toolchain/bin:"$NDK_ROOT":"$SDK_ROOT/tools":"$SDK_ROOT/platform-tools":$PATH
 
 cd ~/Yap/bins/android
 
@@ -55,5 +61,6 @@ fi
 cd packages/swig
 mkdir -p $ANDROID_NDK_ROOT/build/core/lib
 make android
-adb uninstall org.swig.simple
-adb install android/bin/SwigSimple-debug.apk
+make install-android
+adb uninstall pt.up.fc.dcc.yap
+adb install android/bin/JavaYap-debug.apk
diff --git a/os/pl-file.c b/os/pl-file.c
index e55639b51..72afea417 100755
--- a/os/pl-file.c
+++ b/os/pl-file.c
@@ -5146,9 +5146,9 @@ static const PL_extension foreigns[] = {
 #if __ANDROID__
 JNIEnv *Yap_jenv;
 
-void Java_org_swig_simple_SwigSimple_load(JNIEnv *env0, jobject obj, jobject mgr);
+void Java_pt_up_fc_dcc_yap_JavaYap_load(JNIEnv *env0, jobject obj, jobject mgr);
 
-void Java_org_swig_simple_SwigSimple_load
+void Java_pt_up_fc_dcc_yap_JavaYap_load
      (JNIEnv *env0, jobject obj, jobject mgr0)
 {
   AAssetManager *mgr = AAssetManager_fromJava(env0, mgr0);
diff --git a/packages/swig/Makefile.in b/packages/swig/Makefile.in
index 5b098a30e..d342605fb 100644
--- a/packages/swig/Makefile.in
+++ b/packages/swig/Makefile.in
@@ -48,16 +48,16 @@ jni/yap_wrap.o:  jni/yap_wrap.cpp
 #   emulator -avd first &
 #
 # adb uninstall org.swig.simple  ( if not the first time )
-# adb install bin/SwigSimple-debug.apk
+# adb install bin/JavaYap-debug.apk
 #
 #
 android: android/jni/yap_wrap.cpp
 
 android/jni/yap_wrap.cpp:  $(srcdir)/yap.i
-	android create project --target 1 --name Yap --path ./android --activity Yap --package pt.up.fc.dcc.yap;\
+	android create project --target 1 --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap;\
 	( cd android ; mkdir -p jni jni/lib; mkdir -p assets/share/Yap; mkdir -p assets/lib/Yap;\
-	$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.simple -outdir src/pt/up/fc/dcc/yap -o jni/yap_wrap.cpp $(CXXFLAGS) $< ;\
-	cp $(srcdir)/android/Yap.java src/pt/up/fc/dcc/yap/ ;\
+	$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir src/pt/up/fc/dcc/yap -o jni/yap_wrap.cpp $(CXXFLAGS) $< ;\
+	cp $(srcdir)/android/JavaYap.java src/pt/up/fc/dcc/yap/ ;\
 	cp $(srcdir)/android/main.xml res/layout ;\
 	cp $(srcdir)/android/Application.mk jni ;\
 	cp -r $(DESTDIR)$(PLLIBDIR)/* assets/share/Yap;\
@@ -68,6 +68,10 @@ android/jni/yap_wrap.cpp:  $(srcdir)/yap.i
 	ant debug \
 	)
 
+make install-android: android
+	adb uninstall pt.up.fc.dcc.yap
+	adb install android/bin/JavaYap-debug.apk
+
 R:
 
 
diff --git a/packages/swig/android/SwigSimple.java b/packages/swig/android/JavaYap.java
similarity index 96%
rename from packages/swig/android/SwigSimple.java
rename to packages/swig/android/JavaYap.java
index 8dfc23779..60fcc0eaa 100644
--- a/packages/swig/android/SwigSimple.java
+++ b/packages/swig/android/JavaYap.java
@@ -1,4 +1,4 @@
-package org.swig.simple;
+package pt.up.fc.dcc.yap;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -14,9 +14,9 @@ import android.content.res.AssetManager;
 import 	android.widget.EditText;
 import 	java.text.ParseException;
 
-public class SwigSimple extends Activity
+public class JavaYap extends Activity
 {
-	 TextView outputText = null;
+	TextView outputText = null;
 	ScrollView scroller = null;
 	YAPEngine eng = null;
 	EditText text;
@@ -154,7 +154,7 @@ public class SwigSimple extends Activity
 
 	private AssetManager mgr;
 
-	private static final String TAG = "SwigSimple";
+	private static final String TAG = "JavaYap";
 
 }