Improve naming of templates