diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DecryptImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DecryptImpl.kt
index f6a9fb1d..de2b2b3c 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DecryptImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/DecryptImpl.kt
@@ -92,7 +92,7 @@ class DecryptImpl : Decrypt {
     }
 
     override fun verifyWithCert(cert: InputStream): Decrypt = apply {
-        KeyReader.readPublicKeys(cert, true)?.let { consumerOptions.addVerificationCerts(it) }
+        KeyReader.readPublicKeys(cert, true).let { consumerOptions.addVerificationCerts(it) }
     }
 
     override fun withKey(key: InputStream): Decrypt = apply {
@@ -107,10 +107,10 @@ class DecryptImpl : Decrypt {
     }
 
     override fun withPassword(password: String): Decrypt = apply {
-        consumerOptions.addDecryptionPassphrase(Passphrase.fromPassword(password))
+        consumerOptions.addMessagePassphrase(Passphrase.fromPassword(password))
         password.trimEnd().let {
             if (it != password) {
-                consumerOptions.addDecryptionPassphrase(Passphrase.fromPassword(it))
+                consumerOptions.addMessagePassphrase(Passphrase.fromPassword(it))
             }
         }
     }
diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/EncryptImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/EncryptImpl.kt
index 83d60aa5..b227561e 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/EncryptImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/EncryptImpl.kt
@@ -136,7 +136,7 @@ class EncryptImpl : Encrypt {
     }
 
     override fun withPassword(password: String): Encrypt = apply {
-        encryptionOptions.addPassphrase(Passphrase.fromPassword(password))
+        encryptionOptions.addMessagePassphrase(Passphrase.fromPassword(password))
     }
 
     private fun modeToStreamEncoding(mode: EncryptAs): StreamEncoding {
diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/InlineDetachImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/InlineDetachImpl.kt
index 82414a96..88ca8c54 100644
--- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/InlineDetachImpl.kt
+++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/InlineDetachImpl.kt
@@ -34,7 +34,7 @@ class InlineDetachImpl : InlineDetach {
 
             private val sigOut = ByteArrayOutputStream()
 
-            override fun writeTo(messageOutputStream: OutputStream): Signatures {
+            override fun writeTo(outputStream: OutputStream): Signatures {
                 var pgpIn = OpenPgpInputStream(messageInputStream)
                 if (pgpIn.isNonOpenPgp) {
                     throw SOPGPException.BadData("Data appears to be non-OpenPGP.")
@@ -50,7 +50,7 @@ class InlineDetachImpl : InlineDetach {
                         try {
                             signatures =
                                 ClearsignedMessageUtil.detachSignaturesFromInbandClearsignedMessage(
-                                    armorIn, messageOutputStream)
+                                    armorIn, outputStream)
                             if (signatures.isEmpty) {
                                 throw SOPGPException.BadData(
                                     "Data did not contain OpenPGP signatures.")
@@ -86,7 +86,7 @@ class InlineDetachImpl : InlineDetach {
                         if (next is PGPLiteralData) {
                             // Write out contents of Literal Data packet
                             val literalIn = (next as PGPLiteralData).dataStream
-                            Streams.pipeAll(literalIn, messageOutputStream)
+                            Streams.pipeAll(literalIn, outputStream)
                             literalIn.close()
                             continue
                         }