diff --git a/pgpainless-core/src/main/java/org/pgpainless/authentication/CertificateAuthority.java b/pgpainless-core/src/main/java/org/pgpainless/authentication/CertificateAuthority.java
index 468de022..36bf9e5f 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/authentication/CertificateAuthority.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/authentication/CertificateAuthority.java
@@ -33,11 +33,11 @@ public interface CertificateAuthority {
      *                    60 = partially authenticated...)
      * @return information about the authenticity of the binding
      */
-    CertificateAuthenticity authenticate(@Nonnull OpenPgpFingerprint fingerprint,
-                                         @Nonnull String userId,
-                                         boolean email,
-                                         @Nonnull Date referenceTime,
-                                         int targetAmount);
+    CertificateAuthenticity authenticateBinding(@Nonnull OpenPgpFingerprint fingerprint,
+                                                @Nonnull String userId,
+                                                boolean email,
+                                                @Nonnull Date referenceTime,
+                                                int targetAmount);
 
     /**
      * Lookup certificates, which carry a trustworthy binding to the given userId.
@@ -50,10 +50,10 @@ public interface CertificateAuthority {
      *                     60 = partially authenticated...)
      * @return list of identified bindings
      */
-    List<CertificateAuthenticity> lookup(@Nonnull String userId,
-                                         boolean email,
-                                         @Nonnull Date referenceTime,
-                                         int targetAmount);
+    List<CertificateAuthenticity> lookupByUserId(@Nonnull String userId,
+                                                 boolean email,
+                                                 @Nonnull Date referenceTime,
+                                                 int targetAmount);
 
     /**
      * Identify trustworthy bindings for a certificate.
@@ -65,7 +65,7 @@ public interface CertificateAuthority {
      *                     60 = partially authenticated...)
      * @return list of identified bindings
      */
-    List<CertificateAuthenticity> identify(@Nonnull OpenPgpFingerprint fingerprint,
-                                           @Nonnull Date referenceTime,
-                                           int targetAmount);
+    List<CertificateAuthenticity> identifyByFingerprint(@Nonnull OpenPgpFingerprint fingerprint,
+                                                        @Nonnull Date referenceTime,
+                                                        int targetAmount);
 }
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 cbb6bbd9..b3293142 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
@@ -127,7 +127,7 @@ public class EncryptionOptions {
      * @return encryption options
      */
     public EncryptionOptions addAuthenticatableRecipients(String userId, boolean email, CertificateAuthority authority, int targetAmount) {
-        List<CertificateAuthenticity> identifiedCertificates = authority.lookup(userId, email, new Date(), targetAmount);
+        List<CertificateAuthenticity> identifiedCertificates = authority.lookupByUserId(userId, email, new Date(), targetAmount);
         boolean foundAcceptable = false;
         for (CertificateAuthenticity candidate : identifiedCertificates) {
             if (candidate.isAuthenticated()) {