diff --git a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
index c0d2a9fa5..e0c2eb1d6 100644
--- a/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
@@ -56,14 +56,16 @@ public class KeychainIntentHelper {
     /**
      * Select keys, without permission
      */
-    public static final String ACTION_SELECT_PUBLIC_KEYS = APG_INTENT_PREFIX + "SELECT_PUBLIC_KEYS";
-    public static final String ACTION_SELECT_SECRET_KEY = APG_INTENT_PREFIX + "SELECT_SECRET_KEY";
+    public static final String ACTION_SELECT_PUBLIC_KEYS = APG_INTENT_PREFIX
+            + "SELECT_PUBLIC_KEYRINGS";
+    public static final String ACTION_SELECT_SECRET_KEY = APG_INTENT_PREFIX
+            + "SELECT_SECRET_KEYRING";
 
     /**
      * Create key/edit key, without permission
      */
-    public static final String ACTION_CREATE_KEY = APG_INTENT_PREFIX + "CREATE_KEY";
-    public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEY";
+    public static final String ACTION_CREATE_KEY = APG_INTENT_PREFIX + "CREATE_KEYRING";
+    public static final String ACTION_EDIT_KEY = APG_INTENT_PREFIX + "EDIT_KEYRING";
 
     /**
      * Import actions
diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index f156f6d47..86b83a557 100644
--- a/OpenPGP-Keychain/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -138,10 +138,10 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEYRING" />
 
                 <!-- With permission ACCESS_API: -->
-                <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEYRING" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -153,7 +153,7 @@
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
             <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYS" />
+                <action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYRINGS" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -171,7 +171,7 @@
             android:label="@string/title_selectSignature"
             android:launchMode="singleTop" >
             <intent-filter>
-                <action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEYRING" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 73a1234c4..8c5bd6879 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -67,8 +67,8 @@ import java.util.Vector;
 public class EditKeyActivity extends SherlockFragmentActivity {
 
     // possible intent actions for this activity
-    public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEY";
-    public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEY";
+    public static final String ACTION_CREATE_KEY = Constants.INTENT_PREFIX + "CREATE_KEYRING";
+    public static final String ACTION_EDIT_KEY = Constants.INTENT_PREFIX + "EDIT_KEYRING";
 
     // possible extra keys
     public static final String EXTRA_USER_IDS = "userIds";
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
index fc1cfba17..d209662f7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
@@ -33,7 +33,7 @@ public class SelectPublicKeyActivity extends SherlockFragmentActivity {
 
     // Not used in sourcode, but listed in AndroidManifest!
     public static final String ACTION_SELECT_PUBLIC_KEYS = Constants.INTENT_PREFIX
-            + "SELECT_PUBLIC_KEYS";
+            + "SELECT_PUBLIC_KEYRINGS";
 
     public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "masterKeyIds";
 
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index 6f43cbabc..14ccb17c7 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
@@ -32,7 +32,7 @@ public class SelectSecretKeyActivity extends SherlockFragmentActivity {
 
     // Not used in sourcode, but listed in AndroidManifest!
     public static final String ACTION_SELECT_SECRET_KEY = Constants.INTENT_PREFIX
-            + "SELECT_SECRET_KEY";
+            + "SELECT_SECRET_KEYRING";
 
     public static final String RESULT_EXTRA_MASTER_KEY_ID = "masterKeyId";
     public static final String RESULT_EXTRA_USER_ID = "userId";
diff --git a/README.md b/README.md
index 8a47f9518..c32c5c3e4 100644
--- a/README.md
+++ b/README.md
@@ -84,9 +84,9 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
 * SHARE_KEYRING
 * SHARE_KEYRING_WITH_QR_CODE
 * SHARE_KEYRING_WITH_NFC
-* EDIT_KEY
-* SELECT_PUBLIC_KEYS
-* SELECT_SECRET_KEY
+* EDIT_KEYRING
+* SELECT_PUBLIC_KEYRINGS
+* SELECT_SECRET_KEYRING
 * ENCRYPT
 * ENCRYPT_FILE
 * DECRYPT
@@ -94,7 +94,7 @@ Android primitives to exchange data: Intent, Intent with return values, Send (al
 
 ### With permission ACCESS_API
 
-* CREATE_KEY
+* CREATE_KEYRING
 * ENCRYPT_AND_RETURN
 * ENCRYPT_STREAM_AND_RETURN
 * GENERATE_SIGNATURE_AND_RETURN