clean up template names