diff --git a/cclox_src/parser.cc b/cclox_src/parser.cc
index eaf1c70..f6e9581 100644
--- a/cclox_src/parser.cc
+++ b/cclox_src/parser.cc
@@ -2,8 +2,8 @@
 #define PARSER_CC
 
 #include "parser/expr.cc"
-#include "parser/printer.cc"
 #include "parser/parser.cc"
-#include "parser/interpreter.cc"
+#include "parser/ast_printer.cc"
+#include "parser/ast_interpreter.cc"
 
 #endif
diff --git a/cclox_src/parser.hh b/cclox_src/parser.hh
index 1ef374d..b77c468 100644
--- a/cclox_src/parser.hh
+++ b/cclox_src/parser.hh
@@ -2,8 +2,8 @@
 #define MAIN_PARSER_HH
 
 #include "parser/expr.hh"
-#include "parser/printer.hh"
 #include "parser/parser.hh"
-#include "parser/interpreter.hh"
+#include "parser/ast_printer.hh"
+#include "parser/ast_interpreter.hh"
 
 #endif
diff --git a/cclox_src/parser/interpreter.cc b/cclox_src/parser/ast_interpreter.cc
similarity index 99%
rename from cclox_src/parser/interpreter.cc
rename to cclox_src/parser/ast_interpreter.cc
index 696e601..2925759 100644
--- a/cclox_src/parser/interpreter.cc
+++ b/cclox_src/parser/ast_interpreter.cc
@@ -1,4 +1,4 @@
-#include "interpreter.hh"
+#include "ast_interpreter.hh"
 #include "expr.hh"
 #include "../error_handler.hh"
 #include "../tokenizer.hh"
diff --git a/cclox_src/parser/interpreter.hh b/cclox_src/parser/ast_interpreter.hh
similarity index 100%
rename from cclox_src/parser/interpreter.hh
rename to cclox_src/parser/ast_interpreter.hh
diff --git a/cclox_src/parser/printer.cc b/cclox_src/parser/ast_printer.cc
similarity index 97%
rename from cclox_src/parser/printer.cc
rename to cclox_src/parser/ast_printer.cc
index 2376cf2..5680938 100644
--- a/cclox_src/parser/printer.cc
+++ b/cclox_src/parser/ast_printer.cc
@@ -1,4 +1,4 @@
-#include "printer.hh"
+#include "ast_printer.hh"
 #include "expr.hh"
 #include <cassert>
 #include <string>
diff --git a/cclox_src/parser/printer.hh b/cclox_src/parser/ast_printer.hh
similarity index 100%
rename from cclox_src/parser/printer.hh
rename to cclox_src/parser/ast_printer.hh