diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index 24795944f66..9f04c007909 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -12,13 +12,13 @@
 namespace IceInternal
 {
 
-class FixedRequestHandler final :
+class ConnectionRequestHandler final :
     public RequestHandler,
-    public std::enable_shared_from_this<FixedRequestHandler>
+    public std::enable_shared_from_this<ConnectionRequestHandler>
 {
 public:
 
-    FixedRequestHandler(const ReferencePtr&, const Ice::ConnectionIPtr&, bool);
+    ConnectionRequestHandler(const ReferencePtr&, const Ice::ConnectionIPtr&, bool);
 
     virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
 
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 7ed9b66ccdf..d24363c5b0f 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -737,7 +737,7 @@ IceInternal::FixedReference::getRequestHandler() const
     }
 
     ReferencePtr ref = const_cast<FixedReference*>(this)->shared_from_this();
-    return make_shared<FixedRequestHandler>(ref, _fixedConnection, compress);
+    return make_shared<ConnectionRequestHandler>(ref, _fixedConnection, compress);
 }
 
 BatchRequestQueuePtr