diff --git a/config.c b/config.c
index 74a2364..0eac060 100644
--- a/config.c
+++ b/config.c
@@ -548,7 +548,7 @@ config_recv(struct conf *conf, struct imsg *imsg)
 		addr->conf = conf;
 		addr->sock = imsg->fd;
 		event_set(&addr->evsock, addr->sock, EV_READ|EV_PERSIST,
-		    do_accept, addr);
+		    server_accept, addr);
 		if ((addr->ctx = tls_server()) == NULL)
 			fatal("tls_server failure");
 		TAILQ_INSERT_HEAD(&conf->addrs, addr, addrs);
diff --git a/ge.c b/ge.c
index d80bc11..d6d1b90 100644
--- a/ge.c
+++ b/ge.c
@@ -200,7 +200,7 @@ serve(struct conf *conf, const char *host, int port, const char *dir)
 		addr->conf = conf;
 		addr->sock = sock;
 		event_set(&addr->evsock, addr->sock, EV_READ|EV_PERSIST,
-		    do_accept, addr);
+		    server_accept, addr);
 
 		if ((addr->ctx = tls_server()) == NULL)
 			fatal("tls_server failure");
diff --git a/gmid.h b/gmid.h
index 7ba92d6..fbea6f6 100644
--- a/gmid.h
+++ b/gmid.h
@@ -408,7 +408,7 @@ void		 client_write(struct bufferevent *, void *);
 void		 start_reply(struct client*, int, const char*);
 void		 client_close(struct client *);
 struct client	*client_by_id(int);
-void		 do_accept(int, short, void *);
+void		 server_accept(int, short, void *);
 void		 server_init(struct privsep *, struct privsep_proc *, void *);
 int		 server_configure_done(struct conf *);
 void		 server(struct privsep *ps, struct privsep_proc *);
diff --git a/server.c b/server.c
index d63f302..8559b99 100644
--- a/server.c
+++ b/server.c
@@ -1288,7 +1288,7 @@ client_close(struct client *c)
 }
 
 void
-do_accept(int sock, short et, void *d)
+server_accept(int sock, short et, void *d)
 {
 	struct address *addr = d;
 	struct client *c;