Refactor the name