Refactor: rename