Expand name cleaning.