diff --git a/pgpainless-core/src/main/java/org/pgpainless/algorithm/EncryptionPurpose.java b/pgpainless-core/src/main/java/org/pgpainless/algorithm/EncryptionPurpose.java
index 1917d837..30aa9a0f 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/algorithm/EncryptionPurpose.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/algorithm/EncryptionPurpose.java
@@ -11,12 +11,12 @@ public enum EncryptionPurpose {
      */
     COMMUNICATIONS,
     /**
-     * The stream will encrypt data that is stored on disk.
+     * The stream will encrypt data at rest.
      * Eg. Encrypted backup...
      */
     STORAGE,
     /**
      * The stream will use keys with either flags to encrypt the data.
      */
-    STORAGE_AND_COMMUNICATIONS
+    ANY
 }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java
index 6251cfe9..ad7088f1 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java
@@ -316,7 +316,7 @@ public final class DecryptionStreamFactory {
                         break;
                     }
                     KeyRingInfo info = new KeyRingInfo(secretKeys);
-                    List<PGPPublicKey> encryptionSubkeys = info.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS);
+                    List<PGPPublicKey> encryptionSubkeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
                     for (PGPPublicKey pubkey : encryptionSubkeys) {
                         PGPSecretKey secretKey = secretKeys.getSecretKey(pubkey.getKeyID());
                         // Skip missing secret key
diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
index 65948168..9b51d931 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
@@ -71,7 +71,7 @@ public class EncryptionOptions {
      * or {@link org.pgpainless.algorithm.KeyFlag#ENCRYPT_STORAGE}.
      */
     public EncryptionOptions() {
-        this(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS);
+        this(EncryptionPurpose.ANY);
     }
 
     public EncryptionOptions(EncryptionPurpose purpose) {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
index 55b0fd8d..66c7f041 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/info/KeyRingInfo.java
@@ -777,7 +777,7 @@ public class KeyRingInfo {
                         encryptionKeys.add(subKey);
                     }
                     break;
-                case STORAGE_AND_COMMUNICATIONS:
+                case ANY:
                     if (keyFlags.contains(KeyFlag.ENCRYPT_COMMS) || keyFlags.contains(KeyFlag.ENCRYPT_STORAGE)) {
                         encryptionKeys.add(subKey);
                     }
diff --git a/pgpainless-core/src/test/java/investigations/InvestigateMultiSEIPMessageHandlingTest.java b/pgpainless-core/src/test/java/investigations/InvestigateMultiSEIPMessageHandlingTest.java
index 3e0f083b..3350203a 100644
--- a/pgpainless-core/src/test/java/investigations/InvestigateMultiSEIPMessageHandlingTest.java
+++ b/pgpainless-core/src/test/java/investigations/InvestigateMultiSEIPMessageHandlingTest.java
@@ -122,7 +122,7 @@ public class InvestigateMultiSEIPMessageHandlingTest {
     public void generateTestMessage() throws PGPException, IOException {
         PGPSecretKeyRing ring1 = PGPainless.readKeyRing().secretKeyRing(KEY1);
         KeyRingInfo info1 = PGPainless.inspectKeyRing(ring1);
-        PGPPublicKey cryptKey1 = info1.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS).get(0);
+        PGPPublicKey cryptKey1 = info1.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0);
         PGPSecretKey signKey1 = ring1.getSecretKey(info1.getSigningSubkeys().get(0).getKeyID());
         PGPSecretKeyRing ring2 = PGPainless.readKeyRing().secretKeyRing(KEY2);
         KeyRingInfo info2 = PGPainless.inspectKeyRing(ring2);
diff --git a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/DecryptHiddenRecipientMessage.java b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/DecryptHiddenRecipientMessage.java
index 69d695d5..3ebe5390 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/DecryptHiddenRecipientMessage.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/DecryptHiddenRecipientMessage.java
@@ -144,7 +144,7 @@ public class DecryptHiddenRecipientMessage {
         assertEquals(0, metadata.getRecipientKeyIds().size());
 
         KeyRingInfo info = new KeyRingInfo(secretKeys);
-        List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS);
+        List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
         assertEquals(1, encryptionKeys.size());
 
         assertEquals(new SubkeyIdentifier(secretKeys, encryptionKeys.get(0).getKeyID()), metadata.getDecryptionKey());
diff --git a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/MissingPassphraseForDecryptionTest.java b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/MissingPassphraseForDecryptionTest.java
index e7b36875..87ae2fed 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/MissingPassphraseForDecryptionTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/decryption_verification/MissingPassphraseForDecryptionTest.java
@@ -118,7 +118,7 @@ public class MissingPassphraseForDecryptionTest {
     @Test
     public void throwExceptionStrategy() throws PGPException, IOException {
         KeyRingInfo info = PGPainless.inspectKeyRing(secretKeys);
-        List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS);
+        List<PGPPublicKey> encryptionKeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
 
         SecretKeyPassphraseProvider callback = new SecretKeyPassphraseProvider() {
             @Nullable
diff --git a/pgpainless-core/src/test/java/org/pgpainless/example/GenerateKeys.java b/pgpainless-core/src/test/java/org/pgpainless/example/GenerateKeys.java
index 6a791e19..1ff39cdc 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/example/GenerateKeys.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/example/GenerateKeys.java
@@ -83,7 +83,7 @@ public class GenerateKeys {
         assertEquals(PublicKeyAlgorithm.EDDSA.getAlgorithmId(),
                 keyInfo.getSigningSubkeys().get(0).getAlgorithm());
         assertEquals(PublicKeyAlgorithm.ECDH.getAlgorithmId(),
-                keyInfo.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS).get(0).getAlgorithm());
+                keyInfo.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0).getAlgorithm());
     }
 
     /**
diff --git a/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java b/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
index 8a205c9c..c98d03ad 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/example/ModifyKeys.java
@@ -56,7 +56,7 @@ public class ModifyKeys {
 
         KeyRingInfo info = PGPainless.inspectKeyRing(secretKey);
         primaryKeyId = info.getKeyId();
-        encryptionSubkeyId = info.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS).get(0).getKeyID();
+        encryptionSubkeyId = info.getEncryptionSubkeys(EncryptionPurpose.ANY).get(0).getKeyID();
         signingSubkeyId = info.getSigningSubkeys().get(0).getKeyID();
     }
 
diff --git a/pgpainless-core/src/test/java/org/pgpainless/key/info/KeyRingInfoTest.java b/pgpainless-core/src/test/java/org/pgpainless/key/info/KeyRingInfoTest.java
index 4a344f98..c827b7dc 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/key/info/KeyRingInfoTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/key/info/KeyRingInfoTest.java
@@ -698,7 +698,7 @@ public class KeyRingInfoTest {
 
         assertFalse(info.isKeyValidlyBound(unboundKey.getKeyId()));
 
-        List<PGPPublicKey> encryptionSubkeys = info.getEncryptionSubkeys(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS);
+        List<PGPPublicKey> encryptionSubkeys = info.getEncryptionSubkeys(EncryptionPurpose.ANY);
         assertTrue(encryptionSubkeys.stream().map(OpenPgpV4Fingerprint::new).noneMatch(f -> f.equals(unboundKey)),
                 "Unbound subkey MUST NOT be considered a valid encryption subkey");
 
diff --git a/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestTwoSubkeysEncryption.java b/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestTwoSubkeysEncryption.java
index dac83a7b..4b715a76 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestTwoSubkeysEncryption.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/weird_keys/TestTwoSubkeysEncryption.java
@@ -51,7 +51,7 @@ public class TestTwoSubkeysEncryption {
         EncryptionStream encryptionStream = PGPainless.encryptAndOrSign()
                 .onOutputStream(out)
                 .withOptions(
-                        ProducerOptions.encrypt(new EncryptionOptions(EncryptionPurpose.STORAGE_AND_COMMUNICATIONS)
+                        ProducerOptions.encrypt(new EncryptionOptions(EncryptionPurpose.ANY)
                                 .addRecipient(publicKeys, EncryptionOptions.encryptToAllCapableSubkeys())
                         )
                         .setAsciiArmor(false)