Cleaning up some names