Eric Engestrom authored Dec 03, 2023 and Marge Bot committed Dec 04, 2023

All of these have been renamed in the spec (usually by being promoted);
renamed them in our code too.

Part-of: <!26487>