diff --git a/source/iostreams.tex b/source/iostreams.tex
index 3535d49177..26ab82506d 100644
--- a/source/iostreams.tex
+++ b/source/iostreams.tex
@@ -9990,7 +9990,7 @@
 behavior defined by POSIX. Implementations that do not support exact POSIX
 behavior are encouraged to provide behavior as close to POSIX behavior as is reasonable given the
 limitations of actual operating systems and file systems. If an implementation cannot provide any
-reasonable behavior, the implementation shall report an error as specified in~\ref{fs.norm.ref}.
+reasonable behavior, the implementation shall report an error as specified in~\ref{fs.err.report}.
 \enternote This allows users to rely on an exception being thrown or
 an error code being set when an implementation cannot provide any reasonable
 behavior.\exitnote
@@ -12457,7 +12457,7 @@
 \returns \tcode{status(path())} or \tcode{status(path(), ec)}, respectively.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -12470,7 +12470,7 @@
 \returns \tcode{symlink_status(path())} or \tcode{symlink_status(path(), ec)}, respectively.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -12654,7 +12654,7 @@
 and does not report an error.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote To iterate over the current directory, use \tcode{directory_iterator(".")} rather than \tcode{directory_iterator("")}. \exitnote
@@ -12708,7 +12708,7 @@
 \returns \tcode{*this}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \end{itemdescr}
 
@@ -12835,7 +12835,7 @@
 \tcode{directory_options} argument, otherwise \tcode{options() == directory_options::none}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote To iterate over the current directory, use \tcode{recursive_directory_iterator(".")}
@@ -13009,7 +13009,7 @@
 \returns \tcode{*this}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \begin{itemdecl}
@@ -13076,7 +13076,7 @@
 \enternote Because hardware failures, network failures, file system races, and many
 other kinds of errors occur frequently in file system operations, users should be aware
 that any filesystem operation function, no matter how apparently innocuous, may encounter
-an error. See Error reporting~(\ref{error.reporting}). \exitnote
+an error. See Error reporting~(\ref{fs.err.report}). \exitnote
 
 \rSec3[fs.op.absolute]{Absolute}
 
@@ -13114,7 +13114,7 @@
 \enternote For the returned path, \tcode{rp,} \tcode{rp.is_absolute()} is true. \exitnote
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \rSec3[fs.op.canonical]{Canonical}
@@ -13139,7 +13139,7 @@
 Signatures with argument \tcode{ec} return \tcode{path()} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \remarks \tcode{!exists(p)} is an error.
@@ -13187,7 +13187,7 @@
 Effects are then as follows:
 \begin{itemize}
 \item
-An error is reported as specified in Error reporting~(\ref{error.reporting}) if:
+An error is reported as specified in Error reporting~(\ref{fs.err.report}) if:
 \begin{itemize}
 \item \tcode{!exists(f)}, or
 \item \tcode{equivalent(from, to)}, or
@@ -13206,7 +13206,7 @@
 !exists(t) && (options & copy_options::copy_symlinks) != copy_options::none
 \end{codeblock}
 then \tcode{copy_symlink(from, to, options)}.
-\item Otherwise report an error as specified in Error reporting~(\ref{error.reporting}).
+\item Otherwise report an error as specified in Error reporting~(\ref{fs.err.report}).
 \end{itemize}
 
 \item
@@ -13243,7 +13243,7 @@
 \end{itemize}
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \remarks For the signature with argument \tcode{ec}, any
@@ -13303,7 +13303,7 @@
 \tcode{copy_file(from, to, copy_options::none, ec)}, respectively.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \end{itemdescr}
 
@@ -13326,7 +13326,7 @@
 \begin{itemize}
 \item
 Report a file already exists error as specified in
-    Error reporting~(\ref{error.reporting}) if:
+    Error reporting~(\ref{fs.err.report}) if:
 \begin{itemize}
 \item \tcode{exists(to)} and \tcode{equivalent(from, to)}, or
 \item \tcode{exists(to)} and \tcode{(options \& (copy_options::skip_existing | copy_options::overwrite_existing | copy_options::update_existing)) == copy_options::none}.
@@ -13352,7 +13352,7 @@
   \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \complexity At most one direct or indirect invocation of \tcode{status(to)}.
