Fix renaming of Template files