diff --git a/parse.y b/parse.y
index fffee2a..d7018f6 100644
--- a/parse.y
+++ b/parse.y
@@ -1203,12 +1203,12 @@ cmdline_symset(char *s)
 }
 
 char *
-symget(const char *nam)
+symget(const char *name)
 {
 	struct sym	*sym;
 
 	TAILQ_FOREACH(sym, &symhead, entry) {
-		if (strcmp(nam, sym->name) == 0) {
+		if (strcmp(name, sym->name) == 0) {
 			sym->used = 1;
 			return sym->val;
 		}
diff --git a/server.c b/server.c
index 01d9f7f..fa8bf76 100644
--- a/server.c
+++ b/server.c
@@ -1065,7 +1065,7 @@ client_write(struct bufferevent *bev, void *d)
 {
 	struct client	*c = d;
 	struct evbuffer	*out = EVBUFFER_OUTPUT(bev);
-	char		 nam[PATH_MAX];
+	char		 name[PATH_MAX];
 	char		 buf[BUFSIZ];
 	ssize_t		 r;
 
@@ -1095,11 +1095,11 @@ client_write(struct bufferevent *bev, void *d)
 		for (c->diroff = 0; c->diroff < c->dirlen; ++c->diroff) {
 			const char *sufx = "";
 
-			encode_path(nam, sizeof(nam),
+			encode_path(name, sizeof(name),
 			    c->dir[c->diroff]->d_name);
 			if (c->dir[c->diroff]->d_type == DT_DIR)
 				sufx = "/";
-			evbuffer_add_printf(out, "=> ./%s%s\n", nam, sufx);
+			evbuffer_add_printf(out, "=> ./%s%s\n", name, sufx);
 			free(c->dir[c->diroff]);
 		}
 		free(c->dir);