Create consistent naming across views and controllers

Pluralize controller and view names where appropriate for consistency