Renamed some patches