diff --git a/src/java.base/share/classes/sun/security/util/KeyChoices.java b/src/java.base/share/classes/sun/security/util/KeyChoices.java
index 6239591ccfe..da3c611750e 100644
--- a/src/java.base/share/classes/sun/security/util/KeyChoices.java
+++ b/src/java.base/share/classes/sun/security/util/KeyChoices.java
@@ -43,7 +43,7 @@ import java.util.function.BiFunction;
  *           }
  *       }
  * </pre>
- * This class supports reading, writing, and convert between them.
+ * This class supports reading, writing, and converting between them.
  * <p>
  * Current code follows draft-ietf-lamps-kyber-certificates-11 and RFC 9881.
  */
diff --git a/test/jdk/sun/security/provider/named/NamedEdDSA.java b/test/jdk/sun/security/provider/named/NamedEdDSA.java
index be771a9337b..30df8b22b31 100644
--- a/test/jdk/sun/security/provider/named/NamedEdDSA.java
+++ b/test/jdk/sun/security/provider/named/NamedEdDSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8340327 8347938 8347941
+ * @bug 8340327 8347938
  * @modules java.base/sun.security.ec.ed
  *          java.base/sun.security.ec.point
  *          java.base/sun.security.jca
diff --git a/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java b/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
index 9129a050c9a..e58809fcb69 100644
--- a/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
+++ b/test/jdk/sun/security/provider/named/NamedKeyFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8340327 8347938 8347941
+ * @bug 8340327 8347938
  * @modules java.base/sun.security.x509
  *          java.base/sun.security.pkcs
  *          java.base/sun.security.provider
diff --git a/test/jdk/sun/security/provider/named/NamedKeys.java b/test/jdk/sun/security/provider/named/NamedKeys.java
index c6204902ec4..e46cd981c70 100644
--- a/test/jdk/sun/security/provider/named/NamedKeys.java
+++ b/test/jdk/sun/security/provider/named/NamedKeys.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8347938 8347941
+ * @bug 8347938
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.x509
  * @library /test/lib
diff --git a/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java b/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
index baf3aeb0116..25060d0b74e 100644
--- a/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
+++ b/test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8347938 8347941
+ * @bug 8347938
  * @library /test/lib
  * @summary ensure ML-KEM and ML-DSA encodings consistent with
  *      draft-ietf-lamps-kyber-certificates-11 and RFC 9881
diff --git a/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java b/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java
index e1f909e022f..7d9a31b4e25 100644
--- a/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java
+++ b/test/jdk/sun/security/provider/pqc/SeedOrExpanded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8347938 8347941
+ * @bug 8347938
  * @library /test/lib
  * @modules java.base/com.sun.crypto.provider
  *          java.base/sun.security.provider