Some template renaming