Renamed some solutions