diff --git a/spec.html b/spec.html
index e4341404452..ca9de0e49c6 100644
--- a/spec.html
+++ b/spec.html
@@ -36379,7 +36379,7 @@ <h1>
               1. Let _m1_ be CharacterSetMatcher(_rer_, _cs1_, *false*, _direction_).
               1. Set _m2_ to MatchSequence(_m1_, _m2_, _direction_).
             1. Append _m2_ to _lm_.
-          1. Let _singles_ be the CharSet containing every CharSetElement of _cs_ which consists of a single character.
+          1. Let _singles_ be the CharSet containing every CharSetElement of _cs_ that consists of a single character.
           1. Append CharacterSetMatcher(_rer_, _singles_, *false*, _direction_) to _lm_.
           1. If _cs_ contains the empty sequence of characters, append EmptyMatcher() to _lm_.
           1. Let _m2_ be the last Matcher in _lm_.
@@ -36440,9 +36440,9 @@ <h1>
         <emu-grammar>AtomEscape :: CharacterClassEscape</emu-grammar>
         <emu-alg>
           1. Let _cs_ be CompileToCharSet of |CharacterClassEscape| with argument _rer_.
-          1. If _rer_.[[UnicodeSets]] is *false*, or if every element of _cs_ consists of a single character (including if _cs_ is empty), return CharacterSetMatcher(_rer_, _cs_, *false*, _direction_).
+          1. If _rer_.[[UnicodeSets]] is *false*, or if every CharSetElement of _cs_ consists of a single character (including if _cs_ is empty), return CharacterSetMatcher(_rer_, _cs_, *false*, _direction_).
           1. Let _lm_ be an empty List of Matchers.
-          1. For each string _s_ in _cs_ whose length is greater than 1, iterating in descending order of string length, do
+          1. For each CharSetElement _s_ in _cs_ containing more than 1 character, iterating in descending order of length, do
             1. Let _cs2_ be a one-element CharSet containing the last code point of _s_.
             1. Let _m2_ be CharacterSetMatcher(_rer_, _cs2_, *false*, _direction_).
             1. For each code point _c1_ in _s_, iterating backwards from its second-to-last code point, do
@@ -36450,7 +36450,7 @@ <h1>
               1. Let _m1_ be CharacterSetMatcher(_rer_, _cs1_, *false*, _direction_).
               1. Set _m2_ to MatchSequence(_m1_, _m2_, _direction_).
             1. Append _m2_ to _lm_.
-          1. Let _singles_ be the CharSet containing every element of _cs_ which consists of a single character.
+          1. Let _singles_ be the CharSet containing every CharSetElement of _cs_ that consists of a single character.
           1. Append CharacterSetMatcher(_rer_, _singles_, *false*, _direction_) to _lm_.
           1. If _cs_ contains the empty sequence of characters, append EmptyMatcher() to _lm_.
           1. Let _m2_ be the last Matcher in _lm_.
@@ -36481,7 +36481,7 @@ <h1>
           <emu-alg>
             1. If _rer_.[[UnicodeSets]] is *true*, then
               1. Assert: _invert_ is *false*.
-              1. Assert: Every element of _A_ consists of a single character.
+              1. Assert: Every CharSetElement of _A_ consists of a single character.
             1. Return a new Matcher with parameters (_x_, _c_) that captures _rer_, _A_, _invert_, and _direction_ and performs the following steps when called:
               1. Assert: _x_ is a MatchState.
               1. Assert: _c_ is a MatcherContinuation.
@@ -36772,13 +36772,13 @@ <h1>
         <emu-alg>
           1. Let _A_ be CompileToCharSet of the first |ClassSetOperand| with argument _rer_.
           1. Let _B_ be CompileToCharSet of the second |ClassSetOperand| with argument _rer_.
-          1. Return the CharSet containing the elements of _A_ which are not also elements of _B_.
+          1. Return the CharSet containing the CharSetElements of _A_ which are not also CharSetElements of _B_.
         </emu-alg>
         <emu-grammar>ClassSubtraction :: ClassSubtraction `--` ClassSetOperand</emu-grammar>
         <emu-alg>
           1. Let _A_ be CompileToCharSet of the |ClassSubtraction| with argument _rer_.
           1. Let _B_ be CompileToCharSet of the |ClassSetOperand| with argument _rer_.
-          1. Return the CharSet containing the elements of _A_ which are not also elements of _B_.
+          1. Return the CharSet containing the CharSetElements of _A_ which are not also CharSetElements of _B_.
         </emu-alg>
 
         <!-- ClassSetRange -->
@@ -36967,7 +36967,7 @@ <h1>
           </dl>
           <emu-alg>
             1. Let _A_ be AllCharacters(_rer_).
-            1. Return the CharSet containing the elements of _A_ which are not also elements of _S_.
+            1. Return the CharSet containing the CharSetElements of _A_ which are not also CharSetElements of _S_.
           </emu-alg>
         </emu-clause>
 
@@ -37047,7 +37047,7 @@ <h1>
         <emu-grammar>NonEmptyClassString :: ClassSetCharacter NonEmptyClassString?</emu-grammar>
         <emu-alg>
           1. Let _cs_ be CompileToCharSet of |ClassSetCharacter| with argument _rer_.
-          1. Let _s1_ be the sequence of characters that is the single element of _cs_.
+          1. Let _s1_ be the sequence of characters that is the single CharSetElement of _cs_.
           1. If |NonEmptyClassString| is present, then
             1. Let _s2_ be CompileClassSetString of |NonEmptyClassString| with argument _rer_.
             1. Return the concatenation of _s1_ and _s2_.