Fix some names, remove type constraints.