diff --git a/internal/mocks/cpm.go b/internal/mocks/cpm.go
index 4ef87ef4..2efb6cc0 100644
--- a/internal/mocks/cpm.go
+++ b/internal/mocks/cpm.go
@@ -1,9 +1,10 @@
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/lucas-clemente/quic-go/handshake (interfaces: ConnectionParametersManager)
+// Code generated by MockGen. DO NOT EDIT.
+// Source: ../handshake/connection_parameters_manager.go
 
 package mocks
 
 import (
+	reflect "reflect"
 	time "time"
 
 	gomock "github.com/golang/mock/gomock"
@@ -11,27 +12,42 @@ import (
 	protocol "github.com/lucas-clemente/quic-go/internal/protocol"
 )
 
-// Mock of ConnectionParametersManager interface
+// MockConnectionParametersManager is a mock of ConnectionParametersManager interface
 type MockConnectionParametersManager struct {
 	ctrl     *gomock.Controller
-	recorder *_MockConnectionParametersManagerRecorder
+	recorder *MockConnectionParametersManagerMockRecorder
 }
 
-// Recorder for MockConnectionParametersManager (not exported)
-type _MockConnectionParametersManagerRecorder struct {
+// MockConnectionParametersManagerMockRecorder is the mock recorder for MockConnectionParametersManager
+type MockConnectionParametersManagerMockRecorder struct {
 	mock *MockConnectionParametersManager
 }
 
+// NewMockConnectionParametersManager creates a new mock instance
 func NewMockConnectionParametersManager(ctrl *gomock.Controller) *MockConnectionParametersManager {
 	mock := &MockConnectionParametersManager{ctrl: ctrl}
-	mock.recorder = &_MockConnectionParametersManagerRecorder{mock}
+	mock.recorder = &MockConnectionParametersManagerMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockConnectionParametersManager) EXPECT() *_MockConnectionParametersManagerRecorder {
+// EXPECT returns an object that allows the caller to indicate expected use
+func (_m *MockConnectionParametersManager) EXPECT() *MockConnectionParametersManagerMockRecorder {
 	return _m.recorder
 }
 
+// SetFromMap mocks base method
+func (_m *MockConnectionParametersManager) SetFromMap(_param0 map[handshake.Tag][]byte) error {
+	ret := _m.ctrl.Call(_m, "SetFromMap", _param0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetFromMap indicates an expected call of SetFromMap
+func (_mr *MockConnectionParametersManagerMockRecorder) SetFromMap(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "SetFromMap", reflect.TypeOf((*MockConnectionParametersManager)(nil).SetFromMap), arg0)
+}
+
+// GetHelloMap mocks base method
 func (_m *MockConnectionParametersManager) GetHelloMap() (map[handshake.Tag][]byte, error) {
 	ret := _m.ctrl.Call(_m, "GetHelloMap")
 	ret0, _ := ret[0].(map[handshake.Tag][]byte)
@@ -39,116 +55,127 @@ func (_m *MockConnectionParametersManager) GetHelloMap() (map[handshake.Tag][]by
 	return ret0, ret1
 }
 
-func (_mr *_MockConnectionParametersManagerRecorder) GetHelloMap() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetHelloMap")
-}
-
-func (_m *MockConnectionParametersManager) GetIdleConnectionStateLifetime() time.Duration {
-	ret := _m.ctrl.Call(_m, "GetIdleConnectionStateLifetime")
-	ret0, _ := ret[0].(time.Duration)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetIdleConnectionStateLifetime() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetIdleConnectionStateLifetime")
-}
-
-func (_m *MockConnectionParametersManager) GetMaxIncomingStreams() uint32 {
-	ret := _m.ctrl.Call(_m, "GetMaxIncomingStreams")
-	ret0, _ := ret[0].(uint32)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetMaxIncomingStreams() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetMaxIncomingStreams")
-}
-
-func (_m *MockConnectionParametersManager) GetMaxOutgoingStreams() uint32 {
-	ret := _m.ctrl.Call(_m, "GetMaxOutgoingStreams")
-	ret0, _ := ret[0].(uint32)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetMaxOutgoingStreams() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetMaxOutgoingStreams")
-}
-
-func (_m *MockConnectionParametersManager) GetMaxReceiveConnectionFlowControlWindow() protocol.ByteCount {
-	ret := _m.ctrl.Call(_m, "GetMaxReceiveConnectionFlowControlWindow")
-	ret0, _ := ret[0].(protocol.ByteCount)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetMaxReceiveConnectionFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetMaxReceiveConnectionFlowControlWindow")
-}
-
-func (_m *MockConnectionParametersManager) GetMaxReceiveStreamFlowControlWindow() protocol.ByteCount {
-	ret := _m.ctrl.Call(_m, "GetMaxReceiveStreamFlowControlWindow")
-	ret0, _ := ret[0].(protocol.ByteCount)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetMaxReceiveStreamFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetMaxReceiveStreamFlowControlWindow")
-}
-
-func (_m *MockConnectionParametersManager) GetReceiveConnectionFlowControlWindow() protocol.ByteCount {
-	ret := _m.ctrl.Call(_m, "GetReceiveConnectionFlowControlWindow")
-	ret0, _ := ret[0].(protocol.ByteCount)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetReceiveConnectionFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetReceiveConnectionFlowControlWindow")
-}
-
-func (_m *MockConnectionParametersManager) GetReceiveStreamFlowControlWindow() protocol.ByteCount {
-	ret := _m.ctrl.Call(_m, "GetReceiveStreamFlowControlWindow")
-	ret0, _ := ret[0].(protocol.ByteCount)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetReceiveStreamFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetReceiveStreamFlowControlWindow")
-}
-
-func (_m *MockConnectionParametersManager) GetSendConnectionFlowControlWindow() protocol.ByteCount {
-	ret := _m.ctrl.Call(_m, "GetSendConnectionFlowControlWindow")
-	ret0, _ := ret[0].(protocol.ByteCount)
-	return ret0
-}
-
-func (_mr *_MockConnectionParametersManagerRecorder) GetSendConnectionFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetSendConnectionFlowControlWindow")
+// GetHelloMap indicates an expected call of GetHelloMap
+func (_mr *MockConnectionParametersManagerMockRecorder) GetHelloMap() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetHelloMap", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetHelloMap))
 }
 
+// GetSendStreamFlowControlWindow mocks base method
 func (_m *MockConnectionParametersManager) GetSendStreamFlowControlWindow() protocol.ByteCount {
 	ret := _m.ctrl.Call(_m, "GetSendStreamFlowControlWindow")
 	ret0, _ := ret[0].(protocol.ByteCount)
 	return ret0
 }
 
-func (_mr *_MockConnectionParametersManagerRecorder) GetSendStreamFlowControlWindow() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetSendStreamFlowControlWindow")
+// GetSendStreamFlowControlWindow indicates an expected call of GetSendStreamFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetSendStreamFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetSendStreamFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetSendStreamFlowControlWindow))
 }
 
-func (_m *MockConnectionParametersManager) SetFromMap(_param0 map[handshake.Tag][]byte) error {
-	ret := _m.ctrl.Call(_m, "SetFromMap", _param0)
-	ret0, _ := ret[0].(error)
+// GetSendConnectionFlowControlWindow mocks base method
+func (_m *MockConnectionParametersManager) GetSendConnectionFlowControlWindow() protocol.ByteCount {
+	ret := _m.ctrl.Call(_m, "GetSendConnectionFlowControlWindow")
+	ret0, _ := ret[0].(protocol.ByteCount)
 	return ret0
 }
 
-func (_mr *_MockConnectionParametersManagerRecorder) SetFromMap(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SetFromMap", arg0)
+// GetSendConnectionFlowControlWindow indicates an expected call of GetSendConnectionFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetSendConnectionFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetSendConnectionFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetSendConnectionFlowControlWindow))
 }
 
+// GetReceiveStreamFlowControlWindow mocks base method
+func (_m *MockConnectionParametersManager) GetReceiveStreamFlowControlWindow() protocol.ByteCount {
+	ret := _m.ctrl.Call(_m, "GetReceiveStreamFlowControlWindow")
+	ret0, _ := ret[0].(protocol.ByteCount)
+	return ret0
+}
+
+// GetReceiveStreamFlowControlWindow indicates an expected call of GetReceiveStreamFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetReceiveStreamFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetReceiveStreamFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetReceiveStreamFlowControlWindow))
+}
+
+// GetMaxReceiveStreamFlowControlWindow mocks base method
+func (_m *MockConnectionParametersManager) GetMaxReceiveStreamFlowControlWindow() protocol.ByteCount {
+	ret := _m.ctrl.Call(_m, "GetMaxReceiveStreamFlowControlWindow")
+	ret0, _ := ret[0].(protocol.ByteCount)
+	return ret0
+}
+
+// GetMaxReceiveStreamFlowControlWindow indicates an expected call of GetMaxReceiveStreamFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetMaxReceiveStreamFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetMaxReceiveStreamFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetMaxReceiveStreamFlowControlWindow))
+}
+
+// GetReceiveConnectionFlowControlWindow mocks base method
+func (_m *MockConnectionParametersManager) GetReceiveConnectionFlowControlWindow() protocol.ByteCount {
+	ret := _m.ctrl.Call(_m, "GetReceiveConnectionFlowControlWindow")
+	ret0, _ := ret[0].(protocol.ByteCount)
+	return ret0
+}
+
+// GetReceiveConnectionFlowControlWindow indicates an expected call of GetReceiveConnectionFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetReceiveConnectionFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetReceiveConnectionFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetReceiveConnectionFlowControlWindow))
+}
+
+// GetMaxReceiveConnectionFlowControlWindow mocks base method
+func (_m *MockConnectionParametersManager) GetMaxReceiveConnectionFlowControlWindow() protocol.ByteCount {
+	ret := _m.ctrl.Call(_m, "GetMaxReceiveConnectionFlowControlWindow")
+	ret0, _ := ret[0].(protocol.ByteCount)
+	return ret0
+}
+
+// GetMaxReceiveConnectionFlowControlWindow indicates an expected call of GetMaxReceiveConnectionFlowControlWindow
+func (_mr *MockConnectionParametersManagerMockRecorder) GetMaxReceiveConnectionFlowControlWindow() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetMaxReceiveConnectionFlowControlWindow", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetMaxReceiveConnectionFlowControlWindow))
+}
+
+// GetMaxOutgoingStreams mocks base method
+func (_m *MockConnectionParametersManager) GetMaxOutgoingStreams() uint32 {
+	ret := _m.ctrl.Call(_m, "GetMaxOutgoingStreams")
+	ret0, _ := ret[0].(uint32)
+	return ret0
+}
+
+// GetMaxOutgoingStreams indicates an expected call of GetMaxOutgoingStreams
+func (_mr *MockConnectionParametersManagerMockRecorder) GetMaxOutgoingStreams() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetMaxOutgoingStreams", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetMaxOutgoingStreams))
+}
+
+// GetMaxIncomingStreams mocks base method
+func (_m *MockConnectionParametersManager) GetMaxIncomingStreams() uint32 {
+	ret := _m.ctrl.Call(_m, "GetMaxIncomingStreams")
+	ret0, _ := ret[0].(uint32)
+	return ret0
+}
+
+// GetMaxIncomingStreams indicates an expected call of GetMaxIncomingStreams
+func (_mr *MockConnectionParametersManagerMockRecorder) GetMaxIncomingStreams() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetMaxIncomingStreams", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetMaxIncomingStreams))
+}
+
+// GetIdleConnectionStateLifetime mocks base method
+func (_m *MockConnectionParametersManager) GetIdleConnectionStateLifetime() time.Duration {
+	ret := _m.ctrl.Call(_m, "GetIdleConnectionStateLifetime")
+	ret0, _ := ret[0].(time.Duration)
+	return ret0
+}
+
+// GetIdleConnectionStateLifetime indicates an expected call of GetIdleConnectionStateLifetime
+func (_mr *MockConnectionParametersManagerMockRecorder) GetIdleConnectionStateLifetime() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetIdleConnectionStateLifetime", reflect.TypeOf((*MockConnectionParametersManager)(nil).GetIdleConnectionStateLifetime))
+}
+
+// TruncateConnectionID mocks base method
 func (_m *MockConnectionParametersManager) TruncateConnectionID() bool {
 	ret := _m.ctrl.Call(_m, "TruncateConnectionID")
 	ret0, _ := ret[0].(bool)
 	return ret0
 }
 
