diff --git a/doc/langref.html.in b/doc/langref.html.in
index 42aebdcac2..9ef3691991 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -728,12 +728,12 @@
         </tr>
         <tr>
             <th scope="row"><code>\u{NNNNNN}</code></th>
-          <td>hexadecimal Unicode code point UTF-8 encoded (1 or more digits)</td>
+          <td>hexadecimal Unicode scalar value UTF-8 encoded (1 or more digits)</td>
         </tr>
         </tbody>
       </table>
       </div>
-      <p>Note that the maximum valid Unicode point is {#syntax#}0x10ffff{#endsyntax#}.</p>
+      <p>Note that the maximum valid Unicode scalar value is {#syntax#}0x10ffff{#endsyntax#}.</p>
       {#header_close#}
       {#header_open|Multiline String Literals#}
       <p>
diff --git a/lib/std/zig/AstGen.zig b/lib/std/zig/AstGen.zig
index 9c068eb597..f02dcaa2db 100644
--- a/lib/std/zig/AstGen.zig
+++ b/lib/std/zig/AstGen.zig
@@ -11306,7 +11306,7 @@ fn failWithStrLitError(astgen: *AstGen, err: std.zig.string_literal.Error, token
             return astgen.failOff(
                 token,
                 offset + @as(u32, @intCast(bad_index)),
-                "unicode escape does not correspond to a valid codepoint",
+                "unicode escape does not correspond to a valid unicode scalar value",
                 .{},
             );
         },
diff --git a/src/Package/Manifest.zig b/src/Package/Manifest.zig
index 589be91357..3bcb4a7958 100644
--- a/src/Package/Manifest.zig
+++ b/src/Package/Manifest.zig
@@ -522,7 +522,7 @@ const Parse = struct {
                 try p.appendErrorOff(
                     token,
                     offset + @as(u32, @intCast(bad_index)),
-                    "unicode escape does not correspond to a valid codepoint",
+                    "unicode escape does not correspond to a valid unicode scalar value",
                     .{},
                 );
             },