diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
index aaa7abb2..1e932f0e 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditor.java
@@ -66,7 +66,7 @@ import org.pgpainless.key.util.RevocationAttributes;
 import org.pgpainless.key.util.SignatureUtils;
 import org.pgpainless.util.Passphrase;
 import org.pgpainless.util.SignatureSubpacketGeneratorUtil;
-import org.pgpainless.util.selection.userid.UserIdSelectionStrategy;
+import org.pgpainless.util.selection.userid.SelectUserId;
 
 public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
 
@@ -148,13 +148,13 @@ public class SecretKeyRingEditor implements SecretKeyRingEditorInterface {
     }
 
     @Override
-    public SecretKeyRingEditorInterface deleteUserIds(UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
+    public SecretKeyRingEditorInterface deleteUserIds(SelectUserId selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
         PGPPublicKey publicKey = secretKeyRing.getPublicKey();
         return deleteUserIds(publicKey.getKeyID(), selectionStrategy, secretKeyRingProtector);
     }
 
     @Override
-    public SecretKeyRingEditorInterface deleteUserIds(long keyId, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
+    public SecretKeyRingEditorInterface deleteUserIds(long keyId, SelectUserId selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
         List<PGPPublicKey> publicKeys = new ArrayList<>();
         Iterator<PGPPublicKey> publicKeyIterator = secretKeyRing.getPublicKeys();
         boolean foundKey = false;
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
index b31cafc8..fde7908f 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/modification/secretkeyring/SecretKeyRingEditorInterface.java
@@ -32,7 +32,7 @@ import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.key.util.RevocationAttributes;
 import org.pgpainless.key.util.UserId;
 import org.pgpainless.util.Passphrase;
-import org.pgpainless.util.selection.userid.UserIdSelectionStrategy;
+import org.pgpainless.util.selection.userid.SelectUserId;
 
 public interface SecretKeyRingEditorInterface {
 
@@ -77,16 +77,16 @@ public interface SecretKeyRingEditorInterface {
     }
 
     default SecretKeyRingEditorInterface deleteUserId(long keyId, String userId, SecretKeyRingProtector secretKeyRingProtector) {
-        return deleteUserIds(keyId, UserIdSelectionStrategy.exactMatch(userId), secretKeyRingProtector);
+        return deleteUserIds(keyId, SelectUserId.exactMatch(userId), secretKeyRingProtector);
     }
 
-    SecretKeyRingEditorInterface deleteUserIds(UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
+    SecretKeyRingEditorInterface deleteUserIds(SelectUserId selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
 
-    default SecretKeyRingEditorInterface deleteUserIds(OpenPgpV4Fingerprint fingerprint, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
+    default SecretKeyRingEditorInterface deleteUserIds(OpenPgpV4Fingerprint fingerprint, SelectUserId selectionStrategy, SecretKeyRingProtector secretKeyRingProtector) {
         return deleteUserIds(fingerprint.getKeyId(), selectionStrategy, secretKeyRingProtector);
     }
 
-    SecretKeyRingEditorInterface deleteUserIds(long keyId, UserIdSelectionStrategy selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
+    SecretKeyRingEditorInterface deleteUserIds(long keyId, SelectUserId selectionStrategy, SecretKeyRingProtector secretKeyRingProtector);
 
     /**
      * Add a subkey to the key ring.
diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/UserIdSelectionStrategy.java b/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
similarity index 73%
rename from pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/UserIdSelectionStrategy.java
rename to pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
index 20137b4f..4cf5f76b 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/UserIdSelectionStrategy.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.bouncycastle.openpgp.PGPKeyRing;
 import org.pgpainless.PGPainless;
 
-public abstract class UserIdSelectionStrategy {
+public abstract class SelectUserId {
 
     protected abstract boolean accept(String userId);
 
@@ -53,8 +53,8 @@ public abstract class UserIdSelectionStrategy {
         return null;
     }
 
-    public static UserIdSelectionStrategy containsSubstring(String query) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId containsSubstring(String query) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 return userId.contains(query);
@@ -62,8 +62,8 @@ public abstract class UserIdSelectionStrategy {
         };
     }
 
-    public static UserIdSelectionStrategy exactMatch(String query) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId exactMatch(String query) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 return userId.equals(query);
@@ -71,8 +71,8 @@ public abstract class UserIdSelectionStrategy {
         };
     }
 
-    public static UserIdSelectionStrategy startsWith(String substring) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId startsWith(String substring) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 return userId.startsWith(substring);
@@ -80,12 +80,12 @@ public abstract class UserIdSelectionStrategy {
         };
     }
 
-    public static UserIdSelectionStrategy containsEmailAddress(String email) {
+    public static SelectUserId containsEmailAddress(String email) {
         return containsSubstring(email.matches("^<.+>$") ? email : '<' + email + '>');
     }
 
-    public static UserIdSelectionStrategy validUserId(PGPKeyRing keyRing) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId validUserId(PGPKeyRing keyRing) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 return PGPainless.inspectKeyRing(keyRing).isUserIdValid(userId);
@@ -93,12 +93,12 @@ public abstract class UserIdSelectionStrategy {
         };
     }
 
-    public static UserIdSelectionStrategy and(UserIdSelectionStrategy... strategies) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId and(SelectUserId... strategies) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 boolean accept = true;
-                for (UserIdSelectionStrategy strategy : strategies) {
+                for (SelectUserId strategy : strategies) {
                     accept &= strategy.accept(userId);
                 }
                 return accept;
@@ -106,12 +106,12 @@ public abstract class UserIdSelectionStrategy {
         };
     }
 
-    public static UserIdSelectionStrategy or(UserIdSelectionStrategy... strategies) {
-        return new UserIdSelectionStrategy() {
+    public static SelectUserId or(SelectUserId... strategies) {
+        return new SelectUserId() {
             @Override
             protected boolean accept(String userId) {
                 boolean accept = false;
-                for (UserIdSelectionStrategy strategy : strategies) {
+                for (SelectUserId strategy : strategies) {
                     accept |= strategy.accept(userId);
                 }
                 return accept;