Cleaned up naming in views to match events