Rename templates and updating views