diff --git a/include/Engine/Editor/EditorRenderSystem.h b/include/Engine/Editor/EditorWidgetRenderSystem.h
similarity index 59%
rename from include/Engine/Editor/EditorRenderSystem.h
rename to include/Engine/Editor/EditorWidgetRenderSystem.h
index a42ad779..b8e28bc7 100644
--- a/include/Engine/Editor/EditorRenderSystem.h
+++ b/include/Engine/Editor/EditorWidgetRenderSystem.h
@@ -1,5 +1,5 @@
-#ifndef EditorRenderSystem_h__
-#define EditorRenderSystem_h__
+#ifndef EditorWidgetRenderSystem_h__
+#define EditorWidgetRenderSystem_h__
 
 #include "../Core/System.h"
 #include "../Rendering/IRenderer.h"
@@ -7,10 +7,10 @@
 #include "../Rendering/Camera.h"
 #include "../Rendering/ESetCamera.h"
 
-class EditorRenderSystem : public ImpureSystem
+class EditorWidgetRenderSystem : public ImpureSystem
 {
 public:
-    EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
+    EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame);
 
     virtual void Update(double dt) override;
 
@@ -20,7 +20,7 @@ private:
     Camera* m_EditorCamera;
     EntityWrapper m_CurrentCamera = EntityWrapper::Invalid;
 
-    EventRelay<EditorRenderSystem, Events::SetCamera> m_ESetCamera;
+    EventRelay<EditorWidgetRenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera& e);
 };
 
diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index 62ddba88..edadfb4e 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -1,6 +1,6 @@
 #include "Editor/EditorSystem.h"
 #include "Core/UniformScaleSystem.h"
-#include "Editor/EditorRenderSystem.h"
+#include "Editor/EditorWidgetRenderSystem.h"
 #include "Editor/EditorWidgetSystem.h"
 #include "Core/EntityFile.h"
 
@@ -13,7 +13,7 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_EditorWorldSystemPipeline = new SystemPipeline(m_EditorWorld, m_EventBroker, IsClient, IsServer);
     m_EditorWorldSystemPipeline->AddSystem<UniformScaleSystem>(0);
     m_EditorWorldSystemPipeline->AddSystem<EditorWidgetSystem>(0, m_Renderer);
-    m_EditorWorldSystemPipeline->AddSystem<EditorRenderSystem>(1, m_Renderer, m_RenderFrame);
+    m_EditorWorldSystemPipeline->AddSystem<EditorWidgetRenderSystem>(1, m_Renderer, m_RenderFrame);
     
     m_EditorCamera = importEntity(EntityWrapper(m_EditorWorld, EntityID_Invalid), "Schema/Entities/Empty.xml");
     m_ActualCamera = m_EditorCamera;
diff --git a/src/Engine/Editor/EditorRenderSystem.cpp b/src/Engine/Editor/EditorWidgetRenderSystem.cpp
similarity index 90%
rename from src/Engine/Editor/EditorRenderSystem.cpp
rename to src/Engine/Editor/EditorWidgetRenderSystem.cpp
index f5fcc1a1..0911fbe3 100644
--- a/src/Engine/Editor/EditorRenderSystem.cpp
+++ b/src/Engine/Editor/EditorWidgetRenderSystem.cpp
@@ -1,16 +1,16 @@
-#include "Editor/EditorRenderSystem.h"
+#include "Editor/EditorWidgetRenderSystem.h"
 
-EditorRenderSystem::EditorRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
+EditorWidgetRenderSystem::EditorWidgetRenderSystem(SystemParams params, IRenderer* renderer, RenderFrame* renderFrame) 
     : System(params)
     , m_Renderer(renderer)
     , m_RenderFrame(renderFrame)
 {
-    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorRenderSystem::OnSetCamera);
+    EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &EditorWidgetRenderSystem::OnSetCamera);
     auto resolution = Rectangle::Rectangle(1280, 720);
     m_EditorCamera = new Camera((float)resolution.Width / resolution.Height, glm::radians(45.f), 0.01f, 5000.f);
 }
 
-void EditorRenderSystem::Update(double dt)
+void EditorWidgetRenderSystem::Update(double dt)
 {
     if (m_CurrentCamera.Valid()) {
         ComponentWrapper cameraTransform = m_CurrentCamera["Transform"];
@@ -82,7 +82,7 @@ void EditorRenderSystem::Update(double dt)
     m_RenderFrame->Add(scene);
 }
 
-bool EditorRenderSystem::OnSetCamera(Events::SetCamera& e)
+bool EditorWidgetRenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];
     ComponentWrapper cCamera = e.CameraEntity["Camera"];