-func (_mr *_MockConnectionParametersManagerRecorder) TruncateConnectionID() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "TruncateConnectionID")
+// TruncateConnectionID indicates an expected call of TruncateConnectionID
+func (_mr *MockConnectionParametersManagerMockRecorder) TruncateConnectionID() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "TruncateConnectionID", reflect.TypeOf((*MockConnectionParametersManager)(nil).TruncateConnectionID))
 }
diff --git a/internal/mocks/gen.go b/internal/mocks/gen.go
index 7e0cc7cc..3cea6fa4 100644
--- a/internal/mocks/gen.go
+++ b/internal/mocks/gen.go
@@ -1,4 +1,8 @@
 package mocks
 
-//go:generate mockgen -destination mocks_fc/flow_control_manager.go -package mocks_fc github.com/lucas-clemente/quic-go/internal/flowcontrol FlowControlManager
-//go:generate mockgen -destination cpm.go -package mocks github.com/lucas-clemente/quic-go/handshake ConnectionParametersManager
+// mockgen source mode doesn't properly recognize structs defined in the same package
+// so we have to use sed to correct for that
+
+//go:generate sh -c "mockgen -package mocks_fc -source ../flowcontrol/interface.go | sed \"s/\\[\\]WindowUpdate/[]flowcontrol.WindowUpdate/g\" > mocks_fc/flow_control_manager.go"
+//go:generate sh -c "mockgen -package mocks -source ../handshake/connection_parameters_manager.go | sed \"s/\\[Tag\\]/[handshake.Tag]/g\" > cpm.go"
+//go:generate sh -c "goimports -w ."
diff --git a/internal/mocks/mocks_fc/flow_control_manager.go b/internal/mocks/mocks_fc/flow_control_manager.go
index 490fd9ca..e0f1d213 100644
--- a/internal/mocks/mocks_fc/flow_control_manager.go
+++ b/internal/mocks/mocks_fc/flow_control_manager.go
@@ -1,140 +1,166 @@
-// Automatically generated by MockGen. DO NOT EDIT!
-// Source: github.com/lucas-clemente/quic-go/internal/flowcontrol (interfaces: FlowControlManager)
+// Code generated by MockGen. DO NOT EDIT.
+// Source: ../flowcontrol/interface.go
 
 package mocks_fc
 
 import (
+	reflect "reflect"
+
 	gomock "github.com/golang/mock/gomock"
-	flowcontrol "github.com/lucas-clemente/quic-go/internal/flowcontrol"
+	"github.com/lucas-clemente/quic-go/internal/flowcontrol"
 	protocol "github.com/lucas-clemente/quic-go/internal/protocol"
 )
 
