Refactor a name