Renamed  some constants.