diff --git a/src/pipe.hpp b/src/pipe.hpp
index 22c139b5..b909000e 100644
--- a/src/pipe.hpp
+++ b/src/pipe.hpp
@@ -226,10 +226,10 @@ namespace zmq
         //  asks us to.
         bool delay;
 
-        //  Identity of the writer. Used uniquely by the reader side.
+        //  Routing id of the writer. Used uniquely by the reader side.
         blob_t router_socket_routing_id;
 
-        //  Identity of the writer. Used uniquely by the reader side.
+        //  Routing id of the writer. Used uniquely by the reader side.
         int server_socket_routing_id;
 
         //  Pipe's credential.
diff --git a/tests/test_spec_req.cpp b/tests/test_spec_req.cpp
index f130aa15..9a1876f3 100644
--- a/tests/test_spec_req.cpp
+++ b/tests/test_spec_req.cpp
@@ -167,7 +167,7 @@ void test_req_message_format (void *ctx)
     zmq_msg_t msg;
     zmq_msg_init (&msg);
 
-    // Receive peer identity
+    // Receive peer routing id
     rc = zmq_msg_recv (&msg, router, 0);
     assert (rc != -1);
     assert (zmq_msg_size (&msg) > 0);