diff --git a/md5.h b/md5.h
index f317c698..5b6361c3 100644
--- a/md5.h
+++ b/md5.h
@@ -16,11 +16,11 @@ struct IPUTILS_MD5Context {
  */
 typedef struct IPUTILS_MD5Context IPUTILS_MD5_CTX;
 
-void iputils_MD5Init(struct IPUTILS_MD5Context *context);
-void iputils_MD5Update(struct IPUTILS_MD5Context *context,
+void iputils_MD5Init(struct IPUTILS_MD5Context *ctx);
+void iputils_MD5Update(struct IPUTILS_MD5Context *ctx,
 		       const char *buf, unsigned len);
 void iputils_MD5Final(unsigned char digest[IPUTILS_MD5LENGTH],
-		      struct IPUTILS_MD5Context *context);
+		      struct IPUTILS_MD5Context *ctx);
 void iputils_MD5Transform(uint32_t buf[4], uint32_t const in[16]);
 
 #endif
diff --git a/ping/node_info.c b/ping/node_info.c
index ca4d0dbb..3bb5c40f 100644
--- a/ping/node_info.c
+++ b/ping/node_info.c
@@ -59,7 +59,7 @@ static int niquery_option_ipv6_flag_handler(struct ping_ni *ni, int index, const
 static int niquery_option_ipv4_handler(struct ping_ni *ni, int index, const char *arg);
 static int niquery_option_ipv4_flag_handler(struct ping_ni *ni, int index, const char *arg);
 static int niquery_option_subject_addr_handler(struct ping_ni *ni, int index, const char *arg);
-static int niquery_option_subject_name_handler(struct ping_ni *ni, int index, const char *arg);
+static int niquery_option_subject_name_handler(struct ping_ni *ni, int index, const char *name);
 static int niquery_option_help_handler(struct ping_ni *ni, int index, const char *arg);
 
 struct niquery_option niquery_options[] = {
diff --git a/ping/ping.h b/ping/ping.h
index a90c4665..cee3f730 100644
--- a/ping/ping.h
+++ b/ping/ping.h
@@ -110,7 +110,7 @@ struct ping_rts;
 int ping4_run(struct ping_rts *rts, int argc, char **argv, struct addrinfo *ai, socket_st *sock);
 int ping4_send_probe(struct ping_rts *rts, socket_st *, void *packet, unsigned packet_size);
 int ping4_receive_error_msg(struct ping_rts *, socket_st *);
-int ping4_parse_reply(struct ping_rts *, socket_st *, struct msghdr *msg, int len, void *addr, struct timeval *);
+int ping4_parse_reply(struct ping_rts *, socket_st *, struct msghdr *msg, int cc, void *addr, struct timeval *);
 void ping4_install_filter(struct ping_rts *rts, socket_st *);
 
 typedef struct ping_func_set_st {
@@ -368,11 +368,11 @@ extern void sock_setbufs(struct ping_rts *rts, socket_st *, int alloc);
 extern void setup(struct ping_rts *rts, socket_st *);
 extern int contains_pattern_in_payload(struct ping_rts *rts, uint8_t *ptr);
 extern int main_loop(struct ping_rts *rts, ping_func_set_st *fset, socket_st*,
-		     uint8_t *buf, int buflen);
+		     uint8_t *packet, int packlen);
 extern int finish(struct ping_rts *rts);
 extern void status(struct ping_rts *rts);
 extern void common_options(int ch);
-extern int gather_statistics(struct ping_rts *rts, uint8_t *ptr, int icmplen,
+extern int gather_statistics(struct ping_rts *rts, uint8_t *icmph, int icmplen,
 			     int cc, uint16_t seq, int hops,
 			     int csfailed, struct timeval *tv, char *from,
 			     void (*pr_reply)(uint8_t *ptr, int cc), int multicast);
@@ -387,7 +387,7 @@ void ping6_usage(unsigned from_ping);
 
 int ping6_send_probe(struct ping_rts *rts, socket_st *sockets, void *packet, unsigned packet_size);
 int ping6_receive_error_msg(struct ping_rts *rts, socket_st *sockets);
-int ping6_parse_reply(struct ping_rts *rts, socket_st *, struct msghdr *msg, int len, void *addr, struct timeval *);
+int ping6_parse_reply(struct ping_rts *rts, socket_st *, struct msghdr *msg, int cc, void *addr, struct timeval *);
 void ping6_install_filter(struct ping_rts *rts, socket_st *sockets);
 int ntohsp(uint16_t *p);