Make function name read more like plain English
Update tests to match new function names