changed names of views and templates to match collections and models