6 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 829fc41..16d3c94 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ G=
 O=-O3
 ALL_FLAGS=$(CFLAGS) -DBP_NAME="\"$(NAME)\"" $(EXTRA) $(CWARN) $(G) $(O)
 
-CFILES=compiler.c grammar.c utils.c vm.c files.c print.c json.c
+CFILES=compiler.c grammar.c utils.c match.c files.c print.c json.c
 OBJFILES=$(CFILES:.c=.o)
 
 all: $(NAME)
diff --git a/bp.c b/bp.c
index 23f3f2d..404be02 100644
--- a/bp.c
+++ b/bp.c
@@ -18,7 +18,7 @@
 #include "json.h"
 #include "print.h"
 #include "utils.h"
-#include "vm.h"
+#include "match.h"
 
 #ifndef BP_NAME
 #define BP_NAME "bp"
diff --git a/vm.c b/match.c
index b54f08d..a9e32bc 100644
--- a/vm.c
+++ b/match.c
@@ -1,5 +1,5 @@
 //
-// vm.c - Code for the BP virtual machine that performs the matching.
+// match.c - Code for the BP virtual machine that performs the matching.
 //
 
 #include <ctype.h>
@@ -10,7 +10,7 @@
 #include "grammar.h"
 #include "types.h"
 #include "utils.h"
-#include "vm.h"
+#include "match.h"
 
 #ifdef DEBUG_HEAP
 // Doubly-linked list operations:
diff --git a/vm.h b/match.h
index 28c573e..f297350 100644
--- a/vm.h
+++ b/match.h
@@ -1,8 +1,8 @@
 //
-// vm.h - Header file for BP virtual machine.
+// match.h - Header file for BP virtual machine.
 //
-#ifndef VM__H
-#define VM__H
+#ifndef MATCH__H
+#define MATCH__H
 
 #include <stdio.h>
 
diff --git a/print.c b/print.c
index 6feee3f..06cfd53 100644
--- a/print.c
+++ b/print.c
@@ -9,7 +9,7 @@
 #include "print.h"
 #include "types.h"
 #include "utils.h"
-#include "vm.h"
+#include "match.h"
 
 typedef struct match_node_s {
     match_t *m;
diff --git a/utils.h b/utils.h
index f9d27d4..b6aece3 100644
--- a/utils.h
+++ b/utils.h
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "vm.h"
+#include "match.h"
 
 #define streq(a, b) (strcmp(a, b) == 0)
 // TODO: better error reporting