diff --git a/lib/notmuch.h b/lib/notmuch.h
index e4f39929..60834fb5 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -711,7 +711,7 @@ notmuch_message_get_filename (notmuch_message_t *message);
 
 /* Message flags */
 typedef enum _notmuch_message_flag {
-    NOTMUCH_MSG_FLAG_MATCHING_SEARCH,
+    NOTMUCH_MESSAGE_FLAG_MATCH,
 } notmuch_message_flag_t;
 
 /* Get a value of a flag for the email corresponding to 'message'. */
diff --git a/lib/thread.cc b/lib/thread.cc
index 9e4cb5c8..321937b0 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -148,7 +148,7 @@ _thread_add_matched_message (notmuch_thread_t *thread,
 			    notmuch_message_get_message_id (message), NULL,
 			    (void **) &hashed_message)) {
 	notmuch_message_set_flag (hashed_message,
-			NOTMUCH_MSG_FLAG_MATCHING_SEARCH, 1);
+				  NOTMUCH_MESSAGE_FLAG_MATCH, 1);
     }
 }
 
diff --git a/notmuch-show.c b/notmuch-show.c
index f189e943..13c91e47 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -158,7 +158,7 @@ show_message (void *ctx, notmuch_message_t *message, int indent)
     printf ("\fmessage{ id:%s depth:%d match:%d filename:%s\n",
 	    notmuch_message_get_message_id (message),
 	    indent,
-	    notmuch_message_get_flag (message, NOTMUCH_MSG_FLAG_MATCHING_SEARCH),
+	    notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),
 	    notmuch_message_get_filename (message));
 
     printf ("\fheader{\n");