diff --git a/quic/qbone/platform/netlink_test.cc b/quic/qbone/platform/netlink_test.cc
index 13cdee8..16d2a19 100644
--- a/quic/qbone/platform/netlink_test.cc
+++ b/quic/qbone/platform/netlink_test.cc
@@ -196,7 +196,7 @@
       family = AF_INET6;
       break;
     default:
-      QUIC_BUG_V2(quic_bug_11034_1)
+      QUIC_BUG(quic_bug_11034_1)
           << absl::StrCat("unexpected address family: ", ip.address_family());
       family = AF_UNSPEC;
   }
diff --git a/quic/test_tools/qpack/qpack_test_utils.cc b/quic/test_tools/qpack/qpack_test_utils.cc
index 994ecf9..a453504 100644
--- a/quic/test_tools/qpack/qpack_test_utils.cc
+++ b/quic/test_tools/qpack/qpack_test_utils.cc
@@ -18,7 +18,7 @@
     case FragmentMode::kOctetByOctet:
       return []() { return 1; };
   }
-  QUIC_BUG_V2(quic_bug_10259_1)
+  QUIC_BUG(quic_bug_10259_1)
       << "Unknown FragmentMode " << static_cast<int>(fragment_mode);
   return []() { return 0; };
 }
diff --git a/spdy/core/hpack/hpack_encoder.cc b/spdy/core/hpack/hpack_encoder.cc
index 42777a4..6dc27b9 100644
--- a/spdy/core/hpack/hpack_encoder.cc
+++ b/spdy/core/hpack/hpack_encoder.cc
@@ -347,7 +347,7 @@
 
 void HpackEncoder::Encoderator::Next(size_t max_encoded_bytes,
                                      std::string* output) {
-  SPDY_BUG_IF_V2(spdy_bug_61_1, !has_next_)
+  SPDY_BUG_IF(spdy_bug_61_1, !has_next_)
       << "Encoderator::Next called with nothing left to encode.";
   const bool enable_compression = encoder_->enable_compression_;