diff --git a/source/diagnostics.tex b/source/diagnostics.tex
index deceed9aeb..09c0a3d36e 100644
--- a/source/diagnostics.tex
+++ b/source/diagnostics.tex
@@ -924,7 +924,7 @@
 
 \rSec2[syserr.errcat]{Class \tcode{error_category}}
 
-\rSec3[syserr.errcat.overview]{Class \tcode{error_category} overview}
+\rSec3[syserr.errcat.overview]{Overview}
 
 \pnum
 The class \tcode{error_category} serves as a base class for types used
@@ -965,7 +965,7 @@
 }
 \end{codeblock}
 
-\rSec3[syserr.errcat.virtuals]{Class \tcode{error_category} virtual members}
+\rSec3[syserr.errcat.virtuals]{Virtual members}
 
 \indexlibrary{\idxcode{error_category}!destructor}%
 \begin{itemdecl}
@@ -1028,7 +1028,7 @@
 \returns A string that describes the error condition denoted by \tcode{ev}.
 \end{itemdescr}
 
-\rSec3[syserr.errcat.nonvirtuals]{Class \tcode{error_category} non-virtual members}
+\rSec3[syserr.errcat.nonvirtuals]{Non-virtual members}
 
 \indexlibrary{\idxcode{error_category}!constructor}%
 \begin{itemdecl}
@@ -1072,7 +1072,7 @@
 \begin{note} \tcode{less}\iref{comparisons} provides a total ordering for pointers. \end{note}
 \end{itemdescr}
 
-\rSec3[syserr.errcat.derived]{Program defined classes derived from \tcode{error_category}}
+\rSec3[syserr.errcat.derived]{Program-defined classes derived from \tcode{error_category}}
 
 \indexlibrarymember{name}{error_category}%
 \begin{itemdecl}
@@ -1157,7 +1157,7 @@
 
 \rSec2[syserr.errcode]{Class \tcode{error_code}}
 
-\rSec3[syserr.errcode.overview]{Class \tcode{error_code} overview}
+\rSec3[syserr.errcode.overview]{Overview}
 
 \pnum
 The class \tcode{error_code} describes an object used to hold error code
@@ -1203,7 +1203,7 @@
 }
 \end{codeblock}
 
-\rSec3[syserr.errcode.constructors]{Class \tcode{error_code} constructors}
+\rSec3[syserr.errcode.constructors]{Constructors}
 
 \indexlibrary{\idxcode{error_code}!constructor}%
 \begin{itemdecl}
@@ -1249,7 +1249,7 @@
 \tcode{is_error_code_enum_v<ErrorCodeEnum>} is \tcode{true}.
 \end{itemdescr}
 
-\rSec3[syserr.errcode.modifiers]{Class \tcode{error_code} modifiers}
+\rSec3[syserr.errcode.modifiers]{Modifiers}
 
 \indexlibrarymember{assign}{error_code}%
 \begin{itemdecl}
@@ -1290,7 +1290,7 @@
 \end{itemdescr}
 
 
-\rSec3[syserr.errcode.observers]{Class \tcode{error_code} observers}
+\rSec3[syserr.errcode.observers]{Observers}
 
 \indexlibrarymember{value}{error_code}%
 \begin{itemdecl}
@@ -1342,7 +1342,7 @@
 \returns \tcode{value() != 0}.
 \end{itemdescr}
 
-\rSec3[syserr.errcode.nonmembers]{Class \tcode{error_code} non-member functions}
+\rSec3[syserr.errcode.nonmembers]{Non-member functions}
 
 \indexlibrarymember{make_error_code}{errc}%
 \begin{itemdecl}
@@ -1369,7 +1369,7 @@
 
 \rSec2[syserr.errcondition]{Class \tcode{error_condition}}
 
-\rSec3[syserr.errcondition.overview]{Class \tcode{error_condition} overview}
+\rSec3[syserr.errcondition.overview]{Overview}
 
 \pnum
 The class \tcode{error_condition} describes an object used to hold values identifying
@@ -1406,7 +1406,7 @@
 }
 \end{codeblock}
 
-\rSec3[syserr.errcondition.constructors]{Class \tcode{error_condition} constructors}
+\rSec3[syserr.errcondition.constructors]{Constructors}
 
 \indexlibrary{\idxcode{error_condition}!constructor}%
 \begin{itemdecl}
@@ -1453,7 +1453,7 @@
 \end{itemdescr}
 
 
-\rSec3[syserr.errcondition.modifiers]{Class \tcode{error_condition} modifiers}
+\rSec3[syserr.errcondition.modifiers]{Modifiers}
 
 \indexlibrarymember{assign}{error_condition}%
 \begin{itemdecl}
@@ -1493,7 +1493,7 @@
 \postconditions \tcode{value() == 0} and \tcode{category() == generic_category()}.
 \end{itemdescr}
 
-\rSec3[syserr.errcondition.observers]{Class \tcode{error_condition} observers}
+\rSec3[syserr.errcondition.observers]{Observers}
 
 \indexlibrarymember{value}{error_condition}%
 \begin{itemdecl}
@@ -1535,7 +1535,7 @@
 \returns \tcode{value() != 0}.
 \end{itemdescr}
 
-\rSec3[syserr.errcondition.nonmembers]{Class \tcode{error_condition} non-member functions}
+\rSec3[syserr.errcondition.nonmembers]{Non-member functions}
 
 \indexlibrarymember{make_error_condition}{errc}%
 \begin{itemdecl}
@@ -1659,7 +1659,7 @@
 
 \rSec2[syserr.syserr]{Class \tcode{system_error}}
 
-\rSec3[syserr.syserr.overview]{Class \tcode{system_error} overview}
+\rSec3[syserr.syserr.overview]{Overview}
 
 \pnum
 The class \tcode{system_error} describes an exception object used to
@@ -1690,7 +1690,7 @@
 }
 \end{codeblock}
 
-\rSec3[syserr.syserr.members]{Class \tcode{system_error} members}
+\rSec3[syserr.syserr.members]{Members}
 
 \indexlibrary{\idxcode{system_error}!constructor}%
 \begin{itemdecl}