Cleaned up naming in views to match news