diff --git a/spec/collator.html b/spec/collator.html
index 57dac1d3..4f7f4341 100644
--- a/spec/collator.html
+++ b/spec/collator.html
@@ -75,7 +75,7 @@ <h1>Intl.Collator ( [ _locales_ [ , _options_ ] ] )</h1>
           1. Append [[Numeric]] as the last element of _internalSlotsList_.
         1. If %Collator%.[[RelevantExtensionKeys]] contains *"kf"*, then
           1. Append [[CaseFirst]] as the last element of _internalSlotsList_.
-        1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%CollatorPrototype%"*, _internalSlotsList_).
+        1. Let _collator_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%Collator.prototype%"*, _internalSlotsList_).
         1. Return ? InitializeCollator(_collator_, _locales_, _options_).
       </emu-alg>
     </emu-clause>
@@ -92,7 +92,7 @@ <h1>Properties of the Intl.Collator Constructor</h1>
       <h1>Intl.Collator.prototype</h1>
 
       <p>
-        The value of `Intl.Collator.prototype` is %CollatorPrototype%.
+        The value of `Intl.Collator.prototype` is %Collator.prototype%.
       </p>
 
       <p>
@@ -146,7 +146,7 @@ <h1>Internal Slots</h1>
     <h1>Properties of the Intl.Collator Prototype Object</h1>
 
     <p>
-      The Intl.Collator prototype object is itself an ordinary object. <dfn>%CollatorPrototype%</dfn> is not an Intl.Collator instance and does not have an [[InitializedCollator]] internal slot or any of the other internal slots of Intl.Collator instance objects.
+      The Intl.Collator prototype object is itself an ordinary object. <dfn>%Collator.prototype%</dfn> is not an Intl.Collator instance and does not have an [[InitializedCollator]] internal slot or any of the other internal slots of Intl.Collator instance objects.
     </p>
 
     <emu-clause id="sec-intl.collator.prototype.constructor">
@@ -271,7 +271,7 @@ <h1>Intl.Collator.prototype.resolvedOptions ()</h1>
       <emu-alg>
         1. Let _collator_ be *this* value.
         1. Perform ? RequireInternalSlot(_collator_, [[InitializedCollator]]).
-        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. Let _options_ be ! ObjectCreate(%Object.prototype%).
         1. For each row of <emu-xref href="#table-collator-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
           1. Let _p_ be the Property value of the current row.
           1. Let _v_ be the value of _collator_'s internal slot whose name is the Internal Slot value of the current row.
@@ -338,7 +338,7 @@ <h1>Intl.Collator.prototype.resolvedOptions ()</h1>
     <h1>Properties of Intl.Collator Instances</h1>
 
     <p>
-      Intl.Collator instances are ordinary objects that inherit properties from %CollatorPrototype%.
+      Intl.Collator instances are ordinary objects that inherit properties from %Collator.prototype%.
     </p>
 
     <p>
diff --git a/spec/conventions.html b/spec/conventions.html
index 50e07124..4fd33491 100644
--- a/spec/conventions.html
+++ b/spec/conventions.html
@@ -114,7 +114,7 @@ <h1>Well-Known Intrinsic Objects</h1>
         <tr>
           <td><dfn>%StringProto_indexOf%</dfn></td>
           <td>`String.prototype.indexOf`</td>
-          <td>The initial value of the *"indexOf"* data property of the intrinsic %StringPrototype% (ES2021, <emu-xref href="#sec-string.prototype.indexof"></emu-xref>)</td>
+          <td>The initial value of the *"indexOf"* data property of the intrinsic %String.prototype% (ES2021, <emu-xref href="#sec-string.prototype.indexof"></emu-xref>)</td>
         </tr>
       </table>
     </emu-table>
diff --git a/spec/datetimeformat.html b/spec/datetimeformat.html
index 8e787400..8e7139b8 100644
--- a/spec/datetimeformat.html
+++ b/spec/datetimeformat.html
@@ -249,7 +249,7 @@ <h1>DateTime Format Functions</h1>
         1. Let _dtf_ be _F_.[[DateTimeFormat]].
         1. Assert: Type(_dtf_) is Object and _dtf_ has an [[InitializedDateTimeFormat]] internal slot.
         1. If _date_ is not provided or is *undefined*, then
