diff --git a/CMakeLists.txt b/CMakeLists.txt
index a53311f..5bc5b9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,22 +77,22 @@ set(CMKR_TARGET cmkr)
 set(cmkr_SOURCES "")
 
 list(APPEND cmkr_SOURCES
-	"src/args.cpp"
+	"src/arguments.cpp"
 	"src/build.cpp"
-	"src/cmake.cpp"
+	"src/cmake_generator.cpp"
 	"src/error.cpp"
-	"src/gen.cpp"
 	"src/help.cpp"
 	"src/main.cpp"
-	"include/args.hpp"
+	"src/project_parser.cpp"
+	"include/arguments.hpp"
 	"include/build.hpp"
-	"include/cmake.hpp"
+	"include/cmake_generator.hpp"
 	"include/enum_helper.hpp"
 	"include/error.hpp"
 	"include/fs.hpp"
-	"include/gen.hpp"
 	"include/help.hpp"
 	"include/literals.hpp"
+	"include/project_parser.hpp"
 )
 
 list(APPEND cmkr_SOURCES
diff --git a/include/args.hpp b/include/arguments.hpp
similarity index 100%
rename from include/args.hpp
rename to include/arguments.hpp
diff --git a/include/gen.hpp b/include/cmake_generator.hpp
similarity index 100%
rename from include/gen.hpp
rename to include/cmake_generator.hpp
diff --git a/include/cmake.hpp b/include/project_parser.hpp
similarity index 100%
rename from include/cmake.hpp
rename to include/project_parser.hpp
diff --git a/src/args.cpp b/src/arguments.cpp
similarity index 97%
rename from src/args.cpp
rename to src/arguments.cpp
index 311ff13..df5b5b6 100644
--- a/src/args.cpp
+++ b/src/arguments.cpp
@@ -1,6 +1,6 @@
-#include "args.hpp"
+#include "arguments.hpp"
 #include "build.hpp"
-#include "gen.hpp"
+#include "cmake_generator.hpp"
 #include "help.hpp"
 
 #include "fs.hpp"
diff --git a/src/build.cpp b/src/build.cpp
index de0a06b..b115615 100644
--- a/src/build.cpp
+++ b/src/build.cpp
@@ -1,7 +1,7 @@
 #include "build.hpp"
-#include "cmake.hpp"
+#include "project_parser.hpp"
 #include "error.hpp"
-#include "gen.hpp"
+#include "cmake_generator.hpp"
 
 #include "fs.hpp"
 #include <sstream>
diff --git a/src/gen.cpp b/src/cmake_generator.cpp
similarity index 99%
rename from src/gen.cpp
rename to src/cmake_generator.cpp
index d877071..5c93b28 100644
--- a/src/gen.cpp
+++ b/src/cmake_generator.cpp
@@ -1,5 +1,5 @@
-#include "gen.hpp"
-#include "cmake.hpp"
+#include "cmake_generator.hpp"
+#include "project_parser.hpp"
 #include "error.hpp"
 #include "literals.hpp"
 
diff --git a/src/main.cpp b/src/main.cpp
index 748bd0e..1ad9e21 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include "args.hpp"
+#include "arguments.hpp"
 
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/cmake.cpp b/src/project_parser.cpp
similarity index 99%
rename from src/cmake.cpp
rename to src/project_parser.cpp
index df60f29..876aa85 100644
--- a/src/cmake.cpp
+++ b/src/project_parser.cpp
@@ -1,4 +1,4 @@
-#include "cmake.hpp"
+#include "project_parser.hpp"
 
 #include "enum_helper.hpp"
 #include "fs.hpp"