diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 3ccbaaa..399ba13 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -834,8 +834,8 @@
   // This setting should never be set to false in public facing endpoints. It
   // can only be set to false if there is some other mechanism of preventing
   // amplification attacks, such as ICE (plus its a non-standard quic).
-  void set_fully_pad_crypto_hadshake_packets(bool new_value) {
-    packet_generator_.set_fully_pad_crypto_hadshake_packets(new_value);
+  void set_fully_pad_crypto_handshake_packets(bool new_value) {
+    packet_generator_.set_fully_pad_crypto_handshake_packets(new_value);
   }
 
   bool fully_pad_during_crypto_handshake() const {
diff --git a/quic/core/quic_crypto_client_handshaker.cc b/quic/core/quic_crypto_client_handshaker.cc
index a8a479e..d993049 100644
--- a/quic/core/quic_crypto_client_handshaker.cc
+++ b/quic/core/quic_crypto_client_handshaker.cc
@@ -279,7 +279,7 @@
     }
     next_state_ = STATE_RECV_REJ;
     chlo_hash_ = CryptoUtils::HashHandshakeMessage(out, Perspective::IS_CLIENT);
-    session()->connection()->set_fully_pad_crypto_hadshake_packets(
+    session()->connection()->set_fully_pad_crypto_handshake_packets(
         crypto_config_->pad_inchoate_hello());
     SendHandshakeMessage(out);
     return;
@@ -305,7 +305,7 @@
         *cached->proof_verify_details());
   }
   next_state_ = STATE_RECV_SHLO;
-  session()->connection()->set_fully_pad_crypto_hadshake_packets(
+  session()->connection()->set_fully_pad_crypto_handshake_packets(
       crypto_config_->pad_full_hello());
   SendHandshakeMessage(out);
   // Be prepared to decrypt with the new server write key.
diff --git a/quic/core/quic_crypto_server_handshaker.cc b/quic/core/quic_crypto_server_handshaker.cc
index 49e7209..964c8ac 100644
--- a/quic/core/quic_crypto_server_handshaker.cc
+++ b/quic/core/quic_crypto_server_handshaker.cc
@@ -169,7 +169,7 @@
   }
 
   if (reply->tag() != kSHLO) {
-    session()->connection()->set_fully_pad_crypto_hadshake_packets(
+    session()->connection()->set_fully_pad_crypto_handshake_packets(
         crypto_config_->pad_rej());
     SendHandshakeMessage(*reply);
     return;
@@ -215,7 +215,7 @@
   }
   session()->connection()->SetDiversificationNonce(*diversification_nonce);
 
-  session()->connection()->set_fully_pad_crypto_hadshake_packets(
+  session()->connection()->set_fully_pad_crypto_handshake_packets(
       crypto_config_->pad_shlo());
   SendHandshakeMessage(*reply);
 
diff --git a/quic/core/quic_packet_creator.h b/quic/core/quic_packet_creator.h
index d9b0e19..a654423 100644
--- a/quic/core/quic_packet_creator.h
+++ b/quic/core/quic_packet_creator.h
@@ -381,7 +381,7 @@
   // Indicates whether packet flusher is currently attached.
   bool PacketFlusherAttached() const;
 
-  void set_fully_pad_crypto_hadshake_packets(bool new_value) {
+  void set_fully_pad_crypto_handshake_packets(bool new_value) {
     DCHECK(combine_generator_and_creator_);
     fully_pad_crypto_handshake_packets_ = new_value;
   }
diff --git a/quic/core/quic_packet_generator.cc b/quic/core/quic_packet_generator.cc
index 7312ebf..fbb7894 100644
--- a/quic/core/quic_packet_generator.cc
+++ b/quic/core/quic_packet_generator.cc
@@ -537,10 +537,10 @@
   packet_creator_.SetClientConnectionId(client_connection_id);
 }
 
-void QuicPacketGenerator::set_fully_pad_crypto_hadshake_packets(
+void QuicPacketGenerator::set_fully_pad_crypto_handshake_packets(
     bool new_value) {
   if (packet_creator_.combine_generator_and_creator()) {
-    packet_creator_.set_fully_pad_crypto_hadshake_packets(new_value);
+    packet_creator_.set_fully_pad_crypto_handshake_packets(new_value);
     return;
   }
   fully_pad_crypto_handshake_packets_ = new_value;
diff --git a/quic/core/quic_packet_generator.h b/quic/core/quic_packet_generator.h
index 992d119..7d8df7e 100644
--- a/quic/core/quic_packet_generator.h
+++ b/quic/core/quic_packet_generator.h
@@ -225,7 +225,7 @@
     packet_creator_.set_debug_delegate(debug_delegate);
   }
 
-  void set_fully_pad_crypto_hadshake_packets(bool new_value);
+  void set_fully_pad_crypto_handshake_packets(bool new_value);
 
   bool fully_pad_crypto_handshake_packets() const;
 
diff --git a/quic/core/quic_packet_generator_test.cc b/quic/core/quic_packet_generator_test.cc
index 35085c2..70fe615 100644
--- a/quic/core/quic_packet_generator_test.cc
+++ b/quic/core/quic_packet_generator_test.cc
@@ -516,7 +516,7 @@
 // Test the behavior of ConsumeData when the data is for the crypto handshake
 // stream, but padding is disabled.
 TEST_F(QuicPacketGeneratorTest, ConsumeData_Handshake_PaddingDisabled) {
-  generator_.set_fully_pad_crypto_hadshake_packets(false);
+  generator_.set_fully_pad_crypto_handshake_packets(false);
 
   delegate_.SetCanWriteAnything();
 
