I'm talking about this ^. This change is not related to this commit.

If you really wish them to land - may I ask you to open a separate pull request with all that renamings after landing this one?