Make function names more consistent