cleaning up template name convention