diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
index cc97e81a6..146c165d4 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/MessageMetadata.java
@@ -36,7 +36,7 @@ public MessageMetadata(@Nonnull Message message) {
     /**
      * Convert this {@link MessageMetadata} object into a legacy {@link OpenPgpMetadata} object.
      * This method is intended to be used for a transition period between the 1.3 / 1.4+ branches.
-     * TODO: Remove in 1.5.X
+     * TODO: Remove in 1.6.X
      *
      * @return converted {@link OpenPgpMetadata} object
      */
diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
index be9cf2b13..e2d5f1ca1 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMetadata.java
@@ -31,7 +31,7 @@
  * Legacy class containing metadata about an OpenPGP message.
  * It is advised to use {@link MessageMetadata} instead.
  *
- * TODO: Remove in 1.5.X
+ * TODO: Remove in 1.6.X
  */
 public class OpenPgpMetadata {