Rename map functions to be consistent with tmpl functions