diff --git a/src/commands.h b/src/commands.h
index f7831bc36a9..b9b1ad41933 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -76,11 +76,11 @@ extern Lisp_Object last_point_position_buffer;
 /* Nonzero means ^G can quit instantly */
 extern int immediate_quit;
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Nonzero if input is coming from the keyboard */
 
-#define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive)
+#define INTERACTIVE (NILP (Vexecuting_kbd_macro) && !noninteractive)
 
 /* Set this nonzero to force reconsideration of mode line. */
 
diff --git a/src/macros.h b/src/macros.h
index 41a32efe2e0..f406d62559f 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Kbd macro currently being executed (a string or vector).  */
 
-extern Lisp_Object Vexecuting_macro;
+extern Lisp_Object Vexecuting_kbd_macro;
 
 /* Index of next character to fetch from that macro.  */