diff --git a/quic/core/quic_crypto_stream.cc b/quic/core/quic_crypto_stream.cc
index da5d15f..b368b61 100644
--- a/quic/core/quic_crypto_stream.cc
+++ b/quic/core/quic_crypto_stream.cc
@@ -173,7 +173,7 @@
     return;
   }
 
-  size_t bytes_consumed = stream_delegate()->WriteCryptoData(
+  size_t bytes_consumed = stream_delegate()->SendCryptoData(
       level, data.length(), offset, NOT_RETRANSMISSION);
   send_buffer->OnStreamDataConsumed(bytes_consumed);
 }
@@ -248,7 +248,7 @@
     QuicStreamSendBuffer* send_buffer = &substreams_[level].send_buffer;
     while (send_buffer->HasPendingRetransmission()) {
       auto pending = send_buffer->NextPendingRetransmission();
-      size_t bytes_consumed = stream_delegate()->WriteCryptoData(
+      size_t bytes_consumed = stream_delegate()->SendCryptoData(
           level, pending.length, pending.offset, HANDSHAKE_RETRANSMISSION);
       send_buffer->OnStreamDataRetransmitted(pending.offset, bytes_consumed);
       if (bytes_consumed < pending.length) {
@@ -434,7 +434,7 @@
   for (const auto& interval : retransmission) {
     size_t retransmission_offset = interval.min();
     size_t retransmission_length = interval.max() - interval.min();
-    size_t bytes_consumed = stream_delegate()->WriteCryptoData(
+    size_t bytes_consumed = stream_delegate()->SendCryptoData(
         crypto_frame->level, retransmission_length, retransmission_offset,
         type);
     send_buffer->OnStreamDataRetransmitted(retransmission_offset,
@@ -457,7 +457,7 @@
       // No buffered data for this encryption level.
       continue;
     }
-    size_t bytes_consumed = stream_delegate()->WriteCryptoData(
+    size_t bytes_consumed = stream_delegate()->SendCryptoData(
         level, data_length, send_buffer->stream_bytes_written(),
         NOT_RETRANSMISSION);
     send_buffer->OnStreamDataConsumed(bytes_consumed);
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index de61dfe..e6f1aa7 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -744,10 +744,10 @@
   return data;
 }
 
-size_t QuicSession::WriteCryptoData(EncryptionLevel level,
-                                    size_t write_length,
-                                    QuicStreamOffset offset,
-                                    TransmissionType /*type*/) {
+size_t QuicSession::SendCryptoData(EncryptionLevel level,
+                                   size_t write_length,
+                                   QuicStreamOffset offset,
+                                   TransmissionType /*type*/) {
   DCHECK(QuicVersionUsesCryptoFrames(transport_version()));
   // TODO(b/136274541): Set the transmission type here.
   const auto current_level = connection()->encryption_level();
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index 65d2226..61ab752 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -277,10 +277,10 @@
       TransmissionType type,
       quiche::QuicheOptional<EncryptionLevel> level) override;
 
-  size_t WriteCryptoData(EncryptionLevel level,
-                         size_t write_length,
-                         QuicStreamOffset offset,
-                         TransmissionType type) override;
+  size_t SendCryptoData(EncryptionLevel level,
+                        size_t write_length,
+                        QuicStreamOffset offset,
+                        TransmissionType type) override;
 
   // Called by the QuicCryptoStream when a handshake message is sent.
   virtual void OnCryptoHandshakeMessageSent(
diff --git a/quic/core/stream_delegate_interface.h b/quic/core/stream_delegate_interface.h
index 3fc584d..de77bad 100644
--- a/quic/core/stream_delegate_interface.h
+++ b/quic/core/stream_delegate_interface.h
@@ -32,10 +32,10 @@
       TransmissionType type,
       quiche::QuicheOptional<EncryptionLevel> level) = 0;
   // Called to write crypto data.
-  virtual size_t WriteCryptoData(EncryptionLevel level,
-                                 size_t write_length,
-                                 QuicStreamOffset offset,
-                                 TransmissionType type) = 0;
+  virtual size_t SendCryptoData(EncryptionLevel level,
+                                size_t write_length,
+                                QuicStreamOffset offset,
+                                TransmissionType type) = 0;
   // Called on stream creation.
   virtual void RegisterStreamPriority(
       QuicStreamId id,
