Remove new api functions in flavor of name_by_* to match the other API's