diff --git a/src/java.desktop/share/classes/java/awt/GridBagConstraints.java b/src/java.desktop/share/classes/java/awt/GridBagConstraints.java
index 30f8bc4bf50..0008f5ac780 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagConstraints.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, 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
@@ -575,7 +575,7 @@ public class GridBagConstraints implements Cloneable, java.io.Serializable {
     private static final long serialVersionUID = -1000070633030801713L;
 
     /**
-     * Creates a {@code GridBagConstraint} object with
+     * Creates a {@code GridBagConstraints} object with
      * all of its fields set to their default value.
      */
     public GridBagConstraints () {
diff --git a/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java b/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
index 94a2aa14bf5..8df3895a021 100644
--- a/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
+++ b/src/java.desktop/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -41,7 +41,7 @@ import java.awt.image.RenderedImage;
  * ContextualRenderedImageFactory provides an interface for the
  * functionality that may differ between instances of
  * RenderableImageOp.  Thus different operations on RenderableImages
- * may be performed by a single class such as RenderedImageOp through
+ * may be performed by a single class such as RenderableImageOp through
  * the use of multiple instances of ContextualRenderedImageFactory.
  * The name ContextualRenderedImageFactory is commonly shortened to
  * "CRIF."
diff --git a/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java
index 19bf3b39323..f2f0d458ba1 100644
--- a/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/renderable/RenderableImageOp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, 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
@@ -58,7 +58,7 @@ public class RenderableImageOp implements RenderableImage {
 
 
     /**
-     * Constructs a RenderedImageOp given a
+     * Constructs a {@code RenderableImageOp} given a
      * ContextualRenderedImageFactory object, and
      * a ParameterBlock containing RenderableImage sources and other
      * parameters.  Any RenderedImage sources referenced by the
diff --git a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
index 0b8d8576f14..50cb25fe4f8 100644
--- a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, 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
@@ -38,8 +38,8 @@ import java.io.Serializable;
 
 
 /**
- * The layout manager used by <code>JScrollPane</code>.
- * <code>JScrollPaneLayout</code> is
+ * The layout manager used by {@code JScrollPane}.
+ * {@code ScrollPaneLayout} is
  * responsible for nine components: a viewport, two scrollbars,
  * a row header, a column header, and four "corner" components.
  * <p>