-// Mock of FlowControlManager interface
+// MockFlowControlManager is a mock of FlowControlManager interface
 type MockFlowControlManager struct {
 	ctrl     *gomock.Controller
-	recorder *_MockFlowControlManagerRecorder
+	recorder *MockFlowControlManagerMockRecorder
 }
 
-// Recorder for MockFlowControlManager (not exported)
-type _MockFlowControlManagerRecorder struct {
+// MockFlowControlManagerMockRecorder is the mock recorder for MockFlowControlManager
+type MockFlowControlManagerMockRecorder struct {
 	mock *MockFlowControlManager
 }
 
+// NewMockFlowControlManager creates a new mock instance
 func NewMockFlowControlManager(ctrl *gomock.Controller) *MockFlowControlManager {
 	mock := &MockFlowControlManager{ctrl: ctrl}
-	mock.recorder = &_MockFlowControlManagerRecorder{mock}
+	mock.recorder = &MockFlowControlManagerMockRecorder{mock}
 	return mock
 }
 
-func (_m *MockFlowControlManager) EXPECT() *_MockFlowControlManagerRecorder {
+// EXPECT returns an object that allows the caller to indicate expected use
+func (_m *MockFlowControlManager) EXPECT() *MockFlowControlManagerMockRecorder {
 	return _m.recorder
 }
 
-func (_m *MockFlowControlManager) AddBytesRead(_param0 protocol.StreamID, _param1 protocol.ByteCount) error {
-	ret := _m.ctrl.Call(_m, "AddBytesRead", _param0, _param1)
+// NewStream mocks base method
+func (_m *MockFlowControlManager) NewStream(streamID protocol.StreamID, contributesToConnectionFlow bool) {
+	_m.ctrl.Call(_m, "NewStream", streamID, contributesToConnectionFlow)
+}
+
+// NewStream indicates an expected call of NewStream
+func (_mr *MockFlowControlManagerMockRecorder) NewStream(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "NewStream", reflect.TypeOf((*MockFlowControlManager)(nil).NewStream), arg0, arg1)
+}
+
+// RemoveStream mocks base method
+func (_m *MockFlowControlManager) RemoveStream(streamID protocol.StreamID) {
+	_m.ctrl.Call(_m, "RemoveStream", streamID)
+}
+
+// RemoveStream indicates an expected call of RemoveStream
+func (_mr *MockFlowControlManagerMockRecorder) RemoveStream(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "RemoveStream", reflect.TypeOf((*MockFlowControlManager)(nil).RemoveStream), arg0)
+}
+
+// ResetStream mocks base method
+func (_m *MockFlowControlManager) ResetStream(streamID protocol.StreamID, byteOffset protocol.ByteCount) error {
+	ret := _m.ctrl.Call(_m, "ResetStream", streamID, byteOffset)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockFlowControlManagerRecorder) AddBytesRead(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AddBytesRead", arg0, arg1)
+// ResetStream indicates an expected call of ResetStream
+func (_mr *MockFlowControlManagerMockRecorder) ResetStream(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "ResetStream", reflect.TypeOf((*MockFlowControlManager)(nil).ResetStream), arg0, arg1)
 }
 
-func (_m *MockFlowControlManager) AddBytesSent(_param0 protocol.StreamID, _param1 protocol.ByteCount) error {
-	ret := _m.ctrl.Call(_m, "AddBytesSent", _param0, _param1)
+// UpdateHighestReceived mocks base method
+func (_m *MockFlowControlManager) UpdateHighestReceived(streamID protocol.StreamID, byteOffset protocol.ByteCount) error {
+	ret := _m.ctrl.Call(_m, "UpdateHighestReceived", streamID, byteOffset)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-func (_mr *_MockFlowControlManagerRecorder) AddBytesSent(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "AddBytesSent", arg0, arg1)
+// UpdateHighestReceived indicates an expected call of UpdateHighestReceived
+func (_mr *MockFlowControlManagerMockRecorder) UpdateHighestReceived(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "UpdateHighestReceived", reflect.TypeOf((*MockFlowControlManager)(nil).UpdateHighestReceived), arg0, arg1)
 }
 
-func (_m *MockFlowControlManager) GetReceiveWindow(_param0 protocol.StreamID) (protocol.ByteCount, error) {
-	ret := _m.ctrl.Call(_m, "GetReceiveWindow", _param0)
-	ret0, _ := ret[0].(protocol.ByteCount)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
+// AddBytesRead mocks base method
+func (_m *MockFlowControlManager) AddBytesRead(streamID protocol.StreamID, n protocol.ByteCount) error {
+	ret := _m.ctrl.Call(_m, "AddBytesRead", streamID, n)
+	ret0, _ := ret[0].(error)
+	return ret0
 }
 
-func (_mr *_MockFlowControlManagerRecorder) GetReceiveWindow(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetReceiveWindow", arg0)
+// AddBytesRead indicates an expected call of AddBytesRead
+func (_mr *MockFlowControlManagerMockRecorder) AddBytesRead(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "AddBytesRead", reflect.TypeOf((*MockFlowControlManager)(nil).AddBytesRead), arg0, arg1)
 }
 
+// GetWindowUpdates mocks base method
 func (_m *MockFlowControlManager) GetWindowUpdates() []flowcontrol.WindowUpdate {
 	ret := _m.ctrl.Call(_m, "GetWindowUpdates")
 	ret0, _ := ret[0].([]flowcontrol.WindowUpdate)
 	return ret0
 }
 
-func (_mr *_MockFlowControlManagerRecorder) GetWindowUpdates() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "GetWindowUpdates")
+// GetWindowUpdates indicates an expected call of GetWindowUpdates
+func (_mr *MockFlowControlManagerMockRecorder) GetWindowUpdates() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetWindowUpdates", reflect.TypeOf((*MockFlowControlManager)(nil).GetWindowUpdates))
 }
 
-func (_m *MockFlowControlManager) NewStream(_param0 protocol.StreamID, _param1 bool) {
-	_m.ctrl.Call(_m, "NewStream", _param0, _param1)
+// GetReceiveWindow mocks base method
+func (_m *MockFlowControlManager) GetReceiveWindow(streamID protocol.StreamID) (protocol.ByteCount, error) {
+	ret := _m.ctrl.Call(_m, "GetReceiveWindow", streamID)
+	ret0, _ := ret[0].(protocol.ByteCount)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
 }
 
-func (_mr *_MockFlowControlManagerRecorder) NewStream(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "NewStream", arg0, arg1)
+// GetReceiveWindow indicates an expected call of GetReceiveWindow
+func (_mr *MockFlowControlManagerMockRecorder) GetReceiveWindow(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "GetReceiveWindow", reflect.TypeOf((*MockFlowControlManager)(nil).GetReceiveWindow), arg0)
 }
 
+// AddBytesSent mocks base method
+func (_m *MockFlowControlManager) AddBytesSent(streamID protocol.StreamID, n protocol.ByteCount) error {
+	ret := _m.ctrl.Call(_m, "AddBytesSent", streamID, n)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// AddBytesSent indicates an expected call of AddBytesSent
+func (_mr *MockFlowControlManagerMockRecorder) AddBytesSent(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "AddBytesSent", reflect.TypeOf((*MockFlowControlManager)(nil).AddBytesSent), arg0, arg1)
+}
+
+// SendWindowSize mocks base method
+func (_m *MockFlowControlManager) SendWindowSize(streamID protocol.StreamID) (protocol.ByteCount, error) {
+	ret := _m.ctrl.Call(_m, "SendWindowSize", streamID)
+	ret0, _ := ret[0].(protocol.ByteCount)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SendWindowSize indicates an expected call of SendWindowSize
+func (_mr *MockFlowControlManagerMockRecorder) SendWindowSize(arg0 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "SendWindowSize", reflect.TypeOf((*MockFlowControlManager)(nil).SendWindowSize), arg0)
+}
+
+// RemainingConnectionWindowSize mocks base method
 func (_m *MockFlowControlManager) RemainingConnectionWindowSize() protocol.ByteCount {
 	ret := _m.ctrl.Call(_m, "RemainingConnectionWindowSize")
 	ret0, _ := ret[0].(protocol.ByteCount)
 	return ret0
 }
 
-func (_mr *_MockFlowControlManagerRecorder) RemainingConnectionWindowSize() *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "RemainingConnectionWindowSize")
+// RemainingConnectionWindowSize indicates an expected call of RemainingConnectionWindowSize
+func (_mr *MockFlowControlManagerMockRecorder) RemainingConnectionWindowSize() *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "RemainingConnectionWindowSize", reflect.TypeOf((*MockFlowControlManager)(nil).RemainingConnectionWindowSize))
 }
 
