diff --git a/NEWS b/NEWS
index 30a00126..385ebb07 100644
--- a/NEWS
+++ b/NEWS
@@ -77,9 +77,8 @@ GNU Bison NEWS
   api.prefix {xx}' since Bison 3.0, but no warning was issued.  These
   directives are slightly different, you might need to adjust your code.
   %name-prefix renames only symbols with external linkage, while api.prefix
-  also renames types and macros, including @code{YYDEBUG},
-  @code{YYTOKENTYPE}, @code{yytokentype}, @code{YYSTYPE}, @code{YYLTYPE},
-  etc.
+  also renames types and macros, including YYDEBUG, YYTOKENTYPE,
+  yytokentype, YYSTYPE, YYLTYPE, etc.
 
   Users of Flex that move from '%name-prefix "xx"' to '%define api.prefix
   {xx}' will typically have to update YY_DECL from
diff --git a/data/skeletons/c++.m4 b/data/skeletons/c++.m4
index 6f2d75d2..e682ada4 100644
--- a/data/skeletons/c++.m4
+++ b/data/skeletons/c++.m4
@@ -507,7 +507,7 @@ m4_define([b4_public_types_define],
 ])
 
 
-# b4_tolen_constructor_define
+# b4_token_constructor_define
 # ----------------------------
 # Define symbol constructors for all the value types.
 # Use at class-level.  Redefined in variant.hh.