Minor cleanup of names.