diff --git a/include/omath/collision/LineTracer.hpp b/include/omath/collision/line_tracer.hpp
similarity index 100%
rename from include/omath/collision/LineTracer.hpp
rename to include/omath/collision/line_tracer.hpp
diff --git a/include/omath/engines/iw_engine/Constants.hpp b/include/omath/engines/iw_engine/Constants.hpp
index 8897915..bea065e 100644
--- a/include/omath/engines/iw_engine/Constants.hpp
+++ b/include/omath/engines/iw_engine/Constants.hpp
@@ -6,7 +6,7 @@
 #include <omath/Vector3.hpp>
 #include <omath/Mat.hpp>
 #include <omath/Angle.hpp>
-#include <omath/ViewAngles.hpp>
+#include <omath/view_angles.hpp>
 
 namespace omath::iw_engine
 {
diff --git a/include/omath/engines/iw_engine/Formulas.hpp b/include/omath/engines/iw_engine/Formulas.hpp
index 1249c98..72b3853 100644
--- a/include/omath/engines/iw_engine/Formulas.hpp
+++ b/include/omath/engines/iw_engine/Formulas.hpp
@@ -21,4 +21,4 @@ namespace omath::iw_engine
 
     [[nodiscard]]
     Mat4x4 CalcPerspectiveProjectionMatrix(float fieldOfView, float aspectRatio, float near, float far);
-} // namespace omath::source
+} // namespace omath::iw_engine
diff --git a/include/omath/engines/opengl_engine/Constants.hpp b/include/omath/engines/opengl_engine/Constants.hpp
index d06873b..cca5428 100644
--- a/include/omath/engines/opengl_engine/Constants.hpp
+++ b/include/omath/engines/opengl_engine/Constants.hpp
@@ -6,7 +6,7 @@
 #include <omath/Vector3.hpp>
 #include <omath/Mat.hpp>
 #include <omath/Angle.hpp>
