Make function names and arg order more consistent