-func (_m *MockFlowControlManager) RemoveStream(_param0 protocol.StreamID) {
-	_m.ctrl.Call(_m, "RemoveStream", _param0)
-}
-
-func (_mr *_MockFlowControlManagerRecorder) RemoveStream(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "RemoveStream", arg0)
-}
-
-func (_m *MockFlowControlManager) ResetStream(_param0 protocol.StreamID, _param1 protocol.ByteCount) error {
-	ret := _m.ctrl.Call(_m, "ResetStream", _param0, _param1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockFlowControlManagerRecorder) ResetStream(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "ResetStream", arg0, arg1)
-}
-
-func (_m *MockFlowControlManager) SendWindowSize(_param0 protocol.StreamID) (protocol.ByteCount, error) {
-	ret := _m.ctrl.Call(_m, "SendWindowSize", _param0)
-	ret0, _ := ret[0].(protocol.ByteCount)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-func (_mr *_MockFlowControlManagerRecorder) SendWindowSize(arg0 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "SendWindowSize", arg0)
-}
-
-func (_m *MockFlowControlManager) UpdateHighestReceived(_param0 protocol.StreamID, _param1 protocol.ByteCount) error {
-	ret := _m.ctrl.Call(_m, "UpdateHighestReceived", _param0, _param1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-func (_mr *_MockFlowControlManagerRecorder) UpdateHighestReceived(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateHighestReceived", arg0, arg1)
-}
-
-func (_m *MockFlowControlManager) UpdateWindow(_param0 protocol.StreamID, _param1 protocol.ByteCount) (bool, error) {
-	ret := _m.ctrl.Call(_m, "UpdateWindow", _param0, _param1)
+// UpdateWindow mocks base method
+func (_m *MockFlowControlManager) UpdateWindow(streamID protocol.StreamID, offset protocol.ByteCount) (bool, error) {
+	ret := _m.ctrl.Call(_m, "UpdateWindow", streamID, offset)
 	ret0, _ := ret[0].(bool)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-func (_mr *_MockFlowControlManagerRecorder) UpdateWindow(arg0, arg1 interface{}) *gomock.Call {
-	return _mr.mock.ctrl.RecordCall(_mr.mock, "UpdateWindow", arg0, arg1)
+// UpdateWindow indicates an expected call of UpdateWindow
+func (_mr *MockFlowControlManagerMockRecorder) UpdateWindow(arg0, arg1 interface{}) *gomock.Call {
+	return _mr.mock.ctrl.RecordCallWithMethodType(_mr.mock, "UpdateWindow", reflect.TypeOf((*MockFlowControlManager)(nil).UpdateWindow), arg0, arg1)
 }