Coding convention; rename some enum constants.

(cherry picked from commit 854871c871e9a15a39dcd9851168eafdc3a5c044)
Follow enum constant renaming.