Function name refactor.