Renamed enum constants and moved out of namespace