Tidy up of names