Fix some names