-          1. Let _x_ be Call(%Date_now%, *undefined*).
+          1. Let _x_ be Call(%Date.now%, *undefined*).
         1. Else,
           1. Let _x_ be ? ToNumber(_date_).
         1. Return ? FormatDateTime(_dtf_, _x_).
@@ -361,7 +361,7 @@ <h1>FormatDateTimeToParts ( _dateTimeFormat_, _x_ )</h1>
         1. Let _result_ be ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each _part_ in _parts_, do
-          1. Let _O_ be ObjectCreate(%ObjectPrototype%).
+          1. Let _O_ be ObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. Perform ! CreateDataProperty(_result_, ! ToString(_n_), _O_).
@@ -489,7 +489,7 @@ <h1>Intl.DateTimeFormat ( [ _locales_ [ , _options_ ] ] )</h1>
 
       <emu-alg>
         1. If NewTarget is *undefined*, let _newTarget_ be the active function object, else let _newTarget_ be NewTarget.
-        1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%DateTimeFormatPrototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[Hour]], [[Minute]], [[Second]], [[TimeZoneName]], [[HourCycle]], [[Pattern]], [[BoundFormat]] &raquo;).
+        1. Let _dateTimeFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%DateTimeFormat.prototype%"*, &laquo; [[InitializedDateTimeFormat]], [[Locale]], [[Calendar]], [[NumberingSystem]], [[TimeZone]], [[Weekday]], [[Era]], [[Year]], [[Month]], [[Day]], [[Hour]], [[Minute]], [[Second]], [[TimeZoneName]], [[HourCycle]], [[Pattern]], [[BoundFormat]] &raquo;).
         1. Perform ? InitializeDateTimeFormat(_dateTimeFormat_, _locales_, _options_).
       </emu-alg>
       <emu-normative-optional>
@@ -518,7 +518,7 @@ <h1>Properties of the Intl.DateTimeFormat Constructor</h1>
       <h1>Intl.DateTimeFormat.prototype</h1>
 
       <p>
-        The value of `Intl.DateTimeFormat.prototype` is %DateTimeFormatPrototype%.
+        The value of `Intl.DateTimeFormat.prototype` is %DateTimeFormat.prototype%.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -601,7 +601,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.DateTimeFormat Prototype Object</h1>
 
     <p>
-      The Intl.DateTimeFormat prototype object is itself an ordinary object. <dfn>%DateTimeFormatPrototype%</dfn> is not an Intl.DateTimeFormat instance and does not have an [[InitializedDateTimeFormat]] internal slot or any of the other internal slots of Intl.DateTimeFormat instance objects.
+      The Intl.DateTimeFormat prototype object is itself an ordinary object. <dfn>%DateTimeFormat.prototype%</dfn> is not an Intl.DateTimeFormat instance and does not have an [[InitializedDateTimeFormat]] internal slot or any of the other internal slots of Intl.DateTimeFormat instance objects.
     </p>
 
     <emu-clause id="sec-intl.datetimeformat.prototype.constructor">
@@ -659,7 +659,7 @@ <h1>Intl.DateTimeFormat.prototype.formatToParts ( _date_ )</h1>
         1. Let _dtf_ be *this* value.
         1. Perform ? RequireInternalSlot(_dtf_, [[InitializedDateTimeFormat]]).
         1. If _date_ is *undefined*, then
-          1. Let _x_ be Call(%Date_now%, *undefined*).
+          1. Let _x_ be Call(%Date.now%, *undefined*).
         1. Else,
           1. Let _x_ be ? ToNumber(_date_).
         1. Return ? FormatDateTimeToParts(_dtf_, _x_).
@@ -677,7 +677,7 @@ <h1>Intl.DateTimeFormat.prototype.resolvedOptions ()</h1>
         1. Let _dtf_ be *this* value.
         1. If Type(_dtf_) is not Object, throw a *TypeError* exception.
         1. Let _dtf_ be ? UnwrapDateTimeFormat(_dtf_).
-        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. Let _options_ be ! ObjectCreate(%Object.prototype%).
         1. For each row of <emu-xref href="#table-datetimeformat-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
           1. Let _p_ be the Property value of the current row.
           1. If _p_ is *"hour12"*, then