@@ -13375,7 +13375,7 @@
   \tcode{create_directory_symlink}, as appropriate.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13400,7 +13400,7 @@
   error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \complexity \bigoh{n} where \textit{n} is the number of elements
@@ -13432,7 +13432,7 @@
   The signature with argument \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \indexlibrary{\idxcode{create_directory}}
@@ -13463,7 +13463,7 @@
   The signature with argument \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13485,7 +13485,7 @@
   contains an unspecified representation of \tcode{to}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote Some operating systems require symlink creation to
@@ -13521,7 +13521,7 @@
 \end{itemize}
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote Some operating systems do not support hard links at all or support
@@ -13548,7 +13548,7 @@
   contains an unspecified representation of \tcode{to}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote Some operating systems do not support symbolic links at all or support
@@ -13573,7 +13573,7 @@
   error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \remarks The current working directory is the directory, associated
@@ -13604,7 +13604,7 @@
 \postcondition \tcode{equivalent(p, current_path())}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote The current path for many operating systems is a dangerous
@@ -13637,7 +13637,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13670,7 +13670,7 @@
 
 \pnum
 \throws \tcode{filesystem_error} if \tcode{(!exists(s1) \&\& !exists(s2)) || (is_other(s1) \&\& is_other(s2))},
-  otherwise as specified in Error reporting~(\ref{error.reporting}).
+  otherwise as specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13685,7 +13685,7 @@
 \begin{itemdescr}
 \pnum
 \returns If \tcode{!exists(p)  || !is_regular_file(p)}
-  an error is reported~\ref{error.reporting}. Otherwise, the size in bytes of the file
+  an error is reported~\ref{fs.err.report}. Otherwise, the size in bytes of the file
   \tcode{p} resolves to, determined as if by the value of the POSIX \tcode{stat}
   structure member \tcode{st_size} obtained as if by POSIX \tcode{stat()}.
    The signature
@@ -13693,7 +13693,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13712,7 +13712,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13739,7 +13739,7 @@
 The signature with argument \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13768,7 +13768,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13797,7 +13797,7 @@
   \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13825,7 +13825,7 @@
   an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13853,7 +13853,7 @@
 The signature with argument \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13882,7 +13882,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13953,7 +13953,7 @@
   \tcode{ec} returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -13982,7 +13982,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -14003,7 +14003,7 @@
   if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \indexlibrary{\idxcode{last_write_time}}
@@ -14019,7 +14019,7 @@
   resolved to by \tcode{p} to \tcode{new_time}, as if by POSIX \tcode{futimens()}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enternote A postcondition of \tcode{last_write_time(p) == new_time} is not specified since it might not hold for file systems
@@ -14060,7 +14060,7 @@
   implementation may use some other mechanism. \exitnote
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 \rSec3[fs.op.read_symlink]{Read symlink}
@@ -14079,7 +14079,7 @@
   returns \tcode{path()} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}). \enternote It is an error if \tcode{p} does not
+\throws As specified in Error reporting~(\ref{fs.err.report}). \enternote It is an error if \tcode{p} does not
   resolve to a symbolic link. \exitnote
 \end{itemdescr}
 
@@ -14108,7 +14108,7 @@
   returns \tcode{false} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -14136,7 +14136,7 @@
   occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -14169,7 +14169,7 @@
 \exitnote
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -14186,7 +14186,7 @@
 \postcondition \tcode{file_size() == new_size}.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \remarks Achieves its postconditions as if by POSIX \tcode{truncate()}.
@@ -14215,7 +14215,7 @@
   \tcode{static_cast<uintmax_t>(-1)} if an error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \remarks The value of member \tcode{space_info::available}
@@ -14355,7 +14355,7 @@
 \remarks Pathname resolution terminates if \tcode{p} names a symbolic link.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 \end{itemdescr}
 
 
@@ -14381,7 +14381,7 @@
 \postcondition For the returned path, \tcode{rp,} \tcode{rp.is_absolute()} is true.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enterexample For POSIX based operating systems, \tcode{system_complete(p)}
@@ -14417,7 +14417,7 @@
   error occurs.
 
 \pnum
-\throws As specified in Error reporting~(\ref{error.reporting}).
+\throws As specified in Error reporting~(\ref{fs.err.report}).
 
 \pnum
 \enterexample For POSIX based operating systems, an implementation might