diff --git a/inferno/src/inferno/scene/scene.cpp b/inferno/src/inferno/scene/scene.cpp
index f7c17d6..ed54fb0 100644
--- a/inferno/src/inferno/scene/scene.cpp
+++ b/inferno/src/inferno/scene/scene.cpp
@@ -7,10 +7,10 @@
 #include "inferno/scene/scene.h"
 #include "inferno/script/cameracontroller.h"
 #include "inferno/script/nativescript.h"
-#include "inferno/systems/camera.h"
-#include "inferno/systems/render.h"
-#include "inferno/systems/script.h"
-#include "inferno/systems/transform.h"
+#include "inferno/systems/camerasystem.h"
+#include "inferno/systems/rendersystem.h"
+#include "inferno/systems/scriptsystem.h"
+#include "inferno/systems/transformsystem.h"
 
 namespace Inferno {
 
diff --git a/inferno/src/inferno/systems/camera.cpp b/inferno/src/inferno/systems/camerasystem.cpp
similarity index 98%
rename from inferno/src/inferno/systems/camera.cpp
rename to inferno/src/inferno/systems/camerasystem.cpp
index cea0622..52c10ef 100644
--- a/inferno/src/inferno/systems/camera.cpp
+++ b/inferno/src/inferno/systems/camerasystem.cpp
@@ -5,7 +5,7 @@
 #include "inferno/assert.h"
 #include "inferno/io/input.h"
 #include "inferno/io/log.h"
-#include "inferno/systems/camera.h"
+#include "inferno/systems/camerasystem.h"
 #include "inferno/window.h"
 
 namespace Inferno {
diff --git a/inferno/src/inferno/systems/camera.h b/inferno/src/inferno/systems/camerasystem.h
similarity index 100%
rename from inferno/src/inferno/systems/camera.h
rename to inferno/src/inferno/systems/camerasystem.h
diff --git a/inferno/src/inferno/systems/render.cpp b/inferno/src/inferno/systems/rendersystem.cpp
similarity index 95%
rename from inferno/src/inferno/systems/render.cpp
rename to inferno/src/inferno/systems/rendersystem.cpp
index 13b4d4d..b8fec6a 100644
--- a/inferno/src/inferno/systems/render.cpp
+++ b/inferno/src/inferno/systems/rendersystem.cpp
@@ -5,7 +5,7 @@
 #include "inferno/components/transformcomponent.h"
 #include "inferno/io/log.h"
 #include "inferno/render/renderer.h"
-#include "inferno/systems/render.h"
+#include "inferno/systems/rendersystem.h"
 
 namespace Inferno {
 
diff --git a/inferno/src/inferno/systems/render.h b/inferno/src/inferno/systems/rendersystem.h
similarity index 100%
rename from inferno/src/inferno/systems/render.h
rename to inferno/src/inferno/systems/rendersystem.h
diff --git a/inferno/src/inferno/systems/script.cpp b/inferno/src/inferno/systems/scriptsystem.cpp
similarity index 98%
rename from inferno/src/inferno/systems/script.cpp
rename to inferno/src/inferno/systems/scriptsystem.cpp
index af792a9..7105611 100644
--- a/inferno/src/inferno/systems/script.cpp
+++ b/inferno/src/inferno/systems/scriptsystem.cpp
@@ -8,7 +8,7 @@
 #include "inferno/scene/scene.h"
 #include "inferno/script/luascript.h"
 #include "inferno/script/nativescript.h"
-#include "inferno/systems/script.h"
+#include "inferno/systems/scriptsystem.h"
 
 namespace Inferno {
 
diff --git a/inferno/src/inferno/systems/script.h b/inferno/src/inferno/systems/scriptsystem.h
similarity index 100%
rename from inferno/src/inferno/systems/script.h
rename to inferno/src/inferno/systems/scriptsystem.h
diff --git a/inferno/src/inferno/systems/transform.cpp b/inferno/src/inferno/systems/transformsystem.cpp
similarity index 96%
rename from inferno/src/inferno/systems/transform.cpp
rename to inferno/src/inferno/systems/transformsystem.cpp
index f3cf4cc..f69d15b 100644
--- a/inferno/src/inferno/systems/transform.cpp
+++ b/inferno/src/inferno/systems/transformsystem.cpp
@@ -3,7 +3,7 @@
 #include "inferno/assert.h"
 #include "inferno/components/transformcomponent.h"
 #include "inferno/io/log.h"
-#include "inferno/systems/transform.h"
+#include "inferno/systems/transformsystem.h"
 
 namespace Inferno {
 
diff --git a/inferno/src/inferno/systems/transform.h b/inferno/src/inferno/systems/transformsystem.h
similarity index 100%
rename from inferno/src/inferno/systems/transform.h
rename to inferno/src/inferno/systems/transformsystem.h