#488 Renamed views to better match their purpose