@@ -782,7 +782,7 @@ <h1>Intl.DateTimeFormat.prototype.resolvedOptions ()</h1>
     <h1>Properties of Intl.DateTimeFormat Instances</h1>
 
     <p>
-      Intl.DateTimeFormat instances are ordinary objects that inherit properties from %DateTimeFormatPrototype%.
+      Intl.DateTimeFormat instances are ordinary objects that inherit properties from %DateTimeFormat.prototype%.
     </p>
 
     <p>
diff --git a/spec/intl.html b/spec/intl.html
index 43536323..9296174b 100644
--- a/spec/intl.html
+++ b/spec/intl.html
@@ -5,7 +5,7 @@ <h1>The Intl Object</h1>
   </p>
 
   <p>
-    The value of the [[Prototype]] internal slot of the Intl object is the intrinsic object %ObjectPrototype%.
+    The value of the [[Prototype]] internal slot of the Intl object is the intrinsic object %Object.prototype%.
   </p>
 
   <p>
diff --git a/spec/locale.html b/spec/locale.html
index f6b9be89..06ab02b0 100644
--- a/spec/locale.html
+++ b/spec/locale.html
@@ -108,7 +108,7 @@ <h1>Intl.Locale( _tag_ [, _options_] )</h1>
           1. Append [[CaseFirst]] as the last element of _internalSlotsList_.
         1. If _relevantExtensionKeys_ contains *"kn"*, then
           1. Append [[Numeric]] as the last element of _internalSlotsList_.
-        1. Let _locale_ be ? OrdinaryCreateFromConstructor(NewTarget, *%LocalePrototype%*, _internalSlotsList_).
+        1. Let _locale_ be ? OrdinaryCreateFromConstructor(NewTarget, *%Locale.prototype%*, _internalSlotsList_).
         1. If Type(_tag_) is not String or Object, throw a *TypeError* exception.
         1. If Type(_tag_) is Object and _tag_ has an [[InitializedLocale]] internal slot, then
           1. Let _tag_ be _tag_.[[Locale]].
@@ -169,7 +169,7 @@ <h1>Properties of the Intl.Locale Constructor</h1>
       <h1>Intl.Locale.prototype</h1>
 
       <p>
-        The value of *Intl.Locale.prototype* is *%LocalePrototype%*.
+        The value of *Intl.Locale.prototype* is *%Locale.prototype%*.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -189,7 +189,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.Locale Prototype Object</h1>
 
     <p>
-      The Intl.Locale prototype object is itself an ordinary object. <dfn>%LocalePrototype%</dfn> is not an Intl.Locale instance and does not have an [[InitializedLocale]] internal slot or any of the other internal slots of Intl.Locale instance objects.
+      The Intl.Locale prototype object is itself an ordinary object. <dfn>%Locale.prototype%</dfn> is not an Intl.Locale instance and does not have an [[InitializedLocale]] internal slot or any of the other internal slots of Intl.Locale instance objects.
     </p>
 
     <emu-clause id="sec-Intl.Locale.prototype.constructor">
@@ -251,7 +251,7 @@ <h1>get Intl.Locale.prototype.baseName</h1>
         1. Let _loc_ be the *this* value.
         1. Perform ? RequireInternalSlot(_loc_, [[InitializedLocale]]).
         1. Let _locale_ be _loc_.[[Locale]].
-        1. Return the substring of _locale_ corresponding to the `unicode_language_id` production. 
+        1. Return the substring of _locale_ corresponding to the `unicode_language_id` production.
     </emu-clause>
 
     <emu-clause id="sec-Intl.Locale.prototype.calendar">
diff --git a/spec/negotiation.html b/spec/negotiation.html
index 5cfa5aa1..f26851dd 100644
--- a/spec/negotiation.html
+++ b/spec/negotiation.html
@@ -139,7 +139,7 @@ <h1>UnicodeExtensionComponents( _extension_ )</h1>
         1. Let _size_ be the number of elements in _extension_.
         1. Let _k_ be 3.
         1. Repeat, while _k_ &lt; _size_
-          1. Let _e_ be ! Call(%StringProto_indexOf%, _extension_, « *"-"*, _k_ »).
+          1. Let _e_ be ! Call(%String.prototype.indexOf%, _extension_, « *"-"*, _k_ »).
           1. If _e_ = -1, let _len_ be _size_ - _k_; else let _len_ be _e_ - _k_.
           1. Let _subtag_ be the String value equal to the substring of _extension_ consisting of the code units at indices _k_ (inclusive) through _k_ + _len_ (exclusive).
           1. If _isKeyword_ is *false*, then
