Function name refactoring