diff --git a/stream_frame_sorter.go b/frame_sorter.go
similarity index 90%
rename from stream_frame_sorter.go
rename to frame_sorter.go
index 355b665d..47062c06 100644
--- a/stream_frame_sorter.go
+++ b/frame_sorter.go
@@ -7,7 +7,7 @@ import (
 	"github.com/lucas-clemente/quic-go/internal/utils"
 )
 
-type streamFrameSorter struct {
+type frameSorter struct {
 	queue       map[protocol.ByteCount][]byte
 	readPos     protocol.ByteCount
 	finalOffset protocol.ByteCount
@@ -16,8 +16,8 @@ type streamFrameSorter struct {
 
 var errDuplicateStreamData = errors.New("Duplicate Stream Data")
 
-func newStreamFrameSorter() *streamFrameSorter {
-	s := streamFrameSorter{
+func newFrameSorter() *frameSorter {
+	s := frameSorter{
 		gaps:        utils.NewByteIntervalList(),
 		queue:       make(map[protocol.ByteCount][]byte),
 		finalOffset: protocol.MaxByteCount,
@@ -26,7 +26,7 @@ func newStreamFrameSorter() *streamFrameSorter {
 	return &s
 }
 
-func (s *streamFrameSorter) Push(data []byte, offset protocol.ByteCount, fin bool) error {
+func (s *frameSorter) Push(data []byte, offset protocol.ByteCount, fin bool) error {
 	err := s.push(data, offset, fin)
 	if err == errDuplicateStreamData {
 		return nil
@@ -34,7 +34,7 @@ func (s *streamFrameSorter) Push(data []byte, offset protocol.ByteCount, fin boo
 	return err
 }
 
-func (s *streamFrameSorter) push(data []byte, offset protocol.ByteCount, fin bool) error {
+func (s *frameSorter) push(data []byte, offset protocol.ByteCount, fin bool) error {
 	if fin {
 		s.finalOffset = offset + protocol.ByteCount(len(data))
 	}
@@ -147,7 +147,7 @@ func (s *streamFrameSorter) push(data []byte, offset protocol.ByteCount, fin boo
 	return nil
 }
 
-func (s *streamFrameSorter) Pop() ([]byte /* data */, bool /* fin */) {
+func (s *frameSorter) Pop() ([]byte /* data */, bool /* fin */) {
 	data, ok := s.queue[s.readPos]
 	if !ok {
 		return nil, s.readPos >= s.finalOffset
diff --git a/stream_frame_sorter_test.go b/frame_sorter_test.go
similarity index 99%
rename from stream_frame_sorter_test.go
rename to frame_sorter_test.go
index e0379cfb..9def2100 100644
--- a/stream_frame_sorter_test.go
+++ b/frame_sorter_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 var _ = Describe("STREAM frame sorter", func() {
-	var s *streamFrameSorter
+	var s *frameSorter
 
 	checkGaps := func(expectedGaps []utils.ByteInterval) {
 		Expect(s.gaps.Len()).To(Equal(len(expectedGaps)))
@@ -22,7 +22,7 @@ var _ = Describe("STREAM frame sorter", func() {
 	}
 
 	BeforeEach(func() {
-		s = newStreamFrameSorter()
+		s = newFrameSorter()
 	})
 
 	It("head returns nil when empty", func() {
diff --git a/receive_stream.go b/receive_stream.go
index 3a96c395..43c7bcf6 100644
--- a/receive_stream.go
+++ b/receive_stream.go
@@ -27,7 +27,7 @@ type receiveStream struct {
 
 	sender streamSender
 
-	frameQueue *streamFrameSorter
+	frameQueue *frameSorter
 	readOffset protocol.ByteCount
 
 	currentFrame       []byte
@@ -63,7 +63,7 @@ func newReceiveStream(
 		streamID:       streamID,
 		sender:         sender,
 		flowController: flowController,
-		frameQueue:     newStreamFrameSorter(),
+		frameQueue:     newFrameSorter(),
 		readChan:       make(chan struct{}, 1),
 		version:        version,
 	}