Change Name and Clean it up.