REFACTOR: Rename for clarity