@@ -178,7 +178,7 @@ <h1>InsertUnicodeExtensionAndCanonicalize( _locale_, _extension_ )</h1>
         1. Assert: _locale_ does not contain a substring that is a Unicode locale extension sequence.
         1. Assert: _extension_ is a Unicode locale extension sequence.
         1. Assert: _tag_ matches the `unicode_locale_id` production.
-        1. Let _privateIndex_ be ! Call(%StringProto_indexOf%, _locale_, &laquo; *"-x-"* &raquo;).
+        1. Let _privateIndex_ be ! Call(%String.prototype.indexOf%, _locale_, &laquo; *"-x-"* &raquo;).
         1. If _privateIndex_ = -1, then
           1. Let _locale_ be the string-concatenation of _locale_ and _extension_.
         1. Else,
@@ -367,12 +367,12 @@ <h1>PartitionPattern ( _pattern_ )</h1>
 
       <emu-alg>
         1. Let _result_ be a new empty List.
-        1. Let _beginIndex_ be ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"{"*, 0 &raquo;).
+        1. Let _beginIndex_ be ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"{"*, 0 &raquo;).
         1. Let _endIndex_ be 0.
         1. Let _nextIndex_ be 0.
         1. Let _length_ be the number of code units in _pattern_.
         1. Repeat, while _beginIndex_ is an integer index into _pattern_
-          1. Set _endIndex_ to ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"}"*, _beginIndex_ &raquo;).
+          1. Set _endIndex_ to ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"}"*, _beginIndex_ &raquo;).
           1. Assert: _endIndex_ is greater than _beginIndex_.
           1. If _beginIndex_ is greater than _nextIndex_, then
             1. Let _literal_ be a substring of _pattern_ from position _nextIndex_, inclusive, to position _beginIndex_, exclusive.
@@ -380,7 +380,7 @@ <h1>PartitionPattern ( _pattern_ )</h1>
           1. Let _p_ be the substring of _pattern_ from position _beginIndex_, exclusive, to position _endIndex_, exclusive.
           1. Append a new Record { [[Type]]: _p_, [[Value]]: *undefined* } as the last element of the list _result_.
           1. Set _nextIndex_ to _endIndex_ + 1.
-          1. Set _beginIndex_ to ! Call(%StringProto_indexOf%, _pattern_, &laquo; *"{"*, _nextIndex_ &raquo;).
+          1. Set _beginIndex_ to ! Call(%String.prototype.indexOf%, _pattern_, &laquo; *"{"*, _nextIndex_ &raquo;).
         1. If _nextIndex_ is less than _length_, then
           1. Let _literal_ be the substring of _pattern_ from position _nextIndex_, inclusive, to position _length_, exclusive.
           1. Append a new Record { [[Type]]: *"literal"*, [[Value]]: _literal_ } as the last element of the list _result_.
diff --git a/spec/numberformat.html b/spec/numberformat.html
index bb62e42b..4399944c 100644
--- a/spec/numberformat.html
+++ b/spec/numberformat.html
@@ -257,7 +257,7 @@ <h1>PartitionNotationSubPattern ( _numberFormat_, _x_, _n_, _exponent_ )</h1>
                 1. Let _digits_ be a List whose 10 String valued elements are the UTF-16 string representations of the 10 _digits_ specified in the *"Digits"* column of the matching row in <emu-xref href="#table-numbering-system-digits"></emu-xref>.
                 1. Replace each _digit_ in _n_ with the value of _digits_[_digit_].
               1. Else use an implementation dependent algorithm to map _n_ to the appropriate representation of _n_ in the given numbering system.
-              1. Let _decimalSepIndex_ be Call(%StringProto_indexOf%, _n_, &laquo; *"."*, 0 &raquo;).
+              1. Let _decimalSepIndex_ be Call(%String.prototype.indexOf%, _n_, &laquo; *"."*, 0 &raquo;).
               1. If _decimalSepIndex_ > 0, then
                 1. Let _integer_ be the substring of _n_ from position 0, inclusive, to position _decimalSepIndex_, exclusive.
                 1. Let _fraction_ be the substring of _n_ from position _decimalSepIndex_, exclusive, to the end of _n_.
