diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index da83eaa19..efa92e760 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -383,29 +383,29 @@
         <!-- OpenPGP Remote Service API internal -->
 
         <activity
-            android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpServiceActivity"
+            android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpServiceActivity"
             android:exported="false"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:process=":crypto"
-            android:taskAffinity=":crypto" />
+            android:process=":openpgp_api"
+            android:taskAffinity=":openpgp_api" />
         <activity
-            android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity"
+            android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:exported="false"
             android:label="@string/title_api_registered_apps" />
         <activity
-            android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsActivity"
+            android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:exported="false" />
 
         <!-- OpenPGP Remote Service API -->
 
         <service
-            android:name="org.sufficientlysecure.keychain.remote_api.OpenPgpService"
+            android:name="org.sufficientlysecure.keychain.openpgp_api.OpenPgpService"
             android:enabled="true"
             android:exported="true"
-            android:process=":crypto" >
+            android:process=":openpgp_api" >
             <intent-filter>
                 <action android:name="org.openintents.crypto.ICryptoService" />
             </intent-filter>
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
index 40b8f54d1..8639fb13b 100644
--- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml
@@ -16,7 +16,7 @@
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
-        android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
+        android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
index c80d767ac..3c144939b 100644
--- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml
@@ -8,7 +8,7 @@
 
     <fragment
         android:id="@+id/api_app_settings_fragment"
-        android:name="org.sufficientlysecure.keychain.remote_api.AppSettingsFragment"
+        android:name="org.sufficientlysecure.keychain.openpgp_api.AppSettingsFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:layout="@layout/api_app_settings_fragment" />
diff --git a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
index e4657c107..bc696ada3 100644
--- a/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
+++ b/OpenPGP-Keychain/res/layout/api_apps_list_activity.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/crypto_consumers_list_fragment"
-        android:name="org.sufficientlysecure.keychain.remote_api.RegisteredAppsListFragment"
+        android:name="org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettings.java
similarity index 97%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettings.java
index eb2527455..982d5fe40 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettings.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettings.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsActivity.java
similarity index 98%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsActivity.java
index 2d3b23c1b..030a2bbb8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsActivity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsFragment.java
similarity index 99%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsFragment.java
index a29b63e97..ad463d316 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/AppSettingsFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/AppSettingsFragment.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import java.util.HashMap;
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpService.java
similarity index 99%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpService.java
index 7a44825bf..beefa56b4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpService.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpServiceActivity.java
similarity index 99%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpServiceActivity.java
index 3d3d046e1..775828124 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/OpenPgpServiceActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/OpenPgpServiceActivity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import java.util.ArrayList;
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsAdapter.java
similarity index 98%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsAdapter.java
index 39fca58f7..bddf3d4a8 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsAdapter.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListActivity.java
similarity index 97%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListActivity.java
index 352ffe918..d8d7c3d5c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListActivity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.MainActivity;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListFragment.java
similarity index 98%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListFragment.java
index 84234fb13..391b86d72 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/remote_api/RegisteredAppsListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/openpgp_api/RegisteredAppsListFragment.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.remote_api;
+package org.sufficientlysecure.keychain.openpgp_api;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.KeychainContract;
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 4e9a81908..cb43155ab 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -32,12 +32,12 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
 import org.sufficientlysecure.keychain.helper.PgpHelper;
 import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.openpgp_api.AppSettings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
-import org.sufficientlysecure.keychain.remote_api.AppSettings;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index 702d40519..e97f6b392 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.ui;
 
 import org.sufficientlysecure.keychain.Id;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.remote_api.RegisteredAppsListActivity;
+import org.sufficientlysecure.keychain.openpgp_api.RegisteredAppsListActivity;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;