Refactor constant names

Refactored name of constants that looked like class definitions.
Merge pull request #93 from dragosmiron/constant-names

Refactor constant names