Refactor name for clarity