Changes names of views and urls
Merge pull request #15 from Konviser/master

Changes names of views and urls