diff --git a/src/curve_client.hpp b/src/curve_client.hpp
index 2ad515f2..c786e764 100644
--- a/src/curve_client.hpp
+++ b/src/curve_client.hpp
@@ -72,10 +72,10 @@ class curve_client_t : public curve_mechanism_base_t
     curve_client_tools_t _tools;
 
     int produce_hello (msg_t *msg_);
-    int process_welcome (const uint8_t *cmd_data_, size_t data_size_);
+    int process_welcome (const uint8_t *msg_data_, size_t msg_size_);
     int produce_initiate (msg_t *msg_);
-    int process_ready (const uint8_t *cmd_data_, size_t data_size_);
-    int process_error (const uint8_t *cmd_data_, size_t data_size_);
+    int process_ready (const uint8_t *msg_data_, size_t msg_size_);
+    int process_error (const uint8_t *msg_data_, size_t msg_size_);
 };
 }
 
diff --git a/src/decoder_allocators.hpp b/src/decoder_allocators.hpp
index c9e51281..81ab1fab 100644
--- a/src/decoder_allocators.hpp
+++ b/src/decoder_allocators.hpp
@@ -103,7 +103,7 @@ class shared_message_memory_allocator
 
     void inc_ref ();
 
-    static void call_dec_ref (void *, void *buffer_);
+    static void call_dec_ref (void *, void *hint_);
 
     std::size_t size () const;
 
diff --git a/src/radix_tree.hpp b/src/radix_tree.hpp
index eeb79f6d..ca84e692 100644
--- a/src/radix_tree.hpp
+++ b/src/radix_tree.hpp
@@ -78,7 +78,7 @@ struct node_t
     inline void set_refcount (uint32_t value_);
     inline void set_prefix_length (uint32_t value_);
     inline void set_edgecount (uint32_t value_);
-    inline void set_prefix (const unsigned char *prefix_);
+    inline void set_prefix (const unsigned char *bytes_);
     inline void set_first_bytes (const unsigned char *bytes_);
     inline void set_first_byte_at (size_t index_, unsigned char byte_);
     inline void set_node_pointers (const unsigned char *pointers_);
diff --git a/src/socket_poller.hpp b/src/socket_poller.hpp
index c3ee4171..1100cae2 100644
--- a/src/socket_poller.hpp
+++ b/src/socket_poller.hpp
@@ -78,7 +78,7 @@ class socket_poller_t
     // Returns the signaler's fd if there is one, otherwise errors.
     int signaler_fd (fd_t *fd_);
 
-    int wait (event_t *event_, int n_events_, long timeout_);
+    int wait (event_t *events_, int n_events_, long timeout_);
 
     inline int size () { return static_cast<int> (_items.size ()); };
 
diff --git a/src/udp_address.hpp b/src/udp_address.hpp
index c32f7064..a2530d8f 100644
--- a/src/udp_address.hpp
+++ b/src/udp_address.hpp
@@ -47,7 +47,7 @@ class udp_address_t
     udp_address_t ();
     virtual ~udp_address_t ();
 
-    int resolve (const char *name_, bool receiver_, bool ipv6_);
+    int resolve (const char *name_, bool bind_, bool ipv6_);
 
     //  The opposite to resolve()
     virtual int to_string (std::string &addr_);
diff --git a/src/udp_engine.hpp b/src/udp_engine.hpp
index 6c969b16..db4c30c5 100644
--- a/src/udp_engine.hpp
+++ b/src/udp_engine.hpp
@@ -46,7 +46,7 @@ class udp_engine_t : public io_object_t, public i_engine
     const endpoint_uri_pair_t &get_endpoint () const;
 
   private:
-    int resolve_raw_address (char *addr_, size_t length_);
+    int resolve_raw_address (char *name_, size_t length_);
     void sockaddr_to_msg (zmq::msg_t *msg_, sockaddr_in *addr_);
 
     int set_udp_reuse_address (fd_t s_, bool on_);
diff --git a/src/ws_engine.cpp b/src/ws_engine.cpp
index e1287654..2a41e368 100644
--- a/src/ws_engine.cpp
+++ b/src/ws_engine.cpp
@@ -86,7 +86,7 @@ static int
 encode_base64 (const unsigned char *in_, int in_len_, char *out_, int out_len_);
 
 static void compute_accept_key (char *key_,
-                                unsigned char output_[SHA_DIGEST_LENGTH]);
+                                unsigned char hash_[SHA_DIGEST_LENGTH]);
 
 zmq::ws_engine_t::ws_engine_t (fd_t fd_,
                                const options_t &options_,
diff --git a/src/xpub.hpp b/src/xpub.hpp
index b6796dd3..c0abed6e 100644
--- a/src/xpub.hpp
+++ b/src/xpub.hpp
@@ -71,7 +71,7 @@ class xpub_t : public socket_base_t
                                      xpub_t *self_);
 
     //  Function to be applied to each matching pipes.
-    static void mark_as_matching (zmq::pipe_t *pipe_, xpub_t *arg_);
+    static void mark_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
 
     //  List of all subscriptions mapped to corresponding pipes.
     mtrie_t _subscriptions;
@@ -115,7 +115,7 @@ class xpub_t : public socket_base_t
     bool _send_last_pipe;
 
     //  Function to be applied to match the last pipe.
-    static void mark_last_pipe_as_matching (zmq::pipe_t *pipe_, xpub_t *arg_);
+    static void mark_last_pipe_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
 
     //  Last pipe that sent subscription message, only used if xpub is on manual
     pipe_t *_last_pipe;