@@ -557,7 +557,7 @@ <h1>PartitionNotationSubPattern ( _numberFormat_, _x_, _n_, _exponent_ )</h1>
           <tr>
             <td>tibt</td>
             <td>U+0F20 to U+0F29</td>
-          </tr>          
+          </tr>
           <tr>
             <td>tirh</td>
             <td>U+114D0 to U+114D9</td>
@@ -614,7 +614,7 @@ <h1>FormatNumericToParts( _numberFormat_, _x_ )</h1>
         1. Let _result_ be ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each _part_ in _parts_, do
-          1. Let _O_ be ObjectCreate(%ObjectPrototype%).
+          1. Let _O_ be ObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. Perform ! CreateDataPropertyOrThrow(_result_, ! ToString(_n_), _O_).
@@ -730,7 +730,7 @@ <h1>SetNumberFormatUnitOptions ( _intlObj_, _options_ )</h1>
         1. Let _currency_ be ? GetOption(_options_, *"currency"*, *"string"*, *undefined*, *undefined*).
         1. If _currency_ is *undefined*, then
           1. If _style_ is *"currency"*, throw a *TypeError* exception.
-        1. Else, 
+        1. Else,
           1. If the result of IsWellFormedCurrencyCode(_currency_) is *false*, throw a *RangeError* exception.
         1. Let _currencyDisplay_ be ? GetOption(_options_, *"currencyDisplay"*, *"string"*, &laquo; *"code"*, *"symbol"*, *"narrowSymbol"*, *"name"* &raquo;, *"symbol"*).
         1. Let _currencySign_ be ? GetOption(_options_, *"currencySign"*, *"string"*, &laquo; *"standard"*, *"accounting"* &raquo;, *"standard"*).
@@ -754,7 +754,7 @@ <h1>SetNumberFormatUnitOptions ( _intlObj_, _options_ )</h1>
     <emu-clause id="sec-getnumberformatpattern" aoid="GetNumberFormatPattern">
       <h1>GetNumberFormatPattern ( _numberFormat_, _x_ )</h1>
       <p>
-        The abstract operation GetNumberFormatPattern considers the resolved unit-related options in the number format object along with the final scaled and rounded number being formatted and returns a pattern, a String value as described in <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>. 
+        The abstract operation GetNumberFormatPattern considers the resolved unit-related options in the number format object along with the final scaled and rounded number being formatted and returns a pattern, a String value as described in <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>.
       </p>
       <emu-alg>
         1. Let _localeData_ be %NumberFormat%.[[LocaleData]].
@@ -814,7 +814,7 @@ <h1>GetNumberFormatPattern ( _numberFormat_, _x_ )</h1>
     <emu-clause id="sec-getnotationsubpattern" aoid="GetNotationSubPattern">
       <h1>GetNotationSubPattern ( _numberFormat_, _exponent_ )</h1>
       <p>
-        The abstract operation GetNotationSubPattern considers the resolved notation and _exponent_, and returns a String value for the notation sub pattern as described in <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>. 
+        The abstract operation GetNotationSubPattern considers the resolved notation and _exponent_, and returns a String value for the notation sub pattern as described in <emu-xref href="#sec-intl.numberformat-internal-slots"></emu-xref>.
       </p>
       <emu-alg>
         1. Let _localeData_ be %NumberFormat%.[[LocaleData]].
@@ -896,7 +896,7 @@ <h1>Intl.NumberFormat ( [ _locales_ [ , _options_ ] ] )</h1>
 
       <emu-alg>
         1. If NewTarget is *undefined*, let _newTarget_ be the active function object, else let _newTarget_ be NewTarget.
