Renaming templates for better organization