Renamed constants to caps case