diff --git a/source/support.tex b/source/support.tex
index 7d53612aad..95d674aafb 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -4882,14 +4882,14 @@
 \begin{codeblock}
 namespace std {
   class partial_ordering {
-    int value;          // \expos
-    bool is_ordered;    // \expos
+    int @\exposid{value}@;          // \expos
+    bool @\exposid{is-ordered}@;    // \expos
 
     // exposition-only constructors
     constexpr explicit
-      partial_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)), is_ordered(true) {}     // \expos
+      partial_ordering(@\placeholder{ord}@ v) noexcept : @\exposid{value}@(int(v)), @\exposid{is-ordered}@(true) {}     // \expos
     constexpr explicit
-      partial_ordering(@\placeholder{ncmp}@ v) noexcept : value(int(v)), is_ordered(false) {}   // \expos
+      partial_ordering(@\placeholder{ncmp}@ v) noexcept : @\exposid{value}@(int(v)), @\exposid{is-ordered}@(false) {}   // \expos
 
   public:
     // valid values
@@ -4937,7 +4937,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-For \tcode{operator@}, \tcode{v.is_ordered \&\& v.value @ 0}.
+For \tcode{operator@}, \tcode{v.\exposid{is-ordered} \&\& v.\exposid{value} @ 0}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{partial_ordering}%
@@ -4954,7 +4954,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-For \tcode{operator@}, \tcode{v.is_ordered \&\& 0 @ v.value}.
+For \tcode{operator@}, \tcode{v.\exposid{is-ordered} \&\& 0 @ v.\exposid{value}}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{partial_ordering}%
@@ -4995,10 +4995,10 @@
 \begin{codeblock}
 namespace std {
   class weak_ordering {
-    int value;  // \expos
+    int @\exposid{value}@;  // \expos
 
     // exposition-only constructors
-    constexpr explicit weak_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)) {} // \expos
+    constexpr explicit weak_ordering(@\placeholder{ord}@ v) noexcept : @\exposid{value}@(int(v)) {} // \expos
 
   public:
     // valid values
@@ -5040,8 +5040,8 @@
 \pnum
 \returns
 \begin{codeblock}
-value == 0 ? partial_ordering::equivalent :
-value < 0  ? partial_ordering::less :
+@\exposid{value}@ == 0 ? partial_ordering::equivalent :
+@\exposid{value}@ < 0  ? partial_ordering::less :
              partial_ordering::greater
 \end{codeblock}
 \end{itemdescr}
@@ -5062,7 +5062,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{v.value @ 0} for \tcode{operator@}.
+\tcode{v.\exposid{value} @ 0} for \tcode{operator@}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{weak_ordering}%
@@ -5079,7 +5079,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{0 @ v.value} for \tcode{operator@}.
+\tcode{0 @ v.\exposid{value}} for \tcode{operator@}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{weak_ordering}%
@@ -5121,10 +5121,10 @@
 \begin{codeblock}
 namespace std {
   class strong_ordering {
-    int value;  // \expos
+    int @\exposid{value}@;  // \expos
 
     // exposition-only constructors
-    constexpr explicit strong_ordering(@\placeholder{ord}@ v) noexcept : value(int(v)) {}   // \expos
+    constexpr explicit strong_ordering(@\placeholder{ord}@ v) noexcept : @\exposid{value}@(int(v)) {}   // \expos
 
   public:
     // valid values
@@ -5169,8 +5169,8 @@
 \pnum
 \returns
 \begin{codeblock}
-value == 0 ? partial_ordering::equivalent :
-value < 0  ? partial_ordering::less :
+@\exposid{value}@ == 0 ? partial_ordering::equivalent :
+@\exposid{value}@ < 0  ? partial_ordering::less :
              partial_ordering::greater
 \end{codeblock}
 \end{itemdescr}
@@ -5184,8 +5184,8 @@
 \pnum
 \returns
 \begin{codeblock}
-value == 0 ? weak_ordering::equivalent :
-value < 0  ? weak_ordering::less :
+@\exposid{value}@ == 0 ? weak_ordering::equivalent :
+@\exposid{value}@ < 0  ? weak_ordering::less :
              weak_ordering::greater
 \end{codeblock}
 \end{itemdescr}
@@ -5206,7 +5206,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{v.value @ 0} for \tcode{operator@}.
+\tcode{v.\exposid{value} @ 0} for \tcode{operator@}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<}{strong_ordering}%
@@ -5223,7 +5223,7 @@
 \begin{itemdescr}
 \pnum
 \returns
-\tcode{0 @ v.value} for \tcode{operator@}.
+\tcode{0 @ v.\exposid{value}} for \tcode{operator@}.
 \end{itemdescr}
 
 \indexlibrarymember{operator<=>}{strong_ordering}%