refactor all the templates names