More renaming (templates)