-#include <omath/ViewAngles.hpp>
+#include <omath/view_angles.hpp>
 
 namespace omath::opengl_engine
 {
diff --git a/include/omath/engines/source_engine/Constants.hpp b/include/omath/engines/source_engine/Constants.hpp
index 6c331b2..6d6d000 100644
--- a/include/omath/engines/source_engine/Constants.hpp
+++ b/include/omath/engines/source_engine/Constants.hpp
@@ -6,7 +6,7 @@
 #include <omath/Vector3.hpp>
 #include <omath/Mat.hpp>
 #include <omath/Angle.hpp>
-#include <omath/ViewAngles.hpp>
+#include <omath/view_angles.hpp>
 
 namespace omath::source_engine
 {
diff --git a/include/omath/pathfinding/Astar.hpp b/include/omath/pathfinding/a_star.hpp
similarity index 96%
rename from include/omath/pathfinding/Astar.hpp
rename to include/omath/pathfinding/a_star.hpp
index 9cbcedb..daac92d 100644
--- a/include/omath/pathfinding/Astar.hpp
+++ b/include/omath/pathfinding/a_star.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 #include <vector>
-#include "NavigationMesh.hpp"
+#include "navigation_mesh.hpp"
 #include "omath/Vector3.hpp"
 
 namespace omath::pathfinding
diff --git a/include/omath/pathfinding/NavigationMesh.hpp b/include/omath/pathfinding/navigation_mesh.hpp
similarity index 100%
rename from include/omath/pathfinding/NavigationMesh.hpp
rename to include/omath/pathfinding/navigation_mesh.hpp
diff --git a/include/omath/projectile_prediction/ProjPredEngine.hpp b/include/omath/projectile_prediction/proj_pred_engine.hpp
similarity index 100%
rename from include/omath/projectile_prediction/ProjPredEngine.hpp
rename to include/omath/projectile_prediction/proj_pred_engine.hpp
diff --git a/include/omath/projectile_prediction/ProjPredEngineAVX2.hpp b/include/omath/projectile_prediction/proj_pred_engine_avx2.hpp
similarity index 96%
rename from include/omath/projectile_prediction/ProjPredEngineAVX2.hpp
rename to include/omath/projectile_prediction/proj_pred_engine_avx2.hpp
index ffc0c5e..84a57e5 100644
--- a/include/omath/projectile_prediction/ProjPredEngineAVX2.hpp
+++ b/include/omath/projectile_prediction/proj_pred_engine_avx2.hpp
@@ -2,7 +2,7 @@
 // Created by Vlad on 2/23/2025.
 //
 #pragma once
-#include "ProjPredEngine.hpp"
+#include "proj_pred_engine.hpp"
 
 namespace omath::projectile_prediction
 {
diff --git a/include/omath/projectile_prediction/ProjPredEngineLegacy.hpp b/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp
similarity index 95%
rename from include/omath/projectile_prediction/ProjPredEngineLegacy.hpp
rename to include/omath/projectile_prediction/proj_pred_engine_legacy.hpp
index f22308d..0b38e73 100644
--- a/include/omath/projectile_prediction/ProjPredEngineLegacy.hpp
+++ b/include/omath/projectile_prediction/proj_pred_engine_legacy.hpp
@@ -6,7 +6,7 @@
 
 #include <optional>
 #include "omath/Vector3.hpp"
-#include "omath/projectile_prediction/ProjPredEngine.hpp"
+#include "omath/projectile_prediction/proj_pred_engine.hpp"
 #include "omath/projectile_prediction/Projectile.hpp"
 #include "omath/projectile_prediction/Target.hpp"
 
diff --git a/include/omath/projection/Camera.hpp b/include/omath/projection/Camera.hpp
index c6bacbb..8fdd05d 100644
--- a/include/omath/projection/Camera.hpp
+++ b/include/omath/projection/Camera.hpp
@@ -7,7 +7,7 @@
 #include <expected>
 #include <omath/Mat.hpp>
 #include <omath/Vector3.hpp>
-#include "ErrorCodes.hpp"
+#include "error_codes.hpp"
 #include <omath/Angle.hpp>
 #include <type_traits>
 
diff --git a/include/omath/projection/ErrorCodes.hpp b/include/omath/projection/error_codes.hpp
similarity index 100%
rename from include/omath/projection/ErrorCodes.hpp
rename to include/omath/projection/error_codes.hpp
diff --git a/include/omath/ViewAngles.hpp b/include/omath/view_angles.hpp
similarity index 100%
rename from include/omath/ViewAngles.hpp
rename to include/omath/view_angles.hpp
diff --git a/source/collision/LineTracer.cpp b/source/collision/LineTracer.cpp
index 05f5bef..0dfc7f5 100644
--- a/source/collision/LineTracer.cpp
+++ b/source/collision/LineTracer.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Orange on 11/13/2024.
 //
-#include "omath/collision/LineTracer.hpp"
+#include "omath/collision/line_tracer.hpp"
 
 namespace omath::collision
 {
diff --git a/source/pathfinding/Astar.cpp b/source/pathfinding/Astar.cpp
index 4d553e7..aba160f 100644
--- a/source/pathfinding/Astar.cpp
+++ b/source/pathfinding/Astar.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Vlad on 28.07.2024.
 //
-#include "omath/pathfinding/Astar.hpp"
+#include "omath/pathfinding/a_star.hpp"
 
 #include <algorithm>
 #include <optional>
diff --git a/source/pathfinding/NavigationMesh.cpp b/source/pathfinding/NavigationMesh.cpp
index e5491a3..f908cc8 100644
--- a/source/pathfinding/NavigationMesh.cpp
+++ b/source/pathfinding/NavigationMesh.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Vlad on 28.07.2024.
 //
-#include "omath/pathfinding/NavigationMesh.hpp"
+#include "omath/pathfinding/navigation_mesh.hpp"
 
 #include <stdexcept>
 #include <algorithm>
diff --git a/source/projectile_prediction/ProjPredEngine.cpp b/source/projectile_prediction/ProjPredEngine.cpp
index 7be6708..e8e7f92 100644
--- a/source/projectile_prediction/ProjPredEngine.cpp
+++ b/source/projectile_prediction/ProjPredEngine.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Vlad on 2/23/2025.
 //
-#include "omath/projectile_prediction/ProjPredEngine.hpp"
+#include "omath/projectile_prediction/proj_pred_engine.hpp"
 
 
 namespace omath::projectile_prediction
diff --git a/source/projectile_prediction/ProjPredEngineAVX2.cpp b/source/projectile_prediction/ProjPredEngineAVX2.cpp
index 8a4f8f6..771c8e0 100644
--- a/source/projectile_prediction/ProjPredEngineAVX2.cpp
+++ b/source/projectile_prediction/ProjPredEngineAVX2.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Vlad on 2/23/2025.
 //
-#include "omath/projectile_prediction/ProjPredEngineAVX2.hpp"
+#include "omath/projectile_prediction/proj_pred_engine_avx2.hpp"
 #include "source_location"
 
 namespace omath::projectile_prediction
diff --git a/source/projectile_prediction/ProjPredEngineLegacy.cpp b/source/projectile_prediction/ProjPredEngineLegacy.cpp
index 3a8c765..2e49b78 100644
--- a/source/projectile_prediction/ProjPredEngineLegacy.cpp
+++ b/source/projectile_prediction/ProjPredEngineLegacy.cpp
@@ -1,4 +1,4 @@
-#include "omath/projectile_prediction/ProjPredEngineLegacy.hpp"
+#include "omath/projectile_prediction/proj_pred_engine_legacy.hpp"
 #include <cmath>
 #include <omath/Angles.hpp>
 
diff --git a/tests/general/UnitTestAstar.cpp b/tests/general/UnitTestAstar.cpp
index da65f9f..e33f8c0 100644
--- a/tests/general/UnitTestAstar.cpp
+++ b/tests/general/UnitTestAstar.cpp
@@ -2,7 +2,7 @@
 // Created by Vlad on 18.08.2024.
 //
 #include <gtest/gtest.h>
-#include <omath/pathfinding/Astar.hpp>
+#include <omath/pathfinding/a_star.hpp>
 
 
 TEST(UnitTestAstar, FindingRightPath)
diff --git a/tests/general/UnitTestLineTrace.cpp b/tests/general/UnitTestLineTrace.cpp
index 3c0bf04..0b72d2c 100644
--- a/tests/general/UnitTestLineTrace.cpp
+++ b/tests/general/UnitTestLineTrace.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "omath/collision/LineTracer.hpp"
+#include "omath/collision/line_tracer.hpp"
 #include "omath/Triangle.hpp"
 #include "omath/Vector3.hpp"
 
diff --git a/tests/general/UnitTestPrediction.cpp b/tests/general/UnitTestPrediction.cpp
index c77c438..94e8ae4 100644
--- a/tests/general/UnitTestPrediction.cpp
+++ b/tests/general/UnitTestPrediction.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <omath/projectile_prediction/ProjPredEngineLegacy.hpp>
+#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
 
 TEST(UnitTestPrediction, PredictionTest)
 {
diff --git a/tests/general/UnitTestViewAngles.cpp b/tests/general/UnitTestViewAngles.cpp
index 97c90e3..2860545 100644
--- a/tests/general/UnitTestViewAngles.cpp
+++ b/tests/general/UnitTestViewAngles.cpp
@@ -1,4 +1,4 @@
 //
 // Created by Orange on 11/30/2024.
 //
-#include <omath/ViewAngles.hpp>
\ No newline at end of file
+#include <omath/view_angles.hpp>
\ No newline at end of file