Refactor helper function names