Fix some names.