Renamed some lines