Cleanup tmpl function names