Correct class name to reflect actual cipher name order

No functional changes, just bugged me to have used the wrong order.

5 files changed, 8 insertions, 8 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java b/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java
index 16bd82e2af3..b59e7cff6b4 100644
--- a/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java
+++ b/security-utils/src/main/java/com/yahoo/security/SharedKeyGenerator.java
@@ -46,7 +46,7 @@ public class SharedKeyGenerator {
     private static final byte[] EMPTY_BYTES           = new byte[0];
     private static final SecureRandom SHARED_CSPRNG   = new SecureRandom();
     // Since the HPKE ciphersuite is not provided in the token, we must be very explicit about what it always is
-    private static final Ciphersuite HPKE_CIPHERSUITE = Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aesGcm128());
+    private static final Ciphersuite HPKE_CIPHERSUITE = Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aes128Gcm());
     private static final Hpke HPKE = Hpke.of(HPKE_CIPHERSUITE);
 
     private static SecretKey generateRandomSecretAesKey() {
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java b/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
index 48662d97bb3..d105dd534f0 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Aead.java
@@ -35,8 +35,8 @@ public interface Aead {
     /** Predefined AEAD ID, as given in RFC 9180 section 7.3 */
     short aeadId();
 
-    static Aead aesGcm128() {
-        return AesGcm128.getInstance();
+    static Aead aes128Gcm() {
+        return Aes128Gcm.getInstance();
     }
 
 }
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/AesGcm128.java b/security-utils/src/main/java/com/yahoo/security/hpke/Aes128Gcm.java
index 9ccc7d51de9..9283c2b1657 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/AesGcm128.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Aes128Gcm.java
@@ -16,13 +16,13 @@ import java.security.NoSuchAlgorithmException;
  *
  * @author vekterli
  */
-final class AesGcm128 implements Aead {
+final class Aes128Gcm implements Aead {
 
     private static final String AEAD_CIPHER_SPEC = "AES/GCM/NoPadding";
 
-    private static final AesGcm128 INSTANCE = new AesGcm128();
+    private static final Aes128Gcm INSTANCE = new Aes128Gcm();
 
-    public static AesGcm128 getInstance() { return INSTANCE; }
+    public static Aes128Gcm getInstance() { return INSTANCE; }
 
     /**
      * @param key Symmetric key bytes for encryption/decryption
diff --git a/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java b/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
index f18753c810e..a2b3ebec9a3 100644
--- a/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
+++ b/security-utils/src/main/java/com/yahoo/security/hpke/Ciphersuite.java
@@ -22,7 +22,7 @@ public record Ciphersuite(Kem kem, Kdf kdf, Aead aead) {
      * Returns a Ciphersuite of DHKEM(X25519, HKDF-SHA256), HKDF-SHA256, AES-128-GCM
      */
     public static Ciphersuite defaultSuite() {
-        return Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aesGcm128());
+        return Ciphersuite.of(Kem.dHKemX25519HkdfSha256(), Kdf.hkdfSha256(), Aead.aes128Gcm());
     }
 
 }
diff --git a/security-utils/src/test/java/com/yahoo/security/HpkeTest.java b/security-utils/src/test/java/com/yahoo/security/HpkeTest.java
index 4455eade7cd..0d5a4d53e2a 100644
--- a/security-utils/src/test/java/com/yahoo/security/HpkeTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/HpkeTest.java
@@ -61,7 +61,7 @@ public class HpkeTest {
         var kpR     = receiverRrfc9180TestVectorKeyPair();
 
         var kem = Kem.dHKemX25519HkdfSha256(new Kem.UnsafeDeterminsticKeyPairOnlyUsedByTesting(ephemeralRrfc9180TestVectorKeyPair()));
-        var ciphersuite = Ciphersuite.of(kem, Kdf.hkdfSha256(), Aead.aesGcm128());
+        var ciphersuite = Ciphersuite.of(kem, Kdf.hkdfSha256(), Aead.aes128Gcm());
 
         var hpke = Hpke.of(ciphersuite);
         var s = hpke.sealBase(pk(kpR), info, aad, pt);