Tidying up some names.