10 files changed, 17 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index a0cf193..829fc41 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 file_loader.c printing.c json.c
+CFILES=compiler.c grammar.c utils.c vm.c files.c print.c json.c
 OBJFILES=$(CFILES:.c=.o)
 
 all: $(NAME)
diff --git a/bp.c b/bp.c
index 380a43d..23f3f2d 100644
--- a/bp.c
+++ b/bp.c
@@ -13,10 +13,10 @@
 #include <unistd.h>
 
 #include "compiler.h"
-#include "file_loader.h"
+#include "files.h"
 #include "grammar.h"
 #include "json.h"
-#include "printing.h"
+#include "print.h"
 #include "utils.h"
 #include "vm.h"
 
diff --git a/compiler.h b/compiler.h
index 6761644..3038d09 100644
--- a/compiler.h
+++ b/compiler.h
@@ -4,7 +4,7 @@
 #ifndef COMPILER__H
 #define COMPILER__H
 
-#include "file_loader.h"
+#include "files.h"
 #include "types.h"
 
 __attribute__((nonnull))
diff --git a/file_loader.c b/files.c
index 0d92241..e4ca380 100644
--- a/file_loader.c
+++ b/files.c
@@ -1,5 +1,5 @@
 //
-// file_loader.c - Implementation of some file loading functionality.
+// files.c - Implementation of some file loading functionality.
 //
 
 #include <ctype.h>
@@ -12,7 +12,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "file_loader.h"
+#include "files.h"
 #include "utils.h"
 
 __attribute__((nonnull))
diff --git a/file_loader.h b/files.h
index 78f3757..cee341c 100644
--- a/file_loader.h
+++ b/files.h
@@ -1,8 +1,8 @@
 //
-// file_loader.h - Definitions of an API for loading files.
+// files.h - Definitions of an API for loading files.
 //
-#ifndef FILE_LOADER__H
-#define FILE_LOADER__H
+#ifndef FILES__H
+#define FILES__H
 
 #include <stdio.h>
 
diff --git a/grammar.c b/grammar.c
index 102eca8..66103eb 100644
--- a/grammar.c
+++ b/grammar.c
@@ -6,7 +6,7 @@
 #include <string.h>
 
 #include "compiler.h"
-#include "file_loader.h"
+#include "files.h"
 #include "grammar.h"
 #include "utils.h"
 
diff --git a/grammar.h b/grammar.h
index b8e93ff..397a3c4 100644
--- a/grammar.h
+++ b/grammar.h
@@ -4,7 +4,7 @@
 #ifndef GRAMMAR__H
 #define GRAMMAR__H
 
-#include "file_loader.h"
+#include "files.h"
 #include "types.h"
 
 __attribute__((nonnull(2,4,5), returns_nonnull))
diff --git a/printing.c b/print.c
index 346ee73..6feee3f 100644
--- a/printing.c
+++ b/print.c
@@ -1,12 +1,12 @@
 //
-// printing.c - Code for printing and visualizing matches.
+// print.c - Code for printing and visualizing matches.
 //
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "printing.h"
+#include "print.h"
 #include "types.h"
 #include "utils.h"
 #include "vm.h"
diff --git a/printing.h b/print.h
index 822285e..09a30f6 100644
--- a/printing.h
+++ b/print.h
@@ -1,8 +1,8 @@
 //
-// Header file for printing.c (printing/visualizing matches)
+// Header file for print.c (printing/visualizing matches)
 //
-#ifndef PRINTING__H
-#define PRINTING__H
+#ifndef PRINT__H
+#define PRINT__H
 
 #include "types.h"
 
diff --git a/types.h b/types.h
index ab5694c..cfdd9d2 100644
--- a/types.h
+++ b/types.h
@@ -6,7 +6,7 @@
 
 #include <sys/types.h>
 
-#include "file_loader.h"
+#include "files.h"
 
 // BP virtual machine pattern types
 enum pattype_e {