diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index d6c43fe68a..5d2bc51800 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 
 APP_OPTIM := debug
 
-LOCAL_MODULE    := retroarch
+LOCAL_MODULE    := retroarch-activity
 
 RARCH_PATH  := ../../..
 LOCAL_SRC_FILES    =	$(RARCH_PATH)/retroarch.c \
diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index 2e1d63fa42..62fa7630d8 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -9,9 +9,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
-        <activity
-            android:name=".main"
-            android:label="@string/app_name" >
+        <activity android:name="phoenix" android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -20,10 +18,8 @@
         </activity>
         <activity android:label="@string/app_name" android:name="com.retroarch.fileio.FileChooser" />
         <activity android:label="@string/app_name" android:name="rombrowser" />
-<!--
-        <activity android:name="android.app.NativeActivity" android:label="retroarch">
-        	<meta-data android:name="android.app.lib_name" android:value="retroarch" />
+        <activity android:name="android.app.NativeActivity">
+        	<meta-data android:name="android.app.lib_name" android:value="retroarch-activity" />
         </activity>
--->
     </application>
 </manifest>
diff --git a/android/phoenix/src/com/retroarch/main.java b/android/phoenix/src/com/retroarch/phoenix.java
similarity index 91%
rename from android/phoenix/src/com/retroarch/main.java
rename to android/phoenix/src/com/retroarch/phoenix.java
index 0970810f9a..dbed384281 100644
--- a/android/phoenix/src/com/retroarch/main.java
+++ b/android/phoenix/src/com/retroarch/phoenix.java
@@ -20,6 +20,7 @@ import com.retroarch.R;
 import com.retroarch.fileio.FileChooser;
 
 import android.app.Activity;
+import android.app.NativeActivity;
 import android.content.Intent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,7 +28,7 @@ import android.view.MenuItem;
 import android.widget.Toast;
 import android.os.Bundle;
 
-public class main extends Activity
+public class phoenix extends Activity
 {
 	static private final int ACTIVITY_LOAD_ROM = 0;
 	
@@ -55,7 +56,7 @@ public class main extends Activity
     		    break;
     	    case R.id.open:
     	    	Toast.makeText(this, "Select a ROM image from the Filebrowser.", Toast.LENGTH_SHORT).show();
-    	    	Intent myIntent = new Intent(main.this, FileChooser.class);
+    	    	Intent myIntent = new Intent(this, FileChooser.class);
     	    	startActivityForResult(myIntent, ACTIVITY_LOAD_ROM);
     		    break;
     		default:
@@ -70,11 +71,9 @@ public class main extends Activity
     {
     	if(requestCode == ACTIVITY_LOAD_ROM)
     	{
-    		/*
-	    	Intent myIntent = new Intent(this, NativeActivity.class);
-	    	startActivity(myIntent);
-	    	*/
-    		/*
+           Intent myIntent = new Intent(this, NativeActivity.class);
+	   startActivity(myIntent);
+	   /*
             rruntime.settings_set_defaults();
             rruntime.load_game(data.getStringExtra("PATH"), 0);