diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 10e98395aa3..e392ef993dc 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -1730,7 +1730,7 @@ public final class String
     /**
      * Returns the index within this {@code String} that is
      * offset from the given {@code index} by
-     * {@code codePointOffset} code points. Isolated surrogate code units
+     * {@code codePointOffset} code points. Unpaired surrogates
      * within the text range given by {@code index} and
      * {@code codePointOffset} count as one code point each.
      *
diff --git a/test/jdk/java/lang/String/Supplementary.java b/test/jdk/java/lang/String/Supplementary.java
index 0ff9a94c90c..3b6251b1292 100644
--- a/test/jdk/java/lang/String/Supplementary.java
+++ b/test/jdk/java/lang/String/Supplementary.java
@@ -389,7 +389,8 @@ public class Supplementary {
      * Test codePointCount(int, int) &
      *      codePointCount()
      *
-     * This test case assumes that Character.codePointCount(CharSequence, int, int) works
+     * This test case assumes that
+     * Character.codePointCount(CharSequence, int, int) works
      * correctly.
      */
     static void test8() {