Cleanup of some names.