EnterName refactored.