Minor refactor to give templates access to both function names at once