Renaming templates, refs #26