Consistent constant names

Mikhail Mazurskiy requested to merge ash2k/cleanup-names into master Nov 16, 2020