Renamed constants to const