Refactor function names.