fix names for templates