diff --git a/src/core/iomgr/udp_server.c b/src/core/iomgr/udp_server.c
index 285213a948f84f32fc2681ede24ff9af7ba41e44..9baaf1edc78cb63df2d042078c61c5c385f41134 100644
--- a/src/core/iomgr/udp_server.c
+++ b/src/core/iomgr/udp_server.c
@@ -405,12 +405,12 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index) {
 
 void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s,
                            grpc_pollset **pollsets, size_t pollset_count,
-                           grpc_server *grpc_server) {
+                           grpc_server *server) {
   size_t i, j;
   gpr_mu_lock(&s->mu);
   GPR_ASSERT(s->active_ports == 0);
   s->pollsets = pollsets;
-  s->grpc_server = grpc_server;
+  s->grpc_server = server;
   for (i = 0; i < s->nports; i++) {
     for (j = 0; j < pollset_count; j++) {
       grpc_pollset_add_fd(exec_ctx, pollsets[j], s->ports[i].emfd);
diff --git a/src/core/iomgr/udp_server.h b/src/core/iomgr/udp_server.h
index a754719ec5cbd36c525bd052b3b9a6af68e8d4d4..b6cf3c8ed9d37e98f83fea7668488a727c459fbe 100644
--- a/src/core/iomgr/udp_server.h
+++ b/src/core/iomgr/udp_server.h
@@ -49,9 +49,9 @@ typedef void (*grpc_udp_server_read_cb)(int fd, grpc_server* server);
 grpc_udp_server *grpc_udp_server_create(void);
 
 /* Start listening to bound ports */
-void grpc_udp_server_start(grpc_exec_ctx *exec_ctx grpc_udp_server *udp_server,
+void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *udp_server,
                            grpc_pollset **pollsets, size_t pollset_count,
-                           grpc_server *grpc_server);
+                           grpc_server *server);
 
 int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index);
 
diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c
index 69da2b85f93e13a66e2443f082572e640ea87da4..6d3dfeeb57c7ae953cb5200b02283f4f9347a645 100644
--- a/test/core/iomgr/udp_server_test.c
+++ b/test/core/iomgr/udp_server_test.c
@@ -49,7 +49,7 @@ static grpc_pollset g_pollset;
 static int g_number_of_reads = 0;
 static int g_number_of_bytes_read = 0;
 
-static void on_read(int fd, grpc_server *grpc_server) {
+static void on_read(int fd, grpc_server *server) {
   char read_buffer[512];
   ssize_t byte_count;