Fixes #8870 Co-Authored-By: Krishnan Parthasarathi <krisis@users.noreply.github.com>
Rename to allow for more such features to come in a more proper hierarchical manner.