Renamed some views