diff --git a/source/containers.tex b/source/containers.tex
index bc2cf144eb..6f72fc0686 100644
--- a/source/containers.tex
+++ b/source/containers.tex
@@ -24361,7 +24361,7 @@
   \tcode{is_convertible_v<$S_k$, full_ext\-ent_t>} is \tcode{true}; and
   \item
   for $k$ equal to \tcode{SubExtents::rank() - 1},
-  $S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+  $S_k$ is a unit-stride slice for \tcode{mapping};
   \end{itemize}
 \begin{note}
 If the above conditions are true,
@@ -24376,17 +24376,17 @@
 \end{codeblock}
 if for a value $u$ for which $u+1$ is
 the smallest value $p$ larger than zero
-for which $S_p$ is a unit-stride slice for \tcode{decltype(*this)},
+for which $S_p$ is a unit-stride slice for \tcode{mapping},
 the following conditions are met:
 \begin{itemize}
 \item
-$S_0$ is a unit-stride slice for \tcode{decltype(*this)}; and
+$S_0$ is a unit-stride slice for \tcode{mapping}; and
 \item
 for each $k$ in the range \range{$u$ + 1}{$u$ + SubExtents::rank() - 1},
 \tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true}; and
 \item
 for $k$ equal to \tcode{$u$ + SubExtents::rank() - 1},
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_k$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 and where \tcode{S_static} is:
 \begin{itemize}
@@ -24437,7 +24437,7 @@
   \tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true}; and
   \item
   for $k$ equal to \exposid{_rank} - \tcode{SubExtents::rank()},
-  $S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+  $S_k$ is a unit-stride slice for \tcode{mapping};
   \end{itemize}
 \begin{note}
 If the above conditions are true,
@@ -24452,19 +24452,19 @@
 \end{codeblock}
 if for a value $u$ for which $\exposid{rank_} - u - 2$ is
 the largest value $p$ smaller than \tcode{\exposid{rank_} - 1}
-for which $S_p$ is a unit-stride slice for \tcode{decltype(*this)},
+for which $S_p$ is a unit-stride slice for \tcode{mapping},
 the following conditions are met:
 \begin{itemize}
 \item
 for $k$ equal to \tcode{\exposid{rank_} - 1},
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)}; and
+$S_k$ is a unit-stride slice for \tcode{mapping}; and
 \item
 for each $k$ in the range
 \range{\exposid{rank_} - SubExtents::rank() - $u$ + 1}{\exposid{rank_} - $u$ - 1},
 \tcode{is_con\-vertible_v<$S_k$, full_extent_t>} is \tcode{true}; and
 \item
 for $k$ equal to \tcode{\exposid{rank_} - SubExtents::rank() - $u$},\newline
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_k$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 and where \tcode{S_static} is:
 \begin{itemize}
@@ -24540,7 +24540,7 @@
 \item
 \tcode{SubExtents::rank() == 1} is \tcode{true} and
 \item
-$S_0$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_0$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 \item
 otherwise,
@@ -24550,17 +24550,17 @@
 \end{codeblock}
 if for a value $u$
 for which \tcode{$u$ + 1} is the smallest value $p$ larger than zero
-for which $S_p$ is a unit-stride slice for \tcode{decltype(*this)},
+for which $S_p$ is a unit-stride slice for \tcode{mapping},
 the following conditions are met:
 \begin{itemize}
 \item
-$S_0$ is a unit-stride slice for \tcode{decltype(*this)}; and
+$S_0$ is a unit-stride slice for \tcode{mapping}; and
 \item
 for each $k$ in the range \range{$u$ + 1}{$u$ + SubExtents::rank() - 1},
 \tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true}; and
 \item
 for $k$ equal to \tcode{$u$ + SubExtents::rank() - 1},
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_k$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 where \tcode{S_static} is:
 \begin{itemize}
@@ -24612,7 +24612,7 @@
 \tcode{SubExtents::rank() == 1} is \tcode{true} and
 \item
 for $k$ equal to \tcode{\exposid{rank_} - 1},
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_k$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 \item
 otherwise,
@@ -24623,19 +24623,19 @@
 if for a value $u$
 for which \tcode{\exposid{rank_} - $u$ - 2}
 is the largest value p smaller than \tcode{\exposid{rank_} - 1}
-for which $S_p$ is a unit-stride slice for \tcode{decltype(*this)},
+for which $S_p$ is a unit-stride slice for \tcode{mapping},
 the following conditions are met:
 \begin{itemize}
 \item
 for $k$ equal to \tcode{\exposid{rank_} - 1},
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)}; and
+$S_k$ is a unit-stride slice for \tcode{mapping}; and
 \item
 for each $k$ in the range
 \range{\exposid{rank_} - SubExtents::rank() - $u$ + 1}{\exposid{rank_} - $u$ - 1)},
 \tcode{is_convertible_v<$S_k$, full_extent_t>} is \tcode{true}; and
 \item
 for $k$ equal to \tcode{\exposid{rank_} - SubExtents::rank() - $u$},\newline
-$S_k$ is a unit-stride slice for \tcode{decltype(*this)};
+$S_k$ is a unit-stride slice for \tcode{mapping};
 \end{itemize}
 and where \tcode{S_static} is:
 \begin{itemize}