Clean up some names