tidy up some names