Rename remaining templates
Merge pull request #122 from jssjr/fix-views

Rename remaining templates