diff --git a/src/rcfile.c b/src/rcfile.c
index 188a7d7dd6df3eee7ac0f6de4237371f9a926bab..2e71a05a466c27cfc8422eff37c196720be22104 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -899,23 +899,23 @@ void pick_up_name(const char *kind, char *ptr, char **storage)
     if (!strcmp(ptr, "\"\""))
 	*storage = NULL;
     else if (*ptr == '"') {
-	char *p, *q;
+	char *look, *take;
 
-	p = q = *storage = mallocstrcpy(NULL, ++ptr);
+	look = take = *storage = mallocstrcpy(NULL, ++ptr);
 
 	/* Snip out the backslashes of escaped characters. */
-	while (*p != '"') {
-	    if (*p == '\0') {
+	while (*look != '"') {
+	    if (*look == '\0') {
 		rcfile_error(N_("Argument of '%s' lacks closing \""), kind);
 		free(*storage);
 		*storage = NULL;
 		return;
-	    } else if (*p == '\\' && *(p + 1) != '\0') {
-		p++;
+	    } else if (*look == '\\' && *(look + 1) != '\0') {
+		look++;
 	    }
-	    *q++ = *p++;
+	    *take++ = *look++;
 	}
-	*q = '\0';
+	*take = '\0';
     }
     else
 	*storage = mallocstrcpy(NULL, ptr);
diff --git a/src/text.c b/src/text.c
index d5a5f7e8d0202e082ace77c7909749779cb02612..1355454d5f535b421820dbb9f474935bde4b6ca8 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1494,7 +1494,7 @@ bool do_wrap(filestruct *line)
 	/* The length of next_line. */
 
     size_t old_x = openfile->current_x;
-    filestruct * oldLine = openfile->current;
+    filestruct * old_line = openfile->current;
 
     /* There are three steps.  First, we decide where to wrap.  Then, we
      * create the new wrap line.  Finally, we clean up. */
@@ -1600,7 +1600,7 @@ bool do_wrap(filestruct *line)
 
     if (old_x < wrap_loc) {
 	openfile->current_x = old_x;
-	openfile->current = oldLine;
+	openfile->current = old_line;
 	prepend_wrap = TRUE;
     } else {
 	openfile->current_x += (old_x - wrap_loc);