Renamed some constraints