Refactor name