diff --git a/src/main.cpp b/src/main.cpp
index b51934e..ddf1bfa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
 #include <GLFW/glfw3.h>
 #include <fmt/core.h>
 
-#include "systems/window-system.hpp"
+#include "systems/windowsystem.hpp"
 
 void error_callback(int error_code, const char *description) {
   fmt::print("[ERROR - {}] {}\n", error_code, description);
diff --git a/src/systems/meson.build b/src/systems/meson.build
index e42b237..db627d1 100644
--- a/src/systems/meson.build
+++ b/src/systems/meson.build
@@ -1,6 +1,6 @@
 sources += files(
-  'shader-system.cpp',
-  'shader-system.hpp',
-  'window-system.cpp',
-  'window-system.hpp',
+  'shadersystem.cpp',
+  'shadersystem.hpp',
+  'windowsystem.cpp',
+  'windowsystem.hpp',
 )
diff --git a/src/systems/shader-system.cpp b/src/systems/shadersystem.cpp
similarity index 98%
rename from src/systems/shader-system.cpp
rename to src/systems/shadersystem.cpp
index df3bb63..49083c2 100644
--- a/src/systems/shader-system.cpp
+++ b/src/systems/shadersystem.cpp
@@ -1,4 +1,4 @@
-#include "shader-system.hpp"
+#include "shadersystem.hpp"
 
 typedef struct Vertex {
   vec2 pos;
diff --git a/src/systems/shader-system.hpp b/src/systems/shadersystem.hpp
similarity index 100%
rename from src/systems/shader-system.hpp
rename to src/systems/shadersystem.hpp
diff --git a/src/systems/window-system.cpp b/src/systems/windowsystem.cpp
similarity index 93%
rename from src/systems/window-system.cpp
rename to src/systems/windowsystem.cpp
index 626abc0..3d65a00 100644
--- a/src/systems/window-system.cpp
+++ b/src/systems/windowsystem.cpp
@@ -1,4 +1,4 @@
-#include "window-system.hpp"
+#include "windowsystem.hpp"
 
 WindowSystem::WindowSystem(GLFWwindow *window,
                            class ShaderSystem shaderSystem) {
diff --git a/src/systems/window-system.hpp b/src/systems/windowsystem.hpp
similarity index 88%
rename from src/systems/window-system.hpp
rename to src/systems/windowsystem.hpp
index 9fd6f59..f7de070 100644
--- a/src/systems/window-system.hpp
+++ b/src/systems/windowsystem.hpp
@@ -1,6 +1,6 @@
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
-#include "shader-system.hpp"
+#include "shadersystem.hpp"
 
 class WindowSystem {
   GLFWwindow *window;