Refactor constant names

Refactored name of constants that looked like class definitions.