refactored template filenames