diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
index 806c281b..53eea2d0 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
@@ -21,10 +21,10 @@ import java.io.InputStream;
 public class DecryptionStream extends InputStream {
 
     private final InputStream inputStream;
-    private final PainlessResult.Builder resultBuilder;
+    private final OpenPgpMetadata.Builder resultBuilder;
     private boolean isClosed = false;
 
-    DecryptionStream(InputStream wrapped, PainlessResult.Builder resultBuilder) {
+    DecryptionStream(InputStream wrapped, OpenPgpMetadata.Builder resultBuilder) {
 
         if (wrapped == null) {
             throw new NullPointerException("Wrapped InputStream MUST NOT be null!");
@@ -45,7 +45,7 @@ public class DecryptionStream extends InputStream {
         this.isClosed = true;
     }
 
-    public PainlessResult getResult() {
+    public OpenPgpMetadata getResult() {
         if (!isClosed) {
             throw new IllegalStateException("DecryptionStream MUST be closed before the result can be accessed.");
         }
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 348f16ea..29fe55a6 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
@@ -61,7 +61,7 @@ public final class DecryptionStreamFactory {
     private final Set<PGPPublicKeyRing> verificationKeys = new HashSet<>();
     private final MissingPublicKeyCallback missingPublicKeyCallback;
 
-    private final PainlessResult.Builder resultBuilder = PainlessResult.getBuilder();
+    private final OpenPgpMetadata.Builder resultBuilder = OpenPgpMetadata.getBuilder();
     private final PGPContentVerifierBuilderProvider verifierBuilderProvider = new BcPGPContentVerifierBuilderProvider();
     private final KeyFingerPrintCalculator fingerCalc = new BcKeyFingerprintCalculator();
     private final Map<OpenPgpV4Fingerprint, PGPOnePassSignature> verifiableOnePassSignatures = new HashMap<>();
diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/PainlessResult.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
similarity index 87%
rename from pgpainless-core/src/main/java/org/pgpainless/decryption_verification/PainlessResult.java
rename to pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
index e765651e..7ac9b259 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/PainlessResult.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
@@ -25,7 +25,7 @@ import org.pgpainless.algorithm.CompressionAlgorithm;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 
-public class PainlessResult {
+public class OpenPgpMetadata {
 
     private final Set<Long> recipientKeyIds;
     private final OpenPgpV4Fingerprint decryptionFingerprint;
@@ -36,13 +36,13 @@ public class PainlessResult {
     private final CompressionAlgorithm compressionAlgorithm;
     private final boolean integrityProtected;
 
-    public PainlessResult(Set<Long> recipientKeyIds,
-                          OpenPgpV4Fingerprint decryptionFingerprint,
-                          SymmetricKeyAlgorithm symmetricKeyAlgorithm,
-                          CompressionAlgorithm algorithm,
-                          boolean integrityProtected,
-                          Set<Long> unverifiedSignatureKeyIds,
-                          Set<OpenPgpV4Fingerprint> verifiedSignaturesFingerprints) {
+    public OpenPgpMetadata(Set<Long> recipientKeyIds,
+                           OpenPgpV4Fingerprint decryptionFingerprint,
+                           SymmetricKeyAlgorithm symmetricKeyAlgorithm,
+                           CompressionAlgorithm algorithm,
+                           boolean integrityProtected,
+                           Set<Long> unverifiedSignatureKeyIds,
+                           Set<OpenPgpV4Fingerprint> verifiedSignaturesFingerprints) {
 
         this.recipientKeyIds = Collections.unmodifiableSet(recipientKeyIds);
         this.decryptionFingerprint = decryptionFingerprint;
@@ -152,8 +152,8 @@ public class PainlessResult {
             return this;
         }
 
-        public PainlessResult build() {
-            return new PainlessResult(recipientFingerprints, decryptionFingerprint, symmetricKeyAlgorithm, compressionAlgorithm, integrityProtected, unverifiedSignatureKeyIds, verifiedSignatureFingerprints);
+        public OpenPgpMetadata build() {
+            return new OpenPgpMetadata(recipientFingerprints, decryptionFingerprint, symmetricKeyAlgorithm, compressionAlgorithm, integrityProtected, unverifiedSignatureKeyIds, verifiedSignatureFingerprints);
         }
     }
 }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
index 231617b0..13077094 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
@@ -37,14 +37,14 @@ public class SignatureVerifyingInputStream extends FilterInputStream {
 
     private final PGPObjectFactory objectFactory;
     private final Map<OpenPgpV4Fingerprint, PGPOnePassSignature> onePassSignatures;
-    private final PainlessResult.Builder resultBuilder;
+    private final OpenPgpMetadata.Builder resultBuilder;
 
     private boolean validated = false;
 
     protected SignatureVerifyingInputStream(InputStream inputStream,
                                             PGPObjectFactory objectFactory,
                                             Map<OpenPgpV4Fingerprint, PGPOnePassSignature> onePassSignatures,
-                                            PainlessResult.Builder resultBuilder) {
+                                            OpenPgpMetadata.Builder resultBuilder) {
         super(inputStream);
         this.objectFactory = objectFactory;
         this.resultBuilder = resultBuilder;
diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
index c962d023..9ac947f5 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionStream.java
@@ -43,7 +43,7 @@ import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenera
 import org.pgpainless.algorithm.CompressionAlgorithm;
 import org.pgpainless.algorithm.HashAlgorithm;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
-import org.pgpainless.decryption_verification.PainlessResult;
+import org.pgpainless.decryption_verification.OpenPgpMetadata;
 
 /**
  * This class is based upon Jens Neuhalfen's Bouncy-GPG PGPEncryptingStream.
@@ -56,7 +56,7 @@ public final class EncryptionStream extends OutputStream {
 
     private static final int BUFFER_SIZE = 1 << 8;
 
-    private final PainlessResult result;
+    private final OpenPgpMetadata result;
 
     private List<PGPSignatureGenerator> signatureGenerators = new ArrayList<>();
     private boolean closed = false;
@@ -157,7 +157,7 @@ public final class EncryptionStream extends OutputStream {
         }
 
 
-        this.result = new PainlessResult(recipientKeyIds,
+        this.result = new OpenPgpMetadata(recipientKeyIds,
                 null, symmetricKeyAlgorithm,
                 compressionAlgorithm, true,
                 signingKeyIds, Collections.emptySet());
@@ -259,7 +259,7 @@ public final class EncryptionStream extends OutputStream {
         }
     }
 
-    public PainlessResult getResult() {
+    public OpenPgpMetadata getResult() {
         return result;
     }
 }
diff --git a/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java b/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
index b4db706f..f8c294d5 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/EncryptDecryptTest.java
@@ -40,7 +40,7 @@ import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
 import org.pgpainless.algorithm.SymmetricKeyAlgorithm;
 import org.pgpainless.decryption_verification.DecryptionStream;
-import org.pgpainless.decryption_verification.PainlessResult;
+import org.pgpainless.decryption_verification.OpenPgpMetadata;
 import org.pgpainless.encryption_signing.EncryptionStream;
 import org.pgpainless.key.collection.PGPKeyRing;
 import org.pgpainless.key.generation.KeySpec;
@@ -142,7 +142,7 @@ public class EncryptDecryptTest extends AbstractPGPainlessTest {
                 .signWith(keyDecryptor, senderSec)
                 .noArmor();
 
-        PainlessResult encryptionResult = encryptor.getResult();
+        OpenPgpMetadata encryptionResult = encryptor.getResult();
 
         assertFalse(encryptionResult.getAllSignatureKeyFingerprints().isEmpty());
         for (long keyId : encryptionResult.getAllSignatureKeyFingerprints()) {
@@ -180,7 +180,7 @@ public class EncryptDecryptTest extends AbstractPGPainlessTest {
         decryptor.close();
 
         assertTrue(Arrays.equals(secretMessage, decryptedSecretMessage.toByteArray()));
-        PainlessResult result = decryptor.getResult();
+        OpenPgpMetadata result = decryptor.getResult();
         assertTrue(result.containsVerifiedSignatureFrom(senderPub));
         assertTrue(result.isIntegrityProtected());
         assertTrue(result.isSigned());