Phase 2 - Updated views to match new controller naming scheme