Rename templates with better names