network: Rename flush (clearly distinguish flushing IO and writing flush packets)

18 files changed, 112 insertions, 112 deletions

diff --git a/network/protocol/pktline/chunk_writer_write_and_read_from_test.go b/network/protocol/pktline/chunk_writer_write_and_read_from_test.go
index c3e2bafb..efe19e23 100644
--- a/network/protocol/pktline/chunk_writer_write_and_read_from_test.go
+++ b/network/protocol/pktline/chunk_writer_write_and_read_from_test.go
@@ -29,9 +29,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) {
 		t.Fatalf("Write n=%d, want 7", n)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0007abc0007def0005g"; got != want {
@@ -49,9 +49,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) {
 		t.Fatalf("ReadFrom n=%d, want 4", rn)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0007wxy0005z"; got != want {
diff --git a/network/protocol/pktline/decoder_resync_after_over_max_data_test.go b/network/protocol/pktline/decoder_resync_after_over_max_data_test.go
index d4146147..42a7572e 100644
--- a/network/protocol/pktline/decoder_resync_after_over_max_data_test.go
+++ b/network/protocol/pktline/decoder_resync_after_over_max_data_test.go
@@ -27,9 +27,9 @@ func TestDecoderResyncAfterOverMaxData(t *testing.T) {
 		t.Fatalf("WriteData #2: %v", err)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	dec := pktline.NewDecoder(bytes.NewReader(b.Bytes()), pktline.ReadOptions{})
diff --git a/network/protocol/pktline/encoder.go b/network/protocol/pktline/encoder.go
index 3d92ca19..4c7dcd6e 100644
--- a/network/protocol/pktline/encoder.go
+++ b/network/protocol/pktline/encoder.go
@@ -87,36 +87,36 @@ func (e *Encoder) WriteString(s string) (int, error) {
 	return len(s), nil
 }
 
-// WriteFlush writes control frame 0000 (flush-pkt).
-func (e *Encoder) WriteFlush() error {
+// WriteFlushPacket writes control frame 0000 (flush-pkt).
+func (e *Encoder) WriteFlushPacket() error {
 	return e.writeControl(0)
 }
 
-// WriteDelim writes control frame 0001 (delim-pkt).
-func (e *Encoder) WriteDelim() error {
+// WriteDelimPacket writes control frame 0001 (delim-pkt).
+func (e *Encoder) WriteDelimPacket() error {
 	return e.writeControl(1)
 }
 
-// WriteResponseEnd writes control frame 0002 (response-end-pkt).
-func (e *Encoder) WriteResponseEnd() error {
+// WriteResponseEndPacket writes control frame 0002 (response-end-pkt).
+func (e *Encoder) WriteResponseEndPacket() error {
 	return e.writeControl(2)
 }
 
-// FlushIO flushes buffered output in the underlying transport.
+// Flush flushes buffered output in the underlying transport.
 //
-// FlushIO does not emit any pkt-line control frame.
-func (e *Encoder) FlushIO() error {
+// Flush does not emit any pkt-line control frame.
+func (e *Encoder) Flush() error {
 	return e.w.Flush()
 }
 
-// WriteFlushAndFlushIO writes a flush-pkt (0000) then flushes transport I/O.
-func (e *Encoder) WriteFlushAndFlushIO() error {
-	err := e.WriteFlush()
+// WriteFlushPacketAndFlush writes a flush-pkt (0000) then flushes transport I/O.
+func (e *Encoder) WriteFlushPacketAndFlush() error {
+	err := e.WriteFlushPacket()
 	if err != nil {
 		return err
 	}
 
-	return e.FlushIO()
+	return e.Flush()
 }
 
 func (e *Encoder) writeControl(n int) error {
diff --git a/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go b/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go
index 3d13bc7d..d0f26878 100644
--- a/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go
+++ b/network/protocol/pktline/encoder_buffered_flush_and_f_flush_test.go
@@ -25,9 +25,9 @@ func TestEncoderBufferedFlushAndFFlush(t *testing.T) {
 		t.Fatalf("unexpected immediate output: %q", out.String())
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if out.String() != "0005x" {
@@ -39,9 +39,9 @@ func TestEncoderBufferedFlushAndFFlush(t *testing.T) {
 
 	enc = pktline.NewEncoder(bw)
 
-	err = enc.WriteFlushAndFlushIO()
+	err = enc.WriteFlushPacketAndFlush()
 	if err != nil {
-		t.Fatalf("WriteFlushAndFlushIO: %v", err)
+		t.Fatalf("WriteFlushPacketAndFlush: %v", err)
 	}
 
 	if out.String() != "0000" {
diff --git a/network/protocol/pktline/encoder_buffered_flush_behavior_test.go b/network/protocol/pktline/encoder_buffered_flush_behavior_test.go
index 9daba241..b6d14b4b 100644
--- a/network/protocol/pktline/encoder_buffered_flush_behavior_test.go
+++ b/network/protocol/pktline/encoder_buffered_flush_behavior_test.go
@@ -21,18 +21,18 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlush()
+	err = enc.WriteFlushPacket()
 	if err != nil {
-		t.Fatalf("WriteFlush: %v", err)
+		t.Fatalf("WriteFlushPacket: %v", err)
 	}
 
 	if out.Len() != 0 {
-		t.Fatalf("WriteFlush should not flush I/O, got %q", out.String())
+		t.Fatalf("WriteFlushPacket should not flush I/O, got %q", out.String())
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0009hello0000"; got != want {
@@ -48,18 +48,18 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlush()
+	err = enc.WriteFlushPacket()
 	if err != nil {
-		t.Fatalf("WriteFlush: %v", err)
+		t.Fatalf("WriteFlushPacket: %v", err)
 	}
 
 	if out.Len() != 0 {
-		t.Fatalf("WriteFlush should not flush I/O, got %q", out.String())
+		t.Fatalf("WriteFlushPacket should not flush I/O, got %q", out.String())
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0006ok0000"; got != want {
@@ -75,9 +75,9 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlushAndFlushIO()
+	err = enc.WriteFlushPacketAndFlush()
 	if err != nil {
-		t.Fatalf("WriteFlushAndFlushIO: %v", err)
+		t.Fatalf("WriteFlushPacketAndFlush: %v", err)
 	}
 
 	if got, want := out.String(), "0006yo0000"; got != want {
diff --git a/network/protocol/pktline/encoder_writes_frames_test.go b/network/protocol/pktline/encoder_writes_frames_test.go
index 9e4275a1..1922b277 100644
--- a/network/protocol/pktline/encoder_writes_frames_test.go
+++ b/network/protocol/pktline/encoder_writes_frames_test.go
@@ -22,24 +22,24 @@ func TestEncoderWritesFrames(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlush()
+	err = enc.WriteFlushPacket()
 	if err != nil {
-		t.Fatalf("WriteFlush: %v", err)
+		t.Fatalf("WriteFlushPacket: %v", err)
 	}
 
-	err = enc.WriteDelim()
+	err = enc.WriteDelimPacket()
 	if err != nil {
-		t.Fatalf("WriteDelim: %v", err)
+		t.Fatalf("WriteDelimPacket: %v", err)
 	}
 
-	err = enc.WriteResponseEnd()
+	err = enc.WriteResponseEndPacket()
 	if err != nil {
-		t.Fatalf("WriteResponseEnd: %v", err)
+		t.Fatalf("WriteResponseEndPacket: %v", err)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	got := b.String()
diff --git a/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go b/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go
index efde68b4..ef2b0fff 100644
--- a/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go
+++ b/network/protocol/sideband64k/chunk_writer_write_and_read_from_test.go
@@ -29,9 +29,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) {
 		t.Fatalf("Write n=%d, want 7", n)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0008\x02abc0008\x02def0006\x02g"; got != want {
@@ -49,9 +49,9 @@ func TestChunkWriterWriteAndReadFrom(t *testing.T) {
 		t.Fatalf("ReadFrom n=%d, want 4", rn)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "0008\x02wxy0006\x02z"; got != want {
diff --git a/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go b/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go
index c63b07f3..b0ae600a 100644
--- a/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go
+++ b/network/protocol/sideband64k/decoder_resync_after_over_max_data_test.go
@@ -27,9 +27,9 @@ func TestDecoderResyncAfterOverMaxData(t *testing.T) {
 		t.Fatalf("WriteData #2: %v", err)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	dec := sideband64k.NewDecoder(bytes.NewReader(b.Bytes()), sideband64k.ReadOptions{})
diff --git a/network/protocol/sideband64k/encoder.go b/network/protocol/sideband64k/encoder.go
index 8b48566d..53ca7064 100644
--- a/network/protocol/sideband64k/encoder.go
+++ b/network/protocol/sideband64k/encoder.go
@@ -69,29 +69,29 @@ func (e *Encoder) WriteError(p []byte) error {
 	return e.WriteBand(BandError, p)
 }
 
-// WriteFlush writes control frame 0000 (flush-pkt).
-func (e *Encoder) WriteFlush() error {
-	return e.enc.WriteFlush()
+// WriteFlushPacket writes control frame 0000 (flush-pkt).
+func (e *Encoder) WriteFlushPacket() error {
+	return e.enc.WriteFlushPacket()
 }
 
-// WriteDelim writes control frame 0001 (delim-pkt).
-func (e *Encoder) WriteDelim() error {
-	return e.enc.WriteDelim()
+// WriteDelimPacket writes control frame 0001 (delim-pkt).
+func (e *Encoder) WriteDelimPacket() error {
+	return e.enc.WriteDelimPacket()
 }
 
-// WriteResponseEnd writes control frame 0002 (response-end-pkt).
-func (e *Encoder) WriteResponseEnd() error {
-	return e.enc.WriteResponseEnd()
+// WriteResponseEndPacket writes control frame 0002 (response-end-pkt).
+func (e *Encoder) WriteResponseEndPacket() error {
+	return e.enc.WriteResponseEndPacket()
 }
 
-// FlushIO flushes buffered output in the underlying transport.
-func (e *Encoder) FlushIO() error {
-	return e.enc.FlushIO()
+// Flush flushes buffered output in the underlying transport.
+func (e *Encoder) Flush() error {
+	return e.enc.Flush()
 }
 
-// WriteFlushAndFlushIO writes a flush-pkt (0000) then flushes transport I/O.
-func (e *Encoder) WriteFlushAndFlushIO() error {
-	return e.enc.WriteFlushAndFlushIO()
+// WriteFlushPacketAndFlush writes a flush-pkt (0000) then flushes transport I/O.
+func (e *Encoder) WriteFlushPacketAndFlush() error {
+	return e.enc.WriteFlushPacketAndFlush()
 }
 
 func (e *Encoder) effectiveMaxData() int {
diff --git a/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go b/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go
index 29f87d01..83103ea3 100644
--- a/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go
+++ b/network/protocol/sideband64k/encoder_buffered_flush_behavior_test.go
@@ -21,18 +21,18 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlush()
+	err = enc.WriteFlushPacket()
 	if err != nil {
-		t.Fatalf("WriteFlush: %v", err)
+		t.Fatalf("WriteFlushPacket: %v", err)
 	}
 
 	if out.Len() != 0 {
-		t.Fatalf("WriteFlush should not flush I/O, got %q", out.String())
+		t.Fatalf("WriteFlushPacket should not flush I/O, got %q", out.String())
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	if got, want := out.String(), "000a\x01hello0000"; got != want {
@@ -48,9 +48,9 @@ func TestEncoderBufferedFlushBehavior(t *testing.T) {
 		t.Fatalf("WriteData: %v", err)
 	}
 
-	err = enc.WriteFlushAndFlushIO()
+	err = enc.WriteFlushPacketAndFlush()
 	if err != nil {
-		t.Fatalf("WriteFlushAndFlushIO: %v", err)
+		t.Fatalf("WriteFlushPacketAndFlush: %v", err)
 	}
 
 	if got, want := out.String(), "0007\x01yo0000"; got != want {
diff --git a/network/protocol/sideband64k/encoder_partial_write_test.go b/network/protocol/sideband64k/encoder_partial_write_test.go
index 8e35376a..97c8f762 100644
--- a/network/protocol/sideband64k/encoder_partial_write_test.go
+++ b/network/protocol/sideband64k/encoder_partial_write_test.go
@@ -19,9 +19,9 @@ func TestEncoderHandlesPartialWrites(t *testing.T) {
 		t.Fatalf("WriteProgress: %v", err)
 	}
 
-	err = enc.WriteFlushAndFlushIO()
+	err = enc.WriteFlushPacketAndFlush()
 	if err != nil {
-		t.Fatalf("WriteFlushAndFlushIO: %v", err)
+		t.Fatalf("WriteFlushPacketAndFlush: %v", err)
 	}
 
 	if got, want := dst.buf.String(), "0008\x02abc0000"; got != want {
diff --git a/network/protocol/sideband64k/encoder_writes_frames_test.go b/network/protocol/sideband64k/encoder_writes_frames_test.go
index 4541bf13..85fe5845 100644
--- a/network/protocol/sideband64k/encoder_writes_frames_test.go
+++ b/network/protocol/sideband64k/encoder_writes_frames_test.go
@@ -31,24 +31,24 @@ func TestEncoderWritesFrames(t *testing.T) {
 		t.Fatalf("WriteError: %v", err)
 	}
 
-	err = enc.WriteFlush()
+	err = enc.WriteFlushPacket()
 	if err != nil {
-		t.Fatalf("WriteFlush: %v", err)
+		t.Fatalf("WriteFlushPacket: %v", err)
 	}
 
-	err = enc.WriteDelim()
+	err = enc.WriteDelimPacket()
 	if err != nil {
-		t.Fatalf("WriteDelim: %v", err)
+		t.Fatalf("WriteDelimPacket: %v", err)
 	}
 
-	err = enc.WriteResponseEnd()
+	err = enc.WriteResponseEndPacket()
 	if err != nil {
-		t.Fatalf("WriteResponseEnd: %v", err)
+		t.Fatalf("WriteResponseEndPacket: %v", err)
 	}
 
-	err = enc.FlushIO()
+	err = enc.Flush()
 	if err != nil {
-		t.Fatalf("FlushIO: %v", err)
+		t.Fatalf("Flush: %v", err)
 	}
 
 	want := "0007\x01hi0007\x02ok0007\x03no000000010002"
diff --git a/network/protocol/v0v1/server/advertise.go b/network/protocol/v0v1/server/advertise.go
index be1b1f02..30468d1c 100644
--- a/network/protocol/v0v1/server/advertise.go
+++ b/network/protocol/v0v1/server/advertise.go
@@ -27,7 +27,7 @@ func (session *Session) AdvertiseRefs(ad Advertisement, capabilityTokens []strin
 			return err
 		}
 
-		return session.WriteFlush()
+		return session.WriteFlushPacket()
 	}
 
 	for i, entry := range refs {
@@ -51,5 +51,5 @@ func (session *Session) AdvertiseRefs(ad Advertisement, capabilityTokens []strin
 		}
 	}
 
-	return session.WriteFlush()
+	return session.WriteFlushPacket()
 }
diff --git a/network/protocol/v0v1/server/receivepack/parse_test.go b/network/protocol/v0v1/server/receivepack/parse_test.go
index 7c7cbe3b..3a891d3e 100644
--- a/network/protocol/v0v1/server/receivepack/parse_test.go
+++ b/network/protocol/v0v1/server/receivepack/parse_test.go
@@ -40,9 +40,9 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) {
 			t.Fatalf("WriteData(second): %v", err)
 		}
 
-		err = enc.WriteFlush()
+		err = enc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush(commands): %v", err)
+			t.Fatalf("WriteFlushPacket(commands): %v", err)
 		}
 
 		err = enc.WriteData([]byte("ci.skip\n"))
@@ -50,9 +50,9 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) {
 			t.Fatalf("WriteData(push-option): %v", err)
 		}
 
-		err = enc.WriteFlush()
+		err = enc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush(push-options): %v", err)
+			t.Fatalf("WriteFlushPacket(push-options): %v", err)
 		}
 
 		base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -111,9 +111,9 @@ func TestReadRequestDeleteOnlyDoesNotExpectPack(t *testing.T) {
 			t.Fatalf("WriteData: %v", err)
 		}
 
-		err = enc.WriteFlush()
+		err = enc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush: %v", err)
+			t.Fatalf("WriteFlushPacket: %v", err)
 		}
 
 		base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -159,9 +159,9 @@ func TestReadRequestRejectsUnsupportedCapability(t *testing.T) {
 			t.Fatalf("WriteData: %v", err)
 		}
 
-		err = enc.WriteFlush()
+		err = enc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush: %v", err)
+			t.Fatalf("WriteFlushPacket: %v", err)
 		}
 
 		base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
@@ -222,9 +222,9 @@ func TestReadRequestParsesPushCertificate(t *testing.T) {
 			}
 		}
 
-		err = enc.WriteFlush()
+		err = enc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush: %v", err)
+			t.Fatalf("WriteFlushPacket: %v", err)
 		}
 
 		base := common.NewSession(strings.NewReader(wire.String()), &bufferWriteFlusher{}, common.Options{
diff --git a/network/protocol/v0v1/server/receivepack/report_status.go b/network/protocol/v0v1/server/receivepack/report_status.go
index fbe4fb4f..d852a161 100644
--- a/network/protocol/v0v1/server/receivepack/report_status.go
+++ b/network/protocol/v0v1/server/receivepack/report_status.go
@@ -31,7 +31,7 @@ func (session *Session) WriteReportStatus(result ReportStatusResult) error {
 			}
 		}
 
-		return session.base.WriteFlush()
+		return session.base.WriteFlushPacket()
 	}
 
 	buf, err := pktline.AppendData(nil, fmt.Appendf(nil, "unpack %s\n", unpackResult))
@@ -60,7 +60,7 @@ func (session *Session) WriteReportStatus(result ReportStatusResult) error {
 		return err
 	}
 
-	return session.base.WriteFlush()
+	return session.base.WriteFlushPacket()
 }
 
 // WriteReportStatusV2 writes one report-status-v2 response.
@@ -120,7 +120,7 @@ func (session *Session) WriteReportStatusV2(result ReportStatusResult) error {
 			}
 		}
 
-		return session.base.WriteFlush()
+		return session.base.WriteFlushPacket()
 	}
 
 	buf, err := pktline.AppendData(nil, fmt.Appendf(nil, "unpack %s\n", unpackResult))
@@ -181,5 +181,5 @@ func (session *Session) WriteReportStatusV2(result ReportStatusResult) error {
 		return err
 	}
 
-	return session.base.WriteFlush()
+	return session.base.WriteFlushPacket()
 }
diff --git a/network/protocol/v0v1/server/receivepack/report_status_test.go b/network/protocol/v0v1/server/receivepack/report_status_test.go
index b9b116f6..697311de 100644
--- a/network/protocol/v0v1/server/receivepack/report_status_test.go
+++ b/network/protocol/v0v1/server/receivepack/report_status_test.go
@@ -65,9 +65,9 @@ func TestWriteReportStatusUsesSideBand64KWhenNegotiated(t *testing.T) {
 			t.Fatalf("WriteData(request): %v", err)
 		}
 
-		err = requestEnc.WriteFlush()
+		err = requestEnc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush(request): %v", err)
+			t.Fatalf("WriteFlushPacket(request): %v", err)
 		}
 
 		var out bufferWriteFlusher
@@ -249,9 +249,9 @@ func TestProgressWriterUsesSideBand64KWhenNegotiated(t *testing.T) {
 			t.Fatalf("WriteData(request): %v", err)
 		}
 
-		err = requestEnc.WriteFlush()
+		err = requestEnc.WriteFlushPacket()
 		if err != nil {
-			t.Fatalf("WriteFlush(request): %v", err)
+			t.Fatalf("WriteFlushPacket(request): %v", err)
 		}
 
 		var out bufferWriteFlusher
diff --git a/network/protocol/v0v1/server/session.go b/network/protocol/v0v1/server/session.go
index 0a4ecb53..45e14c92 100644
--- a/network/protocol/v0v1/server/session.go
+++ b/network/protocol/v0v1/server/session.go
@@ -79,22 +79,22 @@ func (session *Session) WriteError(p []byte) error {
 	return session.sideband.WriteError(p)
 }
 
-// WriteFlush writes one trailing flush packet.
-func (session *Session) WriteFlush() error {
+// WriteFlushPacket writes one trailing flush packet.
+func (session *Session) WriteFlushPacket() error {
 	if session.useSideBand {
-		return session.sideband.WriteFlush()
+		return session.sideband.WriteFlushPacket()
 	}
 
-	return session.enc.WriteFlush()
+	return session.enc.WriteFlushPacket()
 }
 
-// FlushIO flushes buffered transport output without emitting pkt-line frames.
-func (session *Session) FlushIO() error {
+// Flush flushes buffered transport output without emitting pkt-line frames.
+func (session *Session) Flush() error {
 	if session.useSideBand {
-		return session.sideband.FlushIO()
+		return session.sideband.Flush()
 	}
 
-	return session.enc.FlushIO()
+	return session.enc.Flush()
 }
 
 type flushWriter struct {
@@ -120,7 +120,7 @@ func (session *Session) ProgressWriter() iowrap.WriteFlusher {
 
 	return flushWriter{
 		writer: sideband64k.NewChunkWriter(session.sideband, sideband64k.BandProgress),
-		flush:  session.sideband.FlushIO,
+		flush:  session.sideband.Flush,
 	}
 }
 
diff --git a/network/receivepack/receivepack.go b/network/receivepack/receivepack.go
index 26fce24c..1e6e6d5f 100644
--- a/network/receivepack/receivepack.go
+++ b/network/receivepack/receivepack.go
@@ -79,7 +79,7 @@ func ReceivePack(
 		return err
 	}
 
-	err = base.FlushIO()
+	err = base.Flush()
 	if err != nil {
 		return err
 	}
@@ -140,5 +140,5 @@ func ReceivePack(
 		}
 	}
 
-	return base.FlushIO()
+	return base.Flush()
 }