Make non-global constants have consistent naming (with just _ instead of _k) (#17584)

Our style guide says the k's are not necessary, and it seems like a good idea to make all the code be consistent on this.

Only naming changes to private vars: no logic changes.