diff --git a/org_apg/AndroidManifest.xml b/org_apg/AndroidManifest.xml
index 4ab346b7d..857f7d279 100644
--- a/org_apg/AndroidManifest.xml
+++ b/org_apg/AndroidManifest.xml
@@ -11,24 +11,21 @@
         android:minSdkVersion="4"
         android:targetSdkVersion="14" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
+
     <permission
-        android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
+        android:name="org.apg.permission.READ_KEY_DETAILS"
         android:description="@string/permission_read_key_details_description"
         android:label="@string/permission_read_key_details_label"
         android:protectionLevel="dangerous" />
     <permission
-        android:name="org.thialfihar.android.apg.permission.STORE_BLOBS"
+        android:name="org.apg.permission.STORE_BLOBS"
         android:description="@string/permission_store_blobs_description"
         android:label="@string/permission_store_blobs_label"
         android:protectionLevel="dangerous" />
 
-    <uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
-    <uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="org.thialfihar.android.apg.permission.STORE_BLOBS" />
-
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name" >
@@ -78,7 +75,7 @@
             android:label="@string/title_selectRecipients"
             android:launchMode="singleTop" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS" />
+                <action android:name="org.apg.intent.SELECT_PUBLIC_KEYS" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -96,7 +93,7 @@
             android:label="@string/title_selectSignature"
             android:launchMode="singleTop" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_SECRET_KEY" />
+                <action android:name="org.apg.intent.SELECT_SECRET_KEY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -113,10 +110,10 @@
             android:configChanges="keyboardHidden|orientation|keyboard"
             android:label="@string/title_encrypt" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN" />
-                <action android:name="org.thialfihar.android.apg.intent.GENERATE_SIGNATURE" />
+                <action android:name="org.apg.intent.ENCRYPT" />
+                <action android:name="org.apg.intent.ENCRYPT_FILE" />
+                <action android:name="org.apg.intent.ENCRYPT_AND_RETURN" />
+                <action android:name="org.apg.intent.GENERATE_SIGNATURE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -128,9 +125,9 @@
             android:configChanges="keyboardHidden|orientation|keyboard"
             android:label="@string/title_decrypt" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN" />
+                <action android:name="org.apg.intent.DECRYPT" />
+                <action android:name="org.apg.intent.DECRYPT_FILE" />
+                <action android:name="org.apg.intent.DECRYPT_AND_RETURN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -208,10 +205,10 @@
             android:name=".ApgService"
             android:enabled="true"
             android:exported="true"
-            android:permission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS"
+            android:permission="org.apg.permission.READ_KEY_DETAILS"
             android:process=":remote" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.IApgService" />
+                <action android:name="org.apg.IApgService" />
             </intent-filter>
 
             <meta-data
@@ -221,12 +218,12 @@
 
         <provider
             android:name=".provider.DataProvider"
-            android:authorities="org.thialfihar.android.apg.provider"
-            android:readPermission="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
+            android:authorities="org.apg.provider"
+            android:readPermission="org.apg.permission.READ_KEY_DETAILS" />
         <provider
             android:name=".provider.ApgServiceBlobProvider"
