Make function naming consistent