-        1. Let _numberFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%NumberFormatPrototype%"*, &laquo; [[InitializedNumberFormat]], [[Locale]], [[DataLocale]], [[NumberingSystem]], [[Style]], [[Unit]], [[UnitDisplay]], [[Currency]], [[CurrencyDisplay]], [[CurrencySign]], [[MinimumIntegerDigits]], [[MinimumFractionDigits]], [[MaximumFractionDigits]], [[MinimumSignificantDigits]], [[MaximumSignificantDigits]], [[RoundingType]], [[Notation]], [[CompactDisplay]], [[UseGrouping]], [[SignDisplay]], [[BoundFormat]] &raquo;).
+        1. Let _numberFormat_ be ? OrdinaryCreateFromConstructor(_newTarget_, *"%NumberFormat.prototype%"*, &laquo; [[InitializedNumberFormat]], [[Locale]], [[DataLocale]], [[NumberingSystem]], [[Style]], [[Unit]], [[UnitDisplay]], [[Currency]], [[CurrencyDisplay]], [[CurrencySign]], [[MinimumIntegerDigits]], [[MinimumFractionDigits]], [[MaximumFractionDigits]], [[MinimumSignificantDigits]], [[MaximumSignificantDigits]], [[RoundingType]], [[Notation]], [[CompactDisplay]], [[UseGrouping]], [[SignDisplay]], [[BoundFormat]] &raquo;).
         1. Perform ? InitializeNumberFormat(_numberFormat_, _locales_, _options_).
       </emu-alg>
       <emu-normative-optional>
@@ -925,7 +925,7 @@ <h1>Properties of the Intl.NumberFormat Constructor</h1>
       <h1>Intl.NumberFormat.prototype</h1>
 
       <p>
-        The value of `Intl.NumberFormat.prototype` is %NumberFormatPrototype%.
+        The value of `Intl.NumberFormat.prototype` is %NumberFormat.prototype%.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -988,7 +988,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.NumberFormat Prototype Object</h1>
 
     <p>
-      The Intl.NumberFormat prototype object is itself an ordinary object. <dfn>%NumberFormatPrototype%</dfn> is not an Intl.NumberFormat instance and does not have an [[InitializedNumberFormat]] internal slot or any of the other internal slots of Intl.NumberFormat instance objects.
+      The Intl.NumberFormat prototype object is itself an ordinary object. <dfn>%NumberFormat.prototype%</dfn> is not an Intl.NumberFormat instance and does not have an [[InitializedNumberFormat]] internal slot or any of the other internal slots of Intl.NumberFormat instance objects.
     </p>
 
     <emu-clause id="sec-intl.numberformat.prototype.constructor">
@@ -1060,7 +1060,7 @@ <h1>Intl.NumberFormat.prototype.resolvedOptions ()</h1>
         1. Let _nf_ be *this* value.
         1. If Type(_nf_) is not Object, throw a *TypeError* exception.
         1. Let _nf_ be ? UnwrapNumberFormat(_nf_).
-        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. Let _options_ be ! ObjectCreate(%Object.prototype%).
         1. For each row of <emu-xref href="#table-numberformat-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
           1. Let _p_ be the Property value of the current row.
           1. Let _v_ be the value of _nf_'s internal slot whose name is the Internal Slot value of the current row.
@@ -1155,7 +1155,7 @@ <h1>Intl.NumberFormat.prototype.resolvedOptions ()</h1>
     <h1>Properties of Intl.NumberFormat Instances</h1>
 
     <p>
-      Intl.NumberFormat instances are ordinary objects that inherit properties from %NumberFormatPrototype%.
+      Intl.NumberFormat instances are ordinary objects that inherit properties from %NumberFormat.prototype%.
     </p>
 
     <p>
diff --git a/spec/pluralrules.html b/spec/pluralrules.html
index 7d07cf93..ab3cebea 100644
--- a/spec/pluralrules.html
+++ b/spec/pluralrules.html
@@ -41,7 +41,7 @@ <h1>GetOperands ( _s_ )</h1>
          1. Assert: Type(_s_) is String.
          1. Let _n_ be ! ToNumber(_s_).
          1. Assert: _n_ is finite.
-         1. Let _dp_ be ! Call(%StringProto_indexOf%, _s_, &laquo; *"."* &raquo;).
+         1. Let _dp_ be ! Call(%String.prototype.indexOf%, _s_, &laquo; *"."* &raquo;).
          1. If _dp_ = -1, then
            1. Set _iv_ to _n_.
            1. Let _f_ be 0.
@@ -157,7 +157,7 @@ <h1>Intl.PluralRules ( [ _locales_ [ , _options_ ] ] )</h1>
 
       <emu-alg>
         1. If NewTarget is *undefined*, throw a *TypeError* exception.
