Several fixes to names and types.