-            android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider"
-            android:permission="org.thialfihar.android.apg.permission.STORE_BLOBS" />
+            android:authorities="org.apg.provider.apgserviceblobprovider"
+            android:permission="org.apg.permission.STORE_BLOBS" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/org_apg/src/org/apg/Apg.java b/org_apg/src/org/apg/Apg.java
index 2bfdb31e6..e3a2b5eb8 100644
--- a/org_apg/src/org/apg/Apg.java
+++ b/org_apg/src/org/apg/Apg.java
@@ -108,23 +108,23 @@ import java.util.Vector;
 import java.util.regex.Pattern;
 
 public class Apg {
-    private static final String mApgPackageName = "org.thialfihar.android.apg";
+    private static final String mApgPackageName = "org.apg";
 
     public static class Intent {
-        public static final String DECRYPT = "org.thialfihar.android.apg.intent.DECRYPT";
-        public static final String ENCRYPT = "org.thialfihar.android.apg.intent.ENCRYPT";
-        public static final String DECRYPT_FILE = "org.thialfihar.android.apg.intent.DECRYPT_FILE";
-        public static final String ENCRYPT_FILE = "org.thialfihar.android.apg.intent.ENCRYPT_FILE";
-        public static final String DECRYPT_AND_RETURN = "org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN";
-        public static final String ENCRYPT_AND_RETURN = "org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN";
-        public static final String SELECT_PUBLIC_KEYS = "org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS";
-        public static final String SELECT_SECRET_KEY = "org.thialfihar.android.apg.intent.SELECT_SECRET_KEY";
-        public static final String IMPORT = "org.thialfihar.android.apg.intent.IMPORT";
-        public static final String LOOK_UP_KEY_ID = "org.thialfihar.android.apg.intent.LOOK_UP_KEY_ID";
-        public static final String LOOK_UP_KEY_ID_AND_RETURN = "org.thialfihar.android.apg.intent.LOOK_UP_KEY_ID_AND_RETURN";
-        public static final String GENERATE_SIGNATURE = "org.thialfihar.android.apg.intent.GENERATE_SIGNATURE";
-        public static final String EXPORT_KEY_TO_SERVER = "org.thialfihar.android.apg.intent.EXPORT_KEY_TO_SERVER";
-        public static final String IMPORT_FROM_QR_CODE = "org.thialfihar.android.apg.intent.IMPORT_FROM_QR_CODE";
+        public static final String DECRYPT = "org.apg.intent.DECRYPT";
+        public static final String ENCRYPT = "org.apg.intent.ENCRYPT";
+        public static final String DECRYPT_FILE = "org.apg.intent.DECRYPT_FILE";
+        public static final String ENCRYPT_FILE = "org.apg.intent.ENCRYPT_FILE";
+        public static final String DECRYPT_AND_RETURN = "org.apg.intent.DECRYPT_AND_RETURN";
+        public static final String ENCRYPT_AND_RETURN = "org.apg.intent.ENCRYPT_AND_RETURN";
+        public static final String SELECT_PUBLIC_KEYS = "org.apg.intent.SELECT_PUBLIC_KEYS";
+        public static final String SELECT_SECRET_KEY = "org.apg.intent.SELECT_SECRET_KEY";
+        public static final String IMPORT = "org.apg.intent.IMPORT";
+        public static final String LOOK_UP_KEY_ID = "org.apg.intent.LOOK_UP_KEY_ID";
+        public static final String LOOK_UP_KEY_ID_AND_RETURN = "org.apg.intent.LOOK_UP_KEY_ID_AND_RETURN";
+        public static final String GENERATE_SIGNATURE = "org.apg.intent.GENERATE_SIGNATURE";
+        public static final String EXPORT_KEY_TO_SERVER = "org.apg.intent.EXPORT_KEY_TO_SERVER";
+        public static final String IMPORT_FROM_QR_CODE = "org.apg.intent.IMPORT_FROM_QR_CODE";
     }
 
     public static final String EXTRA_TEXT = "text";
@@ -153,7 +153,7 @@ public class Apg {
     public static final String EXTRA_ASCII_ARMOUR = "asciiArmour";
     public static final String EXTRA_BINARY = "binary";
     public static final String EXTRA_KEY_SERVERS = "keyServers";
-    public static final String EXTRA_EXPECTED_FINGERPRINT = "org.thialfihar.android.apg.EXPECTED_FINGERPRINT";
+    public static final String EXTRA_EXPECTED_FINGERPRINT = "org.apg.EXPECTED_FINGERPRINT";
 
     public static final String AUTHORITY = DataProvider.AUTHORITY;
 
diff --git a/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java b/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
index f2d5377a4..0c314d771 100644
--- a/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
+++ b/org_apg/src/org/apg/provider/ApgServiceBlobProvider.java
@@ -20,7 +20,7 @@ public class ApgServiceBlobProvider extends ContentProvider {
     
     private static final String TAG = "ApgServiceBlobProvider";
     
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thialfihar.android.apg.provider.apgserviceblobprovider");
+    public static final Uri CONTENT_URI = Uri.parse("content://org.apg.provider.apgserviceblobprovider");
     
     private static final String COLUMN_KEY = "key";
     
diff --git a/org_apg/src/org/apg/provider/DataProvider.java b/org_apg/src/org/apg/provider/DataProvider.java
index a97851e58..bafcc3c28 100644
--- a/org_apg/src/org/apg/provider/DataProvider.java
+++ b/org_apg/src/org/apg/provider/DataProvider.java
@@ -33,7 +33,7 @@ import android.os.ParcelFileDescriptor;
 import android.text.TextUtils;
 
 public class DataProvider extends ContentProvider {
-    public static final String AUTHORITY = "org.thialfihar.android.apg.provider";
+    public static final String AUTHORITY = "org.apg.provider";
 
     private static final int PUBLIC_KEY_RING = 101;
     private static final int PUBLIC_KEY_RING_ID = 102;
diff --git a/org_apg/src/org/apg/provider/Database.java b/org_apg/src/org/apg/provider/Database.java
index 8b1aaa9e7..0d47cf3ce 100644
--- a/org_apg/src/org/apg/provider/Database.java
+++ b/org_apg/src/org/apg/provider/Database.java
@@ -33,7 +33,7 @@ public class Database extends SQLiteOpenHelper {
     private static final String DATABASE_NAME = "apg";
     private static final int DATABASE_VERSION = 2;
 
-    public static final String AUTHORITY = "org.thialfihar.android.apg.database";
+    public static final String AUTHORITY = "org.apg.database";
 
     public static HashMap<String, String> sKeyRingsProjection;
     public static HashMap<String, String> sKeysProjection;
diff --git a/org_apg/src/org/apg/util/ApgCon.java b/org_apg/src/org/apg/util/ApgCon.java
index 73ee66ad9..fb57f7eea 100644
--- a/org_apg/src/org/apg/util/ApgCon.java
+++ b/org_apg/src/org/apg/util/ApgCon.java
@@ -60,7 +60,7 @@ public class ApgCon {
 
     private final static String TAG = "ApgCon";
     private final static int API_VERSION = 2; // aidl api-version it expects
-    private final static String BLOB_URI = "content://org.thialfihar.android.apg.provider.apgserviceblobprovider";
+    private final static String BLOB_URI = "content://org.apg.provider.apgserviceblobprovider";
     
     /**
      * How many seconds to wait for a connection to AGP when connecting.
@@ -175,7 +175,7 @@ public class ApgCon {
         error tmpError = null;
         try {
             if( LOCAL_LOGV ) Log.v(TAG, "Searching for the right APG version");
-            ServiceInfo apgServices[] = ctx.getPackageManager().getPackageInfo("org.thialfihar.android.apg",
+            ServiceInfo apgServices[] = ctx.getPackageManager().getPackageInfo("org.apg",
                     PackageManager.GET_SERVICES | PackageManager.GET_META_DATA).services;
             if (apgServices == null) {
                 Log.e(TAG, "Could not fetch services");
@@ -184,7 +184,7 @@ public class ApgCon {
                 boolean apgServiceFound = false;
                 for (ServiceInfo inf : apgServices) {
                     if( LOCAL_LOGV ) Log.v(TAG, "Found service of APG: " + inf.name);
-                    if (inf.name.equals("org.thialfihar.android.apg.ApgService")) {
+                    if (inf.name.equals("org.apg.ApgService")) {
                         apgServiceFound = true;
                         if (inf.metaData == null) {
                             Log.w(TAG, "Could not determine ApgService API");