diff --git a/quiche/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc b/quiche/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
index 93ce0a9..8927604 100644
--- a/quiche/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
+++ b/quiche/quic/core/qpack/fuzzer/qpack_decoder_fuzzer.cc
@@ -116,8 +116,9 @@
       // Feed encoder stream data to QpackDecoder.
       case 0: {
         size_t fragment_size = provider.ConsumeIntegral<uint8_t>();
-        std::string data = provider.ConsumeRandomLengthString(fragment_size);
-        decoder.encoder_stream_receiver()->Decode(data);
+        std::string encoded_data =
+            provider.ConsumeRandomLengthString(fragment_size);
+        decoder.encoder_stream_receiver()->Decode(encoded_data);
 
         continue;
       }
@@ -152,8 +153,9 @@
         std::advance(it, distance);
 
         size_t fragment_size = provider.ConsumeIntegral<uint8_t>();
-        std::string data = provider.ConsumeRandomLengthString(fragment_size);
-        it->second.decoder->Decode(data);
+        std::string encoded_data =
+            provider.ConsumeRandomLengthString(fragment_size);
+        it->second.decoder->Decode(encoded_data);
 
         continue;
       }
@@ -169,15 +171,15 @@
             0, reading_decoders.size() - 1);
         std::advance(it, distance);
 
-        QpackProgressiveDecoder* decoder = it->second.decoder.get();
+        QpackProgressiveDecoder* reading_decoder = it->second.decoder.get();
 
-        // Move DecoderAndHandler to |reading_decoders| first, because
+        // Move DecoderAndHandler to |processing_decoders| first, because
         // EndHeaderBlock() might synchronously call OnDecodingCompleted().
         QuicStreamId stream_id = it->first;
         processing_decoders.insert({stream_id, std::move(it->second)});
         reading_decoders.erase(it);
 
-        decoder->EndHeaderBlock();
+        reading_decoder->EndHeaderBlock();
 
         continue;
       }
