diff --git a/source/iostreams.tex b/source/iostreams.tex
index abcab59cc5..1a2684fb3d 100644
--- a/source/iostreams.tex
+++ b/source/iostreams.tex
@@ -17358,16 +17358,16 @@
 \pnum
 \begin{example}
 Given this directory structure:
-\begin{codeblock}
+\begin{outputblock}
 /dir1
   file1
   file2
   dir2
     file3
-\end{codeblock}
+\end{outputblock}
 
 Calling \tcode{copy("/dir1", "/dir3")} would result in:
-\begin{codeblock}
+\begin{outputblock}
 /dir1
   file1
   file2
@@ -17376,10 +17376,10 @@
 /dir3
   file1
   file2
-\end{codeblock}
+\end{outputblock}
 
 Alternatively, calling \tcode{copy("/dir1", "/dir3", copy_options::recursive)} would result in:
-\begin{codeblock}
+\begin{outputblock}
 /dir1
   file1
   file2
@@ -17390,7 +17390,7 @@
   file2
   dir2
     file3
-\end{codeblock}
+\end{outputblock}
 \end{example}
 \end{itemdescr}
 
diff --git a/source/uax31.tex b/source/uax31.tex
index ee0bb9c2a1..11dcfd6d96 100644
--- a/source/uax31.tex
+++ b/source/uax31.tex
@@ -23,9 +23,9 @@
 \UAX{31} specifies a default syntax for identifiers
 based on properties from the Unicode Character Database, \UAX{44}.
 The general syntax is
-\begin{codeblock}
+\begin{outputblock}
 <Identifier> := <Start> <Continue>* (<Medial> <Continue>+)*
-\end{codeblock}
+\end{outputblock}
 where \tcode{<Start>} has the XID_Start property,
 \tcode{<Continue>} has the XID_Continue property, and
 \tcode{<Medial>} is a list of characters permitted between continue characters.
@@ -34,11 +34,11 @@
 the \tcode{<Medial>} set is empty, and
 the \tcode{<Continue>} characters are unmodified.
 In the grammar used in \UAX{31}, this is
-\begin{codeblock}
+\begin{outputblock}
 <Identifier> := <Start> <Continue>*
 <Start> := XID_Start + @\textrm{\ucode{005f}}@
 <Continue> := <Start> + XID_Continue
-\end{codeblock}
+\end{outputblock}
 
 \pnum
 This is described in the \Cpp{} grammar in \ref{lex.name},