diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/CertificationSubpackets.java b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/CertificationSubpackets.java
index 59356bba..24614882 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/CertificationSubpackets.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/CertificationSubpackets.java
@@ -6,7 +6,7 @@ package org.pgpainless.signature.subpackets;
 
 public interface CertificationSubpackets extends BaseSignatureSubpackets {
 
-    interface Callback extends SignatureSubpacketCallback<BaseSignatureSubpackets> {
+    interface Callback extends SignatureSubpacketCallback<CertificationSubpackets> {
 
     }
 }
diff --git a/pgpainless-core/src/test/java/org/pgpainless/signature/builder/ThirdPartyCertificationSignatureBuilderTest.java b/pgpainless-core/src/test/java/org/pgpainless/signature/builder/ThirdPartyCertificationSignatureBuilderTest.java
index 89732991..bfc83df4 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/signature/builder/ThirdPartyCertificationSignatureBuilderTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/signature/builder/ThirdPartyCertificationSignatureBuilderTest.java
@@ -13,7 +13,6 @@ import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.SignatureType;
 import org.pgpainless.implementation.ImplementationFactory;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
-import org.pgpainless.signature.subpackets.BaseSignatureSubpackets;
 import org.pgpainless.signature.subpackets.CertificationSubpackets;
 import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil;
 
@@ -53,7 +52,7 @@ public class ThirdPartyCertificationSignatureBuilderTest {
 
         signatureBuilder.applyCallback(new CertificationSubpackets.Callback() {
             @Override
-            public void modifyHashedSubpackets(BaseSignatureSubpackets hashedSubpackets) {
+            public void modifyHashedSubpackets(CertificationSubpackets hashedSubpackets) {
                 hashedSubpackets.setExportable(true, false);
             }
         });