Refactor: rename function