Renamed views to markup for consistency