fix some issues with type parameter names