* Rename _*Marker classes to be _*Scope, for consistency

* [EMPTY] Commit to refresh the tree that is currently red (#118062)

* Fix remaining tests
Co-authored-by: Drew Roen <102626803+drewroengoogle@users.noreply.github.com>