Refactor function names