Refactor: rename, update references