diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index f7fa0dbe96b..48ffeea5289 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -1247,7 +1247,7 @@ public final class Class<T> implements java.io.Serializable,
      * @return the fully qualified package name
      *
      * @since 9
-     * @jls 6.7 Fully Qualified Names
+     * @jls 6.7 Fully Qualified Names and Canonical Names
      */
     public String getPackageName() {
         String pn = this.packageName;
@@ -1460,7 +1460,7 @@ public final class Class<T> implements java.io.Serializable,
      * programming language and JVM modeling in core reflection</a>
      * @since 1.1
      * @jls 8.1.1 Class Modifiers
-     * @jls 9.1.1. Interface Modifiers
+     * @jls 9.1.1 Interface Modifiers
      * @jvms 4.1 The {@code ClassFile} Structure
      */
     @IntrinsicCandidate
@@ -1994,7 +1994,7 @@ public final class Class<T> implements java.io.Serializable,
      *
      * @return {@code true} if and only if this class is a local class.
      * @since 1.5
-     * @jls 14.3 Local Class Declarations
+     * @jls 14.3 Local Class and Interface Declarations
      */
     public boolean isLocalClass() {
         return isLocalOrAnonymousClass() &&
@@ -2007,7 +2007,7 @@ public final class Class<T> implements java.io.Serializable,
      *
      * @return {@code true} if and only if this class is a member class.
      * @since 1.5
-     * @jls 8.5 Member Type Declarations
+     * @jls 8.5 Member Class and Interface Declarations
      */
     public boolean isMemberClass() {
         return !isLocalOrAnonymousClass() && getDeclaringClass0() != null;
@@ -2544,7 +2544,7 @@ public final class Class<T> implements java.io.Serializable,
      *         </ul>
      *
      * @since 1.1
-     * @jls 8.5 Member Type Declarations
+     * @jls 8.5 Member Class and Interface Declarations
      */
     @CallerSensitive
     public Class<?>[] getDeclaredClasses() throws SecurityException {
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index 99056c353eb..fafa8895ee6 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2019, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -223,7 +223,7 @@ import sun.security.util.SecurityConstants;
  * or a fully qualified name as defined by
  * <cite>The Java Language Specification</cite>.
  *
- * @jls 6.7 Fully Qualified Names
+ * @jls 6.7 Fully Qualified Names and Canonical Names
  * @jls 13.1 The Form of a Binary
  * @see      #resolveClass(Class)
  * @since 1.0
diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
index 5f4c0b3f40f..9b11964d9e6 100644
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -344,8 +344,8 @@ import jdk.internal.vm.annotation.IntrinsicCandidate;
  * 754 floating-point arithmetic follows a principled design and its
  * behavior is predictable on the Java platform.
  *
- * @jls 4.2.3 Floating-Point Types, Formats, and Values
- * @jls 4.2.4. Floating-Point Operations
+ * @jls 4.2.3 Floating-Point Types and Values
+ * @jls 4.2.4 Floating-Point Operations
  * @jls 15.21.1 Numerical Equality Operators == and !=
  * @jls 15.20.1 Numerical Comparison Operators {@code <}, {@code <=}, {@code >}, and {@code >=}
  *
diff --git a/src/java.base/share/classes/java/lang/Record.java b/src/java.base/share/classes/java/lang/Record.java
index dba72c6ebfb..808bc7cc9cd 100644
--- a/src/java.base/share/classes/java/lang/Record.java
+++ b/src/java.base/share/classes/java/lang/Record.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, 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
@@ -84,7 +84,7 @@ package java.lang;
  * See {@link Class#isRecord()} and {@link Class#getRecordComponents()} for more details.
  *
  * @spec serialization/index.html Java Object Serialization Specification
- * @jls 8.10 Record Types
+ * @jls 8.10 Record Classes
  * @since 16
  */
 public abstract class Record {
diff --git a/src/java.base/share/classes/java/lang/StackWalker.java b/src/java.base/share/classes/java/lang/StackWalker.java
index aab9c6c28d8..8a39c465c2b 100644
--- a/src/java.base/share/classes/java/lang/StackWalker.java
+++ b/src/java.base/share/classes/java/lang/StackWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2024, 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
@@ -170,7 +170,7 @@ public final class StackWalker {
          *
          * @see MethodType#fromMethodDescriptorString(String, ClassLoader)
          * @see MethodType#toMethodDescriptorString()
-         * @jvms 4.3.3 Method Descriptor
+         * @jvms 4.3.3 Method Descriptors
          *
          * @since 10
          */
diff --git a/src/java.base/share/classes/java/lang/constant/PackageDesc.java b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
index c354cafae3c..2798d69d6da 100644
--- a/src/java.base/share/classes/java/lang/constant/PackageDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/PackageDesc.java
@@ -51,7 +51,7 @@ public sealed interface PackageDesc
      * @throws NullPointerException if the argument is {@code null}
      * @throws IllegalArgumentException if the name string is not in the
      * correct format
-     * @jls 6.5.3 Module Names and Package Names
+     * @jls 6.5.3 Meaning of Module Names and Package Names
      * @see PackageDesc#ofInternalName(String)
      */
     static PackageDesc of(String name) {
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
index 0cb77f632b3..30c8ee03601 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -2206,7 +2206,7 @@ public class MethodHandles {
          * @jvms 5.3.5 Deriving a {@code Class} from a {@code class} File Representation
          * @jvms 5.4 Linking
          * @jvms 5.5 Initialization
-         * @jls 12.7 Unloading of Classes and Interface
+         * @jls 12.7 Unloading of Classes and Interfaces
          */
         public Lookup defineHiddenClassWithClassData(byte[] bytes, Object classData, boolean initialize, ClassOption... options)
                 throws IllegalAccessException
diff --git a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java b/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
index 92c6655552e..bc6b20be9a8 100644
--- a/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
+++ b/src/java.base/share/classes/java/lang/reflect/AccessFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -528,7 +528,7 @@ public enum AccessFlag {
 
         /**
          * Method location.
-         * @jvms 4.6 Method
+         * @jvms 4.6 Methods
          */
         METHOD,
 
@@ -540,31 +540,31 @@ public enum AccessFlag {
 
         /**
          * Method parameter location.
-         * @jvms 4.7.24. The MethodParameters Attribute
+         * @jvms 4.7.24 The MethodParameters Attribute
          */
         METHOD_PARAMETER,
 
         /**
          * Module location
-         * @jvms 4.7.25. The Module Attribute
+         * @jvms 4.7.25 The Module Attribute
          */
         MODULE,
 
         /**
          * Module requires location
-         * @jvms 4.7.25. The Module Attribute
+         * @jvms 4.7.25 The Module Attribute
          */
         MODULE_REQUIRES,
 
         /**
          * Module exports location
-         * @jvms 4.7.25. The Module Attribute
+         * @jvms 4.7.25 The Module Attribute
          */
         MODULE_EXPORTS,
 
         /**
          * Module opens location
-         * @jvms 4.7.25. The Module Attribute
+         * @jvms 4.7.25 The Module Attribute
          */
         MODULE_OPENS;
 
diff --git a/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java b/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
index d5d00f34c86..47c6c410241 100644
--- a/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
+++ b/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -254,7 +254,7 @@ public interface InvocationHandler {
      * @throws Throwable anything thrown by the default method
 
      * @since 16
-     * @jvms 5.4.3. Method Resolution
+     * @jvms 5.4.3 Resolution
      */
     @CallerSensitive
     public static Object invokeDefault(Object proxy, Method method, Object... args)
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index 9b929509882..730b4b09757 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -755,7 +755,7 @@ public final class Method extends Executable {
      *     {@link Class} and no definition can be found for the
      *     default class value.
      * @since  1.5
-     * @jls 9.6.2 Defaults for Annotation Type Elements
+     * @jls 9.6.2 Defaults for Annotation Interface Elements
      */
     public Object getDefaultValue() {
         if  (annotationDefault == null)
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java b/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
index 7f8cee373f7..138f093be2f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -95,7 +95,7 @@ public enum NestingKind {
     /**
      * A named class or interface declared within a construct other
      * than a class or interface.
-     * @jls 14.3 Local Class Declarations
+     * @jls 14.3 Local Class and Interface Declarations
      */
     LOCAL,
 
@@ -111,7 +111,7 @@ public enum NestingKind {
      * More specifically, an <i>inner</i> type element is any nested type element that
      * is not {@linkplain Modifier#STATIC static}.
      * @return whether or not the constant is nested
-     * @jls 14.3 Local Class Declarations
+     * @jls 14.3 Local Class and Interface Declarations
      */
     public boolean isNested() {
         return this != TOP_LEVEL;
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/NullType.java b/src/java.compiler/share/classes/javax/lang/model/type/NullType.java
index 92feb514aab..3b82269b55a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/NullType.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/NullType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -30,7 +30,7 @@ package javax.lang.model.type;
  * Represents the null type.
  * This is the type of the expression {@code null}.
  *
- * @jls 3.10.7 The Null Literal
+ * @jls 3.10.8 The Null Literal
  * @jls 4.1 The Kinds of Types and Values
  * @see javax.lang.model.util.Types#getNullType()
  * @since 1.6
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
index abea88fb6f2..0cac48775f5 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
@@ -71,7 +71,7 @@ public interface TypeVariable extends ReferenceType {
      * non-trivial lower bound.  Type variables otherwise have a
      * lower bound of {@link NullType}.
      *
-     * @jls 18.1.3. Bounds
+     * @jls 18.1.3 Bounds
      */
     TypeMirror getLowerBound();
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
index ee1f40dc196..ada07bb1bae 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/ClassTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -43,10 +43,10 @@ import javax.lang.model.element.Name;
  * </pre>
  *
  * @jls 8.1 Class Declarations
- * @jls 8.9 Enum Types
- * @jls 8.10 Record Types
+ * @jls 8.9 Enum Classes
+ * @jls 8.10 Record Classes
  * @jls 9.1 Interface Declarations
- * @jls 9.6 Annotation Types
+ * @jls 9.6 Annotation Interfaces
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
index f5bede70539..f752f7f3191 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/InstanceOfTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -33,7 +33,7 @@ package com.sun.source.tree;
  *   <em>expression</em> instanceof <em>type</em>
  * </pre>
  *
- * @jls 15.20.2 Type Comparison Operator instanceof
+ * @jls 15.20.2 The instanceof Operator
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java
index 622e4588703..8899e3699b6 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/LiteralTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -34,7 +34,7 @@ package com.sun.source.tree;
  *   <em>value</em>
  * </pre>
  *
- * @jls 15.28 Constant Expressions
+ * @jls 15.29 Constant Expressions
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java
index f6dae4c3ced..9215da58772 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/MethodTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -44,7 +44,7 @@ import javax.lang.model.element.Name;
  * @jls 8.6 Instance Initializers
  * @jls 8.7 Static Initializers
  * @jls 9.4 Method Declarations
- * @jls 9.6.1 Annotation Type Elements
+ * @jls 9.6.1 Annotation Interface Elements
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java
index a193d4516e3..dbb2e5e2183 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/ModifiersTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -40,9 +40,9 @@ import javax.lang.model.element.Modifier;
  * </pre>
  *
  * @jls 8.1.1 Class Modifiers
+ * @jls 8.1.3 Inner Classes and Enclosing Instances
  * @jls 8.3.1 Field Modifiers
  * @jls 8.4.3 Method Modifiers
- * @jls 8.5.1 Static Member Type Declarations
  * @jls 8.8.3 Constructor Modifiers
  * @jls 9.1.1 Interface Modifiers
  * @jls 9.7 Annotations
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java
index d3c4b252473..9c103505fba 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/StatementTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -29,7 +29,7 @@ package com.sun.source.tree;
  * A tree node used as the base class for the different kinds of
  * statements.
  *
- * @jls 14 Blocks and Statements
+ * @jls 14 Blocks, Statements, and Patterns
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
index 2327c7a3f49..35129667946 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/SwitchExpressionTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, 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
@@ -37,7 +37,7 @@ import java.util.List;
  *   }
  * </pre>
  *
- * @jls 15.29 Switch Expressions
+ * @jls 15.28 {@code switch} Expressions
  *
  * @since 14
  */
diff --git a/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java b/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
index d63fa308e3b..a1191b2f8e6 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/tree/VariableTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2024, 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
@@ -37,7 +37,7 @@ import javax.lang.model.element.Name;
  * </pre>
  *
  * @jls 8.3 Field Declarations
- * @jls 14.4 Local Variable Declaration Statements
+ * @jls 14.4 Local Variable Declarations
  *
  * @author Peter von der Ah&eacute;
  * @author Jonathan Gibbons
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
index b0f20a84ec6..4e72fed10fc 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Snippet.java
@@ -96,7 +96,7 @@ public abstract class Snippet {
          * <P>
          * A type declaration is {@linkplain Kind#isPersistent() persistent}.
          *
-         * @jls 7.6 Top Level Type Declarations
+         * @jls 7.6 Top Level Class and Interface Declarations
          */
         TYPE_DECL(true),
 
@@ -241,14 +241,14 @@ public abstract class Snippet {
         /**
          * An enum declaration.
          * A {@code SubKind} of {@link Kind#TYPE_DECL}.
-         * @jls 8.9 Enum Types
+         * @jls 8.9 Enum Classes
          */
         ENUM_SUBKIND(Kind.TYPE_DECL),
 
         /**
          * A record declaration.
          * A {@code SubKind} of {@link Kind#TYPE_DECL}.
-         * @jls 8.10 Record Types
+         * @jls 8.10 Record Classes
          *
          * @since 17
          */
@@ -257,7 +257,7 @@ public abstract class Snippet {
         /**
          * An annotation interface declaration. A {@code SubKind} of
          * {@link Kind#TYPE_DECL}.
-         * @jls 9.6 Annotation Types
+         * @jls 9.6 Annotation Interfaces
          */
         ANNOTATION_TYPE_SUBKIND(Kind.TYPE_DECL),