diff --git a/pgpainless-core/src/main/java/org/pgpainless/algorithm/Feature.java b/pgpainless-core/src/main/java/org/pgpainless/algorithm/Feature.java
index a0fc2974..231045a7 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/algorithm/Feature.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/algorithm/Feature.java
@@ -41,7 +41,7 @@ public enum Feature {
      * @see <a href="https://openpgp-wg.gitlab.io/rfc4880bis/#name-aead-encrypted-data-packet-">
      *     AEAD Encrypted Data Packet</a>
      */
-    AEAD_ENCRYPTED_DATA(Features.FEATURE_AEAD_ENCRYPTED_DATA),
+    GNUGP_AEAD_ENCRYPTED_DATA(Features.FEATURE_AEAD_ENCRYPTED_DATA),
 
     /**
      * If a key announces this feature, it is a version 5 public key.
@@ -56,7 +56,7 @@ public enum Feature {
      * @see <a href="https://openpgp-wg.gitlab.io/rfc4880bis/#name-public-key-packet-formats">
      *     Public-Key Packet Formats</a>
      */
-    VERSION_5_PUBLIC_KEY(Features.FEATURE_VERSION_5_PUBLIC_KEY),
+    GNUPG_VERSION_5_PUBLIC_KEY(Features.FEATURE_VERSION_5_PUBLIC_KEY),
 
     /**
      * Support for Symmetrically Encrypted Integrity Protected Data packet version 2.
diff --git a/pgpainless-core/src/test/java/org/pgpainless/signature/SignatureSubpacketsUtilTest.java b/pgpainless-core/src/test/java/org/pgpainless/signature/SignatureSubpacketsUtilTest.java
index 5b93415e..70cec3a5 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/signature/SignatureSubpacketsUtilTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/signature/SignatureSubpacketsUtilTest.java
@@ -140,7 +140,7 @@ public class SignatureSubpacketsUtilTest {
 
         PGPSignatureGenerator generator = getSignatureGenerator(certKey, SignatureType.CASUAL_CERTIFICATION);
         PGPSignatureSubpacketGenerator hashed = new PGPSignatureSubpacketGenerator();
-        hashed.setFeature(true, Feature.toBitmask(Feature.MODIFICATION_DETECTION, Feature.AEAD_ENCRYPTED_DATA));
+        hashed.setFeature(true, Feature.toBitmask(Feature.MODIFICATION_DETECTION, Feature.GNUGP_AEAD_ENCRYPTED_DATA));
         generator.setHashedSubpackets(hashed.generate());
 
         PGPSignature signature = generator.generateCertification(secretKeys.getPublicKey());
@@ -148,8 +148,8 @@ public class SignatureSubpacketsUtilTest {
         assertNotNull(featureSet);
         assertEquals(2, featureSet.size());
         assertTrue(featureSet.contains(Feature.MODIFICATION_DETECTION));
-        assertTrue(featureSet.contains(Feature.AEAD_ENCRYPTED_DATA));
-        assertFalse(featureSet.contains(Feature.VERSION_5_PUBLIC_KEY));
+        assertTrue(featureSet.contains(Feature.GNUGP_AEAD_ENCRYPTED_DATA));
+        assertFalse(featureSet.contains(Feature.GNUPG_VERSION_5_PUBLIC_KEY));
     }
 
     @Test
diff --git a/pgpainless-core/src/test/java/org/pgpainless/signature/subpackets/SignatureSubpacketsTest.java b/pgpainless-core/src/test/java/org/pgpainless/signature/subpackets/SignatureSubpacketsTest.java
index 3c2eda91..bb0e1b6b 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/signature/subpackets/SignatureSubpacketsTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/signature/subpackets/SignatureSubpacketsTest.java
@@ -388,7 +388,7 @@ public class SignatureSubpacketsTest {
 
     @Test
     public void testSetFeatures() {
-        wrapper.setFeatures(Feature.MODIFICATION_DETECTION, Feature.AEAD_ENCRYPTED_DATA);
+        wrapper.setFeatures(Feature.MODIFICATION_DETECTION, Feature.GNUGP_AEAD_ENCRYPTED_DATA);
         PGPSignatureSubpacketVector vector = SignatureSubpacketsHelper.toVector(wrapper);
 
         Features features = vector.getFeatures();
@@ -476,7 +476,7 @@ public class SignatureSubpacketsTest {
         subpackets.setKeyFlags(true, KeyFlag.toBitmask(KeyFlag.SIGN_DATA, KeyFlag.CERTIFY_OTHER));
         subpackets.addSignerUserID(false, "alice@test.test");
         subpackets.setRevocationReason(true, RevocationAttributes.Reason.KEY_RETIRED.code(), "Key was retired.");
-        subpackets.setFeature(true, Feature.toBitmask(Feature.MODIFICATION_DETECTION, Feature.AEAD_ENCRYPTED_DATA));
+        subpackets.setFeature(true, Feature.toBitmask(Feature.MODIFICATION_DETECTION, Feature.GNUGP_AEAD_ENCRYPTED_DATA));
         byte[] hash = new byte[128];
         new Random().nextBytes(hash);
         subpackets.setSignatureTarget(false, publicKeys.getPublicKey().getAlgorithm(), HashAlgorithm.SHA512.getAlgorithmId(), hash);