-        1. Let _pluralRules_ be ? OrdinaryCreateFromConstructor(NewTarget, *"%PluralRulesPrototype%"*, &laquo; [[InitializedPluralRules]], [[Locale]], [[Type]], [[MinimumIntegerDigits]], [[MinimumFractionDigits]], [[MaximumFractionDigits]], [[MinimumSignificantDigits]], [[MaximumSignificantDigits]], [[RoundingType]] &raquo;).
+        1. Let _pluralRules_ be ? OrdinaryCreateFromConstructor(NewTarget, *"%PluralRules.prototype%"*, &laquo; [[InitializedPluralRules]], [[Locale]], [[Type]], [[MinimumIntegerDigits]], [[MinimumFractionDigits]], [[MaximumFractionDigits]], [[MinimumSignificantDigits]], [[MaximumSignificantDigits]], [[RoundingType]] &raquo;).
         1. Return ? InitializePluralRules(_pluralRules_, _locales_, _options_).
       </emu-alg>
     </emu-clause>
@@ -174,7 +174,7 @@ <h1>Properties of the Intl.PluralRules Constructor</h1>
       <h1>Intl.PluralRules.prototype</h1>
 
       <p>
-        The value of `Intl.PluralRules.prototype` is %PluralRulesPrototype%.
+        The value of `Intl.PluralRules.prototype` is %PluralRules.prototype%.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -229,7 +229,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.PluralRules Prototype Object</h1>
 
     <p>
-      The Intl.PluralRules prototype object is itself an ordinary object. <dfn>%PluralRulesPrototype%</dfn> is not an Intl.PluralRules instance and does not have an [[InitializedPluralRules]] internal slot or any of the other internal slots of Intl.PluralRules instance objects.
+      The Intl.PluralRules prototype object is itself an ordinary object. <dfn>%PluralRules.prototype%</dfn> is not an Intl.PluralRules instance and does not have an [[InitializedPluralRules]] internal slot or any of the other internal slots of Intl.PluralRules instance objects.
     </p>
 
     <emu-clause id="sec-intl.pluralrules.prototype.constructor">
@@ -276,7 +276,7 @@ <h1>Intl.PluralRules.prototype.resolvedOptions ()</h1>
       <emu-alg>
         1. Let _pr_ be the *this* value.
         1. Perform ? RequireInternalSlot(_pr_, [[InitializedPluralRules]]).
-        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. Let _options_ be ! ObjectCreate(%Object.prototype%).
         1. For each row of <emu-xref href="#table-pluralrules-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
           1. Let _p_ be the Property value of the current row.
           1. Let _v_ be the value of _pr_'s internal slot whose name is the Internal Slot value of the current row.
@@ -333,7 +333,7 @@ <h1>Intl.PluralRules.prototype.resolvedOptions ()</h1>
     <h1>Properties of Intl.PluralRules Instances</h1>
 
     <p>
-      Intl.PluralRules instances are ordinary objects that inherit properties from %PluralRulesPrototype%.
+      Intl.PluralRules instances are ordinary objects that inherit properties from %PluralRules.prototype%.
     </p>
 
     <p>
diff --git a/spec/relativetimeformat.html b/spec/relativetimeformat.html
index 3124b46c..89f0a174 100644
--- a/spec/relativetimeformat.html
+++ b/spec/relativetimeformat.html
@@ -170,7 +170,7 @@ <h1>FormatRelativeTimeToParts ( _relativeTimeFormat_, _value_, _unit_ )</h1>
         1. Let _result_ be ArrayCreate(0).
         1. Let _n_ be 0.
         1. For each _part_ in _parts_, do
-          1. Let _O_ be ObjectCreate(%ObjectPrototype%).
+          1. Let _O_ be ObjectCreate(%Object.prototype%).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"type"*, _part_.[[Type]]).
           1. Perform ! CreateDataPropertyOrThrow(_O_, *"value"*, _part_.[[Value]]).
           1. If _part_ has a [[Unit]] field,
@@ -198,7 +198,7 @@ <h1>Intl.RelativeTimeFormat ([ _locales_ [ , _options_ ]])</h1>
 
       <emu-alg>
         1. If NewTarget is *undefined*, throw a *TypeError* exception.
