diff --git a/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookup.java b/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookup.java
index 960053a2..f35d7c86 100644
--- a/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookup.java
+++ b/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookup.java
@@ -22,7 +22,7 @@ public class DatabaseSubkeyLookup implements SubkeyLookup {
     }
 
     @Override
-    public Set<String> getCertificatesForSubkeyId(long subkeyId) throws IOException {
+    public Set<String> getCertificateFingerprintsForSubkeyId(long subkeyId) throws IOException {
         try {
             List<Entry> entries = dao.selectValues(subkeyId);
             Set<String> certificates = new HashSet<>();
diff --git a/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java b/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
index 1b80d037..b71337c6 100644
--- a/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
+++ b/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
@@ -38,25 +38,25 @@ public class SqliteSubkeyLookupTest {
         store("eb85bb5fa33a75e15e944e63f231550c4f47e38e", 123L, 234L);
         store("d1a66e1a23b182c9980f788cfbfcc82a015e7330", 234L);
 
-        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificatesForSubkeyId(123L));
+        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificateFingerprintsForSubkeyId(123L));
         assertEquals(
                 new HashSet<>(Arrays.asList("eb85bb5fa33a75e15e944e63f231550c4f47e38e", "d1a66e1a23b182c9980f788cfbfcc82a015e7330")),
-                lookup.getCertificatesForSubkeyId(234L));
+                lookup.getCertificateFingerprintsForSubkeyId(234L));
     }
 
     @Test
     public void getNonExistingSubkeyYieldsNull() throws IOException {
-        assertTrue(lookup.getCertificatesForSubkeyId(6666666).isEmpty());
+        assertTrue(lookup.getCertificateFingerprintsForSubkeyId(6666666).isEmpty());
     }
 
     @Test
     public void secondInstanceLookupTest() throws IOException, SQLException {
         store("eb85bb5fa33a75e15e944e63f231550c4f47e38e", 1337L);
-        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificatesForSubkeyId(1337));
+        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificateFingerprintsForSubkeyId(1337));
 
         // do the lookup using a second db instance on the same file
         DatabaseSubkeyLookup secondInstance = new DatabaseSubkeyLookup(SqliteSubkeyLookupDaoImpl.forDatabaseFile(databaseFile));
-        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), secondInstance.getCertificatesForSubkeyId(1337));
+        assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), secondInstance.getCertificateFingerprintsForSubkeyId(1337));
     }
 
     @Test
diff --git a/pgp-cert-d-java/src/main/java/pgp/cert_d/InMemorySubkeyLookup.java b/pgp-cert-d-java/src/main/java/pgp/cert_d/InMemorySubkeyLookup.java
index ec26fb61..1cd78627 100644
--- a/pgp-cert-d-java/src/main/java/pgp/cert_d/InMemorySubkeyLookup.java
+++ b/pgp-cert-d-java/src/main/java/pgp/cert_d/InMemorySubkeyLookup.java
@@ -18,7 +18,7 @@ public class InMemorySubkeyLookup implements SubkeyLookup {
     private static final Map<Long, Set<String>> subkeyMap = new HashMap<>();
 
     @Override
-    public Set<String> getCertificatesForSubkeyId(long subkeyId) {
+    public Set<String> getCertificateFingerprintsForSubkeyId(long subkeyId) {
         Set<String> identifiers = subkeyMap.get(subkeyId);
         if (identifiers == null) {
             return Collections.emptySet();
diff --git a/pgp-cert-d-java/src/test/java/pgp/cert_d/SubkeyLookupTest.java b/pgp-cert-d-java/src/test/java/pgp/cert_d/SubkeyLookupTest.java
index eab6e288..03ad9c8a 100644
--- a/pgp-cert-d-java/src/test/java/pgp/cert_d/SubkeyLookupTest.java
+++ b/pgp-cert-d-java/src/test/java/pgp/cert_d/SubkeyLookupTest.java
@@ -56,26 +56,26 @@ public class SubkeyLookupTest {
     public void testInsertGet(SubkeyLookup subject) throws IOException {
         // Initially all null
 
-        assertTrue(subject.getCertificatesForSubkeyId(123).isEmpty());
-        assertTrue(subject.getCertificatesForSubkeyId(1337).isEmpty());
-        assertTrue(subject.getCertificatesForSubkeyId(420).isEmpty());
+        assertTrue(subject.getCertificateFingerprintsForSubkeyId(123).isEmpty());
+        assertTrue(subject.getCertificateFingerprintsForSubkeyId(1337).isEmpty());
+        assertTrue(subject.getCertificateFingerprintsForSubkeyId(420).isEmpty());
 
         // Store one val, others still null
 
         subject.storeCertificateSubkeyIds("d1a66e1a23b182c9980f788cfbfcc82a015e7330", Collections.singletonList(123L));
 
-        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificatesForSubkeyId(123));
-        assertTrue(subject.getCertificatesForSubkeyId(1337).isEmpty());
-        assertTrue(subject.getCertificatesForSubkeyId(420).isEmpty());
+        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificateFingerprintsForSubkeyId(123));
+        assertTrue(subject.getCertificateFingerprintsForSubkeyId(1337).isEmpty());
+        assertTrue(subject.getCertificateFingerprintsForSubkeyId(420).isEmpty());
 
         // Store other val, first stays intact
 
         subject.storeCertificateSubkeyIds("d1a66e1a23b182c9980f788cfbfcc82a015e7330", Collections.singletonList(1337L));
         subject.storeCertificateSubkeyIds("d1a66e1a23b182c9980f788cfbfcc82a015e7330", Collections.singletonList(420L));
 
-        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificatesForSubkeyId(123));
-        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificatesForSubkeyId(1337));
-        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificatesForSubkeyId(420));
+        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificateFingerprintsForSubkeyId(123));
+        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificateFingerprintsForSubkeyId(1337));
+        assertEquals(Collections.singleton("d1a66e1a23b182c9980f788cfbfcc82a015e7330"), subject.getCertificateFingerprintsForSubkeyId(420));
 
         // add additional entry for subkey
 
