diff --git a/app/build.gradle b/app/build.gradle
index aa86181c..263ef5c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "org.love2d.android"
-        versionCode = 22
+        versionCode 22
         versionName "0.10.2"
         minSdkVersion 10
         targetSdkVersion 18
@@ -24,6 +24,6 @@ android {
 dependencies {
     compile 'com.android.support:multidex:1.0.1'
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     compile project(':love')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e8ba6bf2..dee04a95 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.love2d.android"
+<manifest package="org.love2d.android.executable"
       android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
@@ -7,14 +7,17 @@
     <!-- Allow writing to external storage -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <application
+  <!-- OpenGL ES 2.0 -->
+  <uses-feature android:glEsVersion="0x00020000" />
+
+  <application
       android:allowBackup="true"
       android:icon="@drawable/love"
       android:label="LÖVE for Android"
       android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
-      <service android:name=".DownloadService" />
+      <service android:name="org.love2d.android.DownloadService" />
       <activity
-        android:name="GameActivity"
+        android:name="org.love2d.android.GameActivity"
         android:configChanges="orientation|screenSize"
         android:label="LÖVE for Android"
         android:launchMode="singleTop"
@@ -41,7 +44,7 @@
         </intent-filter>
       </activity>
       <activity
-        android:name="DownloadActivity" 
+        android:name="org.love2d.android.DownloadActivity"
         android:noHistory="true" >
         <intent-filter>
           <action android:name="android.intent.action.VIEW" />
@@ -60,7 +63,4 @@
         </intent-filter>
       </activity>
     </application>
-
-    <!-- OpenGL ES 2.0 -->
-    <uses-feature android:glEsVersion="0x00020000" /> 
 </manifest> 
diff --git a/love/src/main/AndroidManifest.xml b/love/src/main/AndroidManifest.xml
index fff3c0c9..8078c41d 100644
--- a/love/src/main/AndroidManifest.xml
+++ b/love/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.love2d.android.library" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="org.love2d.android" xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>