Fix some names for types and functions.