-        1. Let _relativeTimeFormat_ be ? OrdinaryCreateFromConstructor(NewTarget, *"%RelativeTimeFormatPrototype%"*, « [[InitializedRelativeTimeFormat]], [[Locale]], [[DataLocale]], [[Style]], [[Numeric]], [[NumberFormat]], [[NumberingSystem]], [[PluralRules]] »).
+        1. Let _relativeTimeFormat_ be ? OrdinaryCreateFromConstructor(NewTarget, *"%RelativeTimeFormat.prototype%"*, « [[InitializedRelativeTimeFormat]], [[Locale]], [[DataLocale]], [[Style]], [[Numeric]], [[NumberFormat]], [[NumberingSystem]], [[PluralRules]] »).
         1. Return ? InitializeRelativeTimeFormat(_relativeTimeFormat_, _locales_, _options_).
       </emu-alg>
     </emu-clause>
@@ -215,7 +215,7 @@ <h1>Properties of the Intl.RelativeTimeFormat Constructor</h1>
       <h1>Intl.RelativeTimeFormat.prototype</h1>
 
       <p>
-        The value of `Intl.RelativeTimeFormat.prototype` is %RelativeTimeFormatPrototype%.
+        The value of `Intl.RelativeTimeFormat.prototype` is %RelativeTimeFormat.prototype%.
       </p>
       <p>
         This property has the attributes { [[Writable]]: *false*, [[Enumerable]]: *false*, [[Configurable]]: *false* }.
@@ -235,11 +235,11 @@ <h1>Intl.RelativeTimeFormat.supportedLocalesOf ( _locales_ [, _options_ ])</h1>
         1. Return ? SupportedLocales(_availableLocales_, _requestedLocales_, _options_).
       </emu-alg>
     </emu-clause>
-    
+
     <p>
       The value of the *"length"* property of the *supportedLocalesOf* method is 1.
     </p>
-    
+
     <emu-clause id="sec-Intl.RelativeTimeFormat-internal-slots">
       <h1>Internal slots</h1>
 
@@ -281,7 +281,7 @@ <h1>Internal slots</h1>
     <h1>Properties of the Intl.RelativeTimeFormat Prototype Object</h1>
 
     <p>
-      The Intl.RelativeTimeFormat prototype object is itself an ordinary object. <dfn>%RelativeTimeFormatPrototype%</dfn> is not an Intl.RelativeTimeFormat instance and does not have an [[InitializedRelativeTimeFormat]] internal slot or any of the other internal slots of Intl.RelativeTimeFormat instance objects.
+      The Intl.RelativeTimeFormat prototype object is itself an ordinary object. <dfn>%RelativeTimeFormat.prototype%</dfn> is not an Intl.RelativeTimeFormat instance and does not have an [[InitializedRelativeTimeFormat]] internal slot or any of the other internal slots of Intl.RelativeTimeFormat instance objects.
     </p>
 
     <emu-clause id="sec-Intl.RelativeTimeFormat.prototype.constructor">
@@ -345,7 +345,7 @@ <h1>Intl.RelativeTimeFormat.prototype.resolvedOptions ()</h1>
       <emu-alg>
         1. Let _relativeTimeFormat_ be the *this* value.
         1. Perform ? RequireInternalSlot(_relativeTimeFormat_, [[InitializedRelativeTimeFormat]]).
-        1. Let _options_ be ! ObjectCreate(%ObjectPrototype%).
+        1. Let _options_ be ! ObjectCreate(%Object.prototype%).
         1. For each row of <emu-xref href="#table-relativetimeformat-resolvedoptions-properties"></emu-xref>, except the header row, in table order, do
           1. Let _p_ be the Property value of the current row.
           1. Let _v_ be the value of _relativeTimeFormat_'s internal slot whose name is the Internal Slot value of the current row.
@@ -388,7 +388,7 @@ <h1>Intl.RelativeTimeFormat.prototype.resolvedOptions ()</h1>
     <h1>Properties of Intl.RelativeTimeFormat Instances</h1>
 
     <p>
-      Intl.RelativeTimeFormat instances are ordinary objects that inherit properties from %RelativeTimeFormatPrototype%.
+      Intl.RelativeTimeFormat instances are ordinary objects that inherit properties from %RelativeTimeFormat.prototype%.
     </p>
 
     <p>