Renamed some constants