diff --git a/src/dealer.hpp b/src/dealer.hpp
index 30d1e4ef..f25b39dd 100644
--- a/src/dealer.hpp
+++ b/src/dealer.hpp
@@ -44,7 +44,7 @@ namespace zmq
 
     protected:
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
         int xsend (zmq::msg_t *msg_);
diff --git a/src/object.hpp b/src/object.hpp
index 4704c05d..0296bb59 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -95,7 +95,7 @@ namespace zmq
         void send_reaped ();
         void send_done ();
 
-        //  These handlers can be overloaded by the derived objects. They are
+        //  These handlers can be overrided by the derived objects. They are
         //  called when command arrives from another thread.
         virtual void process_stop ();
         virtual void process_plug ();
diff --git a/src/pair.hpp b/src/pair.hpp
index 83bc3314..f7a1ddd4 100644
--- a/src/pair.hpp
+++ b/src/pair.hpp
@@ -39,7 +39,7 @@ namespace zmq
         pair_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
         ~pair_t ();
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsend (zmq::msg_t *msg_);
         int xrecv (zmq::msg_t *msg_);
diff --git a/src/pull.hpp b/src/pull.hpp
index 9681a4b0..adb385c1 100644
--- a/src/pull.hpp
+++ b/src/pull.hpp
@@ -42,7 +42,7 @@ namespace zmq
 
     protected:
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xrecv (zmq::msg_t *msg_);
         bool xhas_in ();
diff --git a/src/push.hpp b/src/push.hpp
index 7185722d..f6a96a7b 100644
--- a/src/push.hpp
+++ b/src/push.hpp
@@ -42,7 +42,7 @@ namespace zmq
 
     protected:
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsend (zmq::msg_t *msg_);
         bool xhas_out ();
diff --git a/src/rep.hpp b/src/rep.hpp
index 5a433eb4..0dcf927e 100644
--- a/src/rep.hpp
+++ b/src/rep.hpp
@@ -37,7 +37,7 @@ namespace zmq
         rep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
         ~rep_t ();
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         int xsend (zmq::msg_t *msg_);
         int xrecv (zmq::msg_t *msg_);
         bool xhas_in ();
diff --git a/src/req.hpp b/src/req.hpp
index ce78dce7..2621d4da 100644
--- a/src/req.hpp
+++ b/src/req.hpp
@@ -38,7 +38,7 @@ namespace zmq
         req_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
         ~req_t ();
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         int xsend (zmq::msg_t *msg_);
         int xrecv (zmq::msg_t *msg_);
         bool xhas_in ();
@@ -90,7 +90,7 @@ namespace zmq
             const address_t *addr_);
         ~req_session_t ();
 
-        //  Overloads of the functions from session_base_t.
+        //  Overrides of the functions from session_base_t.
         int push_msg (msg_t *msg_);
         void reset ();
 
diff --git a/src/router.hpp b/src/router.hpp
index 43731c30..3ef12b81 100644
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -44,7 +44,7 @@ namespace zmq
         router_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
         ~router_t ();
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
         int xsend (zmq::msg_t *msg_);
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index 2ab963e3..d4cd358d 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -131,7 +131,7 @@ namespace zmq
             bool subscribe_to_all_ = false) = 0;
 
         //  The default implementation assumes there are no specific socket
-        //  options for the particular socket type. If not so, overload this
+        //  options for the particular socket type. If not so, override this
         //  method.
         virtual int xsetsockopt (int option_, const void *optval_,
             size_t optvallen_);
diff --git a/src/stream.hpp b/src/stream.hpp
index cbdd1eff..4e50b5dc 100644
--- a/src/stream.hpp
+++ b/src/stream.hpp
@@ -38,7 +38,7 @@ namespace zmq
         stream_t (zmq::ctx_t *parent_, uint32_t tid_, int sid);
         ~stream_t ();
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsend (zmq::msg_t *msg_);
         int xrecv (zmq::msg_t *msg_);
diff --git a/src/sub.cpp b/src/sub.cpp
index 79619336..3330b708 100644
--- a/src/sub.cpp
+++ b/src/sub.cpp
@@ -68,13 +68,13 @@ int zmq::sub_t::xsetsockopt (int option_, const void *optval_,
 
 int zmq::sub_t::xsend (msg_t *)
 {
-    //  Overload the XSUB's send.
+    //  Override the XSUB's send.
     errno = ENOTSUP;
     return -1;
 }
 
 bool zmq::sub_t::xhas_out ()
 {
-    //  Overload the XSUB's send.
+    //  Override the XSUB's send.
     return false;
 }
diff --git a/src/xsub.hpp b/src/xsub.hpp
index 732dbf83..f5a179b6 100644
--- a/src/xsub.hpp
+++ b/src/xsub.hpp
@@ -43,7 +43,7 @@ namespace zmq
 
     protected:
 
-        //  Overloads of functions from socket_base_t.
+        //  Overrides of functions from socket_base_t.
         void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
         int xsend (zmq::msg_t *msg_);
         bool xhas_out ();