Renamed/added some constants