@@ -83,6 +83,6 @@ public class SubkeyLookupTest {
 
         assertEquals(
                 new HashSet<>(Arrays.asList("eb85bb5fa33a75e15e944e63f231550c4f47e38e", "d1a66e1a23b182c9980f788cfbfcc82a015e7330")),
-                subject.getCertificatesForSubkeyId(123));
+                subject.getCertificateFingerprintsForSubkeyId(123));
     }
 }
diff --git a/pgp-certificate-store/src/main/java/pgp/certificate_store/AbstractCertificateStore.java b/pgp-certificate-store/src/main/java/pgp/certificate_store/AbstractCertificateStore.java
index b95ed5cd..3bd394e4 100644
--- a/pgp-certificate-store/src/main/java/pgp/certificate_store/AbstractCertificateStore.java
+++ b/pgp-certificate-store/src/main/java/pgp/certificate_store/AbstractCertificateStore.java
@@ -20,7 +20,7 @@ public abstract class AbstractCertificateStore implements CertificateStore {
 
     public Set<Certificate> getCertificatesBySubkeyId(long subkeyId)
             throws IOException {
-        Set<String> identifiers = getCertificatesForSubkeyId(subkeyId);
+        Set<String> identifiers = getCertificateFingerprintsForSubkeyId(subkeyId);
         if (identifiers.isEmpty()) {
             return Collections.emptySet();
         }
diff --git a/pgp-certificate-store/src/main/java/pgp/certificate_store/SubkeyLookup.java b/pgp-certificate-store/src/main/java/pgp/certificate_store/SubkeyLookup.java
index 917b8fe1..73e396b3 100644
--- a/pgp-certificate-store/src/main/java/pgp/certificate_store/SubkeyLookup.java
+++ b/pgp-certificate-store/src/main/java/pgp/certificate_store/SubkeyLookup.java
@@ -17,7 +17,7 @@ public interface SubkeyLookup {
      * @param subkeyId subkey id
      * @return fingerprint of the certificate
      */
-    Set<String> getCertificatesForSubkeyId(long subkeyId) throws IOException;
+    Set<String> getCertificateFingerprintsForSubkeyId(long subkeyId) throws IOException;
 
     /**
      * Record, which certificate the subkey-ids in the list belong to.
diff --git a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/SharedPGPCertificateDirectoryAdapter.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/SharedPGPCertificateDirectoryAdapter.java
index 5d40755e..e7b2d816 100644
--- a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/SharedPGPCertificateDirectoryAdapter.java
+++ b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/SharedPGPCertificateDirectoryAdapter.java
@@ -112,8 +112,8 @@ public class SharedPGPCertificateDirectoryAdapter
     }
 
     @Override
-    public Set<String> getCertificatesForSubkeyId(long subkeyId) throws IOException {
-        return subkeyLookup.getCertificatesForSubkeyId(subkeyId);
+    public Set<String> getCertificateFingerprintsForSubkeyId(long subkeyId) throws IOException {
+        return subkeyLookup.getCertificateFingerprintsForSubkeyId(subkeyId);
     }
 
     @Override
diff --git a/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryAdapterTest.java b/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryAdapterTest.java
index ede971a7..b82f1511 100644
--- a/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryAdapterTest.java
+++ b/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryAdapterTest.java
@@ -84,7 +84,7 @@ public class SharedPGPCertificateDirectoryAdapterTest {
         Set<Long> subkeys = certificate.getSubkeyIds();
         assertEquals(expectedSubkeys, subkeys);
         for (long subkey : subkeys) {
-            assertEquals(Collections.singleton(fingerprint), store.getCertificatesForSubkeyId(subkey));
+            assertEquals(Collections.singleton(fingerprint), store.getCertificateFingerprintsForSubkeyId(subkey));
         }
 
         Certificate retrieved = store.getCertificate(fingerprint);
@@ -108,7 +108,7 @@ public class SharedPGPCertificateDirectoryAdapterTest {
         Set<Long> subkeys = certificate.getSubkeyIds();
         assertEquals(3, subkeys.size());
         for (long subkey : subkeys) {
-            assertEquals(Collections.singleton(fingerprint), store.getCertificatesForSubkeyId(subkey));
+            assertEquals(Collections.singleton(fingerprint), store.getCertificateFingerprintsForSubkeyId(subkey));
         }
 
         Certificate retrieved = store.getCertificate(fingerprint);