Renamed some views to make their intent clearer