Tidy up some names