Refactor function name