name clean-up