diff --git a/quic/tools/quic_client_bin.cc b/quic/tools/quic_client_bin.cc
index 5a841a9..8329ac6 100644
--- a/quic/tools/quic_client_bin.cc
+++ b/quic/tools/quic_client_bin.cc
@@ -82,7 +82,7 @@
   return QuicSocketAddress(*info_list->ai_addr);
 }
 
-class QuicEpollClientFactory : public quic::QuicToyClientBase::ClientFactory {
+class QuicEpollClientFactory : public quic::QuicToyClient::ClientFactory {
  public:
   std::unique_ptr<quic::QuicSpdyClientBase> CreateClient(
       std::string host,
@@ -118,6 +118,6 @@
   }
 
   QuicEpollClientFactory factory;
-  quic::QuicToyClientBase client(&factory);
+  quic::QuicToyClient client(&factory);
   return client.SendRequestsAndPrintResponses(urls);
 }
diff --git a/quic/tools/quic_toy_client.cc b/quic/tools/quic_toy_client.cc
index b41cee2..f6e2e15 100644
--- a/quic/tools/quic_toy_client.cc
+++ b/quic/tools/quic_toy_client.cc
@@ -165,10 +165,10 @@
 
 namespace quic {
 
-QuicToyClientBase::QuicToyClientBase(ClientFactory* client_factory)
+QuicToyClient::QuicToyClient(ClientFactory* client_factory)
     : client_factory_(client_factory) {}
 
-int QuicToyClientBase::SendRequestsAndPrintResponses(
+int QuicToyClient::SendRequestsAndPrintResponses(
     std::vector<std::string> urls) {
   QuicUrl url(urls[0], "https");
   std::string host = GetQuicFlag(FLAGS_host);
diff --git a/quic/tools/quic_toy_client.h b/quic/tools/quic_toy_client.h
index 9916bec..e832ac7 100644
--- a/quic/tools/quic_toy_client.h
+++ b/quic/tools/quic_toy_client.h
@@ -12,7 +12,7 @@
 
 namespace quic {
 
-class QuicToyClientBase {
+class QuicToyClient {
  public:
   class ClientFactory {
    public:
@@ -29,7 +29,7 @@
 
   // Constructs a new toy client that will use |client_factory| to create the
   // actual QuicSpdyClientBase instance.
-  QuicToyClientBase(ClientFactory* client_factory);
+  QuicToyClient(ClientFactory* client_factory);
 
   // Connects to the QUIC server based on the various flags defined in the
   // .cc file, sends requests and prints the responses. Returns 0 on success