Template cleanup
Renaming of templates