Renamed constants more consistently