Additions to name cleaning.