diff --git a/third-party/mmatch/mmatch.c b/third-party/mmatch/mmatch.c
index d8054b180..704f33abf 100644
--- a/third-party/mmatch/mmatch.c
+++ b/third-party/mmatch/mmatch.c
@@ -164,9 +164,9 @@ int mmatch(const char *old_mask, const char *new_mask)
 
 /****************** Nemesi's match() ***************/
 
-int match(const char *mask, const char *string)
+int match(const char *mask, const char *str)
 {
-  const char *m = mask, *s = string;
+  const char *m = mask, *s = str;
   char ch;
   const char *bm, *bs;          /* Will be reg anyway on a decent CPU/compiler */
 
@@ -261,10 +261,10 @@ break_while:
  * Note that this new optimized alghoritm can *only* work in place.
  */
 
-char *collapse(char *mask)
+char *collapse(char *pattern)
 {
   int star = 0;
-  char *m = mask;
+  char *m = pattern;
   char *b;
 
   if (m)
diff --git a/third-party/mmatch/mmatch.h b/third-party/mmatch/mmatch.h
index 3a48c202f..8a451b2ed 100644
--- a/third-party/mmatch/mmatch.h
+++ b/third-party/mmatch/mmatch.h
@@ -6,7 +6,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 int mmatch(const char *old_mask, const char *new_mask);
-int match(const char *ma, const char *na);
+int match(const char *mask, const char *str);
 char *collapse(char *pattern);
 
 #ifdef __cplusplus