diff --git a/src/errors.cpp b/src/errors.cpp
index bd83dd0..18a3be7 100644
--- a/src/errors.cpp
+++ b/src/errors.cpp
@@ -4,10 +4,10 @@
 #include <iostream>
 using namespace std;
 
+#include "include/lexer.hpp"
 #include "include/utils.hpp"
 #include "include/errors.hpp"
 #include "include/colors.hpp"
-#include "include/tokenize.hpp"
 
 string UserError::get_message(void) const {
     switch (this->type) {
diff --git a/src/interpreter.cpp b/src/eval.cpp
similarity index 99%
rename from src/interpreter.cpp
rename to src/eval.cpp
index 575af6d..e43e047 100644
--- a/src/interpreter.cpp
+++ b/src/eval.cpp
@@ -5,7 +5,7 @@
 #include "include/memory.hpp"
 #include "include/parser.hpp"
 #include "include/casting.hpp"
-#include "include/interpreter.hpp"
+#include "include/eval.hpp"
 using namespace std;
 
 
diff --git a/src/include/errors.hpp b/src/include/errors.hpp
index 611d1a2..277d58e 100644
--- a/src/include/errors.hpp
+++ b/src/include/errors.hpp
@@ -4,7 +4,7 @@
 #include <string>
 using namespace std;
 
-#include "tokenize.hpp"
+#include "lexer.hpp"
 
 /**
  * Errors
diff --git a/src/include/interpreter.hpp b/src/include/eval.hpp
similarity index 100%
rename from src/include/interpreter.hpp
rename to src/include/eval.hpp
diff --git a/src/include/execute.hpp b/src/include/execute.hpp
index f63c8e8..b9e5dc7 100644
--- a/src/include/execute.hpp
+++ b/src/include/execute.hpp
@@ -5,9 +5,9 @@
 #include "parser.hpp"
 #include "colors.hpp"
 #include "memory.hpp"
-#include "tokenize.hpp"
+#include "lexer.hpp"
 #include "analysis.hpp"
-#include "interpreter.hpp"
+#include "eval.hpp"
 
 typedef struct ExecArgs {
     bool print_tokens=false;
diff --git a/src/include/tokenize.hpp b/src/include/lexer.hpp
similarity index 100%
rename from src/include/tokenize.hpp
rename to src/include/lexer.hpp
diff --git a/src/include/parser.hpp b/src/include/parser.hpp
index edf7fdb..ceb1267 100644
--- a/src/include/parser.hpp
+++ b/src/include/parser.hpp
@@ -5,7 +5,7 @@
 #include <variant>
 #include <optional>
 #include <stdexcept>
-#include "tokenize.hpp"
+#include "lexer.hpp"
 #include "errors.hpp"
 using namespace std;
 
diff --git a/src/tokenize.cpp b/src/lexer.cpp
similarity index 99%
rename from src/tokenize.cpp
rename to src/lexer.cpp
index 1ad7576..1469d10 100644
--- a/src/tokenize.cpp
+++ b/src/lexer.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <string>
 #include "include/errors.hpp"
-#include "include/tokenize.hpp"
+#include "include/lexer.hpp"
 using namespace std;
 
 regex INT_REGEX ("\\d+");
diff --git a/src/parser.cpp b/src/parser.cpp
index 96a08a6..483969c 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -3,11 +3,11 @@
 #include <algorithm>
 using namespace std;
 
-#include "include/tokenize.hpp"
+#include "include/lexer.hpp"
+#include "include/utils.hpp"
 #include "include/colors.hpp"
 #include "include/parser.hpp"
 #include "include/config.hpp"
-#include "include/utils.hpp"
 
 CodePosition null_pos = {
     .line = -1,
diff --git a/test/tokenize.cpp b/test/lexer.cpp
similarity index 99%
rename from test/tokenize.cpp
rename to test/lexer.cpp
index 5fa2f8e..59b5531 100644
--- a/test/tokenize.cpp
+++ b/test/lexer.cpp
@@ -4,7 +4,7 @@ using namespace std;
 
 #include "include/test.hpp"
 
-#include "../src/include/tokenize.hpp"
+#include "../src/include/lexer.hpp"
 
 int main() {
     _TEST_PRESENTATION("Lexer");