Renamed views to make their names more self-explanatory

@mturalenka agree?