Clean up names in UI.