diff --git a/quic/core/crypto/quic_crypto_client_config.cc b/quic/core/crypto/quic_crypto_client_config.cc
index 4680785..1b1c595 100644
--- a/quic/core/crypto/quic_crypto_client_config.cc
+++ b/quic/core/crypto/quic_crypto_client_config.cc
@@ -68,7 +68,7 @@
     : proof_verifier_(std::move(proof_verifier)),
       session_cache_(std::move(session_cache)),
       ssl_ctx_(TlsClientConnection::CreateSslCtx(
-          GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls))),
+          GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2))),
       disable_chlo_padding_(GetQuicReloadableFlag(quic_dont_pad_chlo)) {
   DCHECK(proof_verifier_.get());
   SetDefaults();
diff --git a/quic/core/crypto/tls_server_connection.cc b/quic/core/crypto/tls_server_connection.cc
index f9661d4..69c5a82 100644
--- a/quic/core/crypto/tls_server_connection.cc
+++ b/quic/core/crypto/tls_server_connection.cc
@@ -29,7 +29,7 @@
     SSL_CTX_set_ticket_aead_method(ssl_ctx.get(),
                                    &TlsServerConnection::kSessionTicketMethod);
     QUIC_CODE_COUNT_N(quic_tls_resumption_ticket_method, 1, 2);
-    if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls)) {
+    if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2)) {
       SSL_CTX_set_early_data_enabled(ssl_ctx.get(), 1);
     }
   } else {
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index b6aefef..8125724 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -204,7 +204,7 @@
 
     SetQuicReloadableFlag(quic_support_handshake_done_in_t050, true);
     SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
-    SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
+    SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
   }
 
   ~EndToEndTest() override { QuicRecyclePort(server_address_.port()); }
diff --git a/quic/core/http/quic_server_session_base.cc b/quic/core/http/quic_server_session_base.cc
index ef367d9..805816e 100644
--- a/quic/core/http/quic_server_session_base.cc
+++ b/quic/core/http/quic_server_session_base.cc
@@ -39,7 +39,7 @@
   crypto_stream_ =
       CreateQuicCryptoServerStream(crypto_config_, compressed_certs_cache_);
   QuicSpdySession::Initialize();
-  if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls)) {
+  if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2)) {
     SendSettingsToCryptoStream();
   }
 }
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index 01e4e85..63e373b 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -97,7 +97,7 @@
     auto client_cache = std::make_unique<test::SimpleSessionCache>();
     client_session_cache_ = client_cache.get();
     SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
-    SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
+    SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
     SetQuicReloadableFlag(quic_fix_gquic_stream_type, true);
     client_crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
         crypto_test_utils::ProofVerifierForTesting(), std::move(client_cache));
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index e3f6dcf..11ad810 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -950,7 +950,7 @@
         // Communicate |value| to encoder, because it is used for encoding
         // Required Insert Count.
         bool success = qpack_encoder_->SetMaximumDynamicTableCapacity(value);
-        if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls) && !success) {
+        if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) && !success) {
           CloseConnectionWithDetails(
               was_zero_rtt_rejected()
                   ? QUIC_HTTP_ZERO_RTT_REJECTION_SETTINGS_MISMATCH
@@ -974,7 +974,7 @@
         QUIC_DVLOG(1) << ENDPOINT
                       << "SETTINGS_MAX_HEADER_LIST_SIZE received with value "
                       << value;
-        if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls) &&
+        if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) &&
             max_outbound_header_list_size_ !=
                 std::numeric_limits<size_t>::max() &&
             max_outbound_header_list_size_ > value) {
@@ -998,7 +998,7 @@
                       << "SETTINGS_QPACK_BLOCKED_STREAMS received with value "
                       << value;
         bool success = qpack_encoder_->SetMaximumBlockedStreams(value);
-        if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls) && !success) {
+        if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) && !success) {
           CloseConnectionWithDetails(
               was_zero_rtt_rejected()
                   ? QUIC_HTTP_ZERO_RTT_REJECTION_SETTINGS_MISMATCH
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 694d76e..16d030c 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1029,7 +1029,7 @@
 void QuicSession::OnConfigNegotiated() {
   // In versions with TLS, the configs will be set twice if 0-RTT is available.
   // In the second config setting, 1-RTT keys are guaranteed to be available.
-  if (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls) &&
+  if (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) &&
       version().UsesTls() && is_configured_ &&
       connection_->encryption_level() != ENCRYPTION_FORWARD_SECURE) {
     QUIC_BUG
@@ -1248,7 +1248,7 @@
   // Or if this session is configured on TLS enabled QUIC versions,
   // attempt to retransmit 0-RTT data if there's any.
   if (connection_->version().AllowsLowFlowControlLimits() ||
-      (GetQuicReloadableFlag(quic_enable_zero_rtt_for_tls) &&
+      (GetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2) &&
        version().UsesTls())) {
     OnCanWrite();
   }
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 57b64ae..7e7cc7f 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -705,7 +705,7 @@
 void QuicVersionInitializeSupportForIetfDraft() {
   // Enable necessary flags.
   SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
-  SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
+  SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
 }
 
 void QuicEnableVersion(const ParsedQuicVersion& version) {
diff --git a/quic/core/tls_client_handshaker_test.cc b/quic/core/tls_client_handshaker_test.cc
index 6fa5aa3..87afeb8 100644
--- a/quic/core/tls_client_handshaker_test.cc
+++ b/quic/core/tls_client_handshaker_test.cc
@@ -175,7 +175,7 @@
         server_compressed_certs_cache_(
             QuicCompressedCertsCache::kQuicCompressedCertsCacheSize) {
     SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
-    SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
+    SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
     crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
         std::make_unique<TestProofVerifier>(),
         std::make_unique<test::SimpleSessionCache>());
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index f4c4a8a..518632d 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -381,7 +381,7 @@
     // FinishHandshake, we don't have any confirmation that the client is live,
     // so all end of handshake processing is deferred until the handshake is
     // actually complete.
-    QUIC_RELOADABLE_FLAG_COUNT(quic_enable_zero_rtt_for_tls);
+    QUIC_RESTART_FLAG_COUNT(quic_enable_zero_rtt_for_tls_v2);
     return;
   }
   if (!valid_alpn_received_) {
diff --git a/quic/core/tls_server_handshaker_test.cc b/quic/core/tls_server_handshaker_test.cc
index 752719e..c1e5a89 100644
--- a/quic/core/tls_server_handshaker_test.cc
+++ b/quic/core/tls_server_handshaker_test.cc
@@ -49,7 +49,7 @@
             QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
         server_id_(kServerHostname, kServerPort, false) {
     SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
-    SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
+    SetQuicRestartFlag(quic_enable_zero_rtt_for_tls_v2, true);
     client_crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
         crypto_test_utils::ProofVerifierForTesting(),
         std::make_unique<test::SimpleSessionCache>());