Renamed some enum constants.