Renamed views to match convention