diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index a1c63c2..4973934 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -3797,7 +3797,7 @@
                 IsError(QUIC_QPACK_DECOMPRESSION_FAILED));
   } else {
     EXPECT_THAT(client_->connection_error(),
-                IsError(QUIC_HPACK_INDEX_VARINT_ERROR));
+                IsError(QUIC_HPACK_VALUE_TOO_LONG));
   }
 }
 
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index f470322..b9acfef 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -139,21 +139,21 @@
     QuicErrorCode code;
     switch (error) {
       case Http2DecoderAdapter::SpdyFramerError::SPDY_HPACK_INDEX_VARINT_ERROR:
-        code = QUIC_HPACK_NAME_LENGTH_VARINT_ERROR;
+        code = QUIC_HPACK_INDEX_VARINT_ERROR;
         break;
       case Http2DecoderAdapter::SpdyFramerError::
           SPDY_HPACK_NAME_LENGTH_VARINT_ERROR:
-        code = QUIC_HPACK_VALUE_LENGTH_VARINT_ERROR;
+        code = QUIC_HPACK_NAME_LENGTH_VARINT_ERROR;
         break;
       case Http2DecoderAdapter::SpdyFramerError::
           SPDY_HPACK_VALUE_LENGTH_VARINT_ERROR:
-        code = QUIC_HPACK_NAME_TOO_LONG;
+        code = QUIC_HPACK_VALUE_LENGTH_VARINT_ERROR;
         break;
       case Http2DecoderAdapter::SpdyFramerError::SPDY_HPACK_NAME_TOO_LONG:
-        code = QUIC_HPACK_VALUE_TOO_LONG;
+        code = QUIC_HPACK_NAME_TOO_LONG;
         break;
       case Http2DecoderAdapter::SpdyFramerError::SPDY_HPACK_VALUE_TOO_LONG:
-        code = QUIC_HPACK_INDEX_VARINT_ERROR;
+        code = QUIC_HPACK_VALUE_TOO_LONG;
         break;
       case Http2DecoderAdapter::SpdyFramerError::SPDY_HPACK_NAME_HUFFMAN_ERROR:
         code = QUIC_HPACK_NAME_HUFFMAN_ERROR;