Refactor a bad name into a good name