Clean some names up.