diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 0b8ed515e..7796f4446 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -478,7 +478,7 @@
                 <action android:name="org.openintents.crypto.ICryptoService" />
 
                 <!-- Can only be used from OpenPGP Keychain (internal): -->
-                <action android:name="org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity" />
+                <action android:name="org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback" />
             </intent-filter>
 
             <meta-data
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
index 10eb94c7f..3748ef521 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoService.java
@@ -60,7 +60,7 @@ public class CryptoService extends Service {
 
     // RemoteCallbackList<IInterface>
 
-    public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.ICryptoServiceActivity";
+    public static final String ACTION_SERVICE_ACTIVITY = "org.sufficientlysecure.keychain.crypto_provider.IServiceActivityCallback";
 
     @Override
     public void onCreate() {
@@ -123,8 +123,8 @@ public class CryptoService extends Service {
 
                 // start passphrase dialog
                 Bundle extras = new Bundle();
-                extras.putLong(CryptoActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
-                pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_CACHE_PASSPHRASE, extras);
+                extras.putLong(ServiceActivity.EXTRA_SECRET_KEY_ID, secretKeyId);
+                pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_CACHE_PASSPHRASE, extras);
             }
 
             // if (signedOnly) {
@@ -214,7 +214,7 @@ public class CryptoService extends Service {
 
     };
 
-    private final ICryptoServiceActivity.Stub mBinderServiceActivity = new ICryptoServiceActivity.Stub() {
+    private final IServiceActivityCallback.Stub mBinderServiceActivity = new IServiceActivityCallback.Stub() {
 
         @Override
         public void register(boolean success, String packageName) throws RemoteException {
@@ -249,7 +249,7 @@ public class CryptoService extends Service {
             Log.d(Constants.TAG, "Enqueued runnable…");
         } else {
             Log.e(Constants.TAG, "Not allowed to use service! Starting register with activity!");
-            pauseQueueAndStartCryptoActivity(CryptoActivity.ACTION_REGISTER, null);
+            pauseQueueAndStartServiceActivity(ServiceActivity.ACTION_REGISTER, null);
             mThreadPool.execute(r);
 
             Log.d(Constants.TAG, "Enqueued runnable…");
@@ -286,11 +286,11 @@ public class CryptoService extends Service {
         return false;
     }
 
-    private void pauseQueueAndStartCryptoActivity(String action, Bundle extras) {
+    private void pauseQueueAndStartServiceActivity(String action, Bundle extras) {
         mThreadPool.pause();
 
         Log.d(Constants.TAG, "starting activity...");
-        Intent intent = new Intent(getBaseContext(), CryptoActivity.class);
+        Intent intent = new Intent(getBaseContext(), ServiceActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         // intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         // intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
similarity index 94%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
index 51586cae6..61a8da06c 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ICryptoServiceActivity.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/IServiceActivityCallback.aidl
@@ -17,12 +17,12 @@
 package org.sufficientlysecure.keychain.crypto_provider;
 
 
-interface ICryptoServiceActivity {
-       
+interface IServiceActivityCallback {
+    
     
     oneway void register(in boolean success, in String packageName);
     
     oneway void cachePassphrase(in boolean success, in String passphrase);
-   
+    
     
 }
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
similarity index 97%
rename from OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
rename to OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
index 7ffc42022..9f68aab97 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/CryptoActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/crypto_provider/ServiceActivity.java
@@ -37,7 +37,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-public class CryptoActivity extends SherlockFragmentActivity {
+public class ServiceActivity extends SherlockFragmentActivity {
 
     public static final String ACTION_REGISTER = "org.sufficientlysecure.keychain.REGISTER";
     public static final String ACTION_CACHE_PASSPHRASE = "org.sufficientlysecure.keychain.CRYPTO_CACHE_PASSPHRASE";
@@ -45,12 +45,12 @@ public class CryptoActivity extends SherlockFragmentActivity {
     public static final String EXTRA_SECRET_KEY_ID = "secretKeyId";
     public static final String EXTRA_PACKAGE_NAME = "packageName";
 
-    private ICryptoServiceActivity mService;
+    private IServiceActivityCallback mService;
     private boolean mServiceBound;
 
     private ServiceConnection mServiceActivityConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName name, IBinder service) {
-            mService = ICryptoServiceActivity.Stub.asInterface(service);
+            mService = IServiceActivityCallback.Stub.asInterface(service);
             Log.d(Constants.TAG, "connected to ICryptoServiceActivity");
             mServiceBound = true;
         }