renaming templates to be singular