diff --git a/Escape-the-Dawn/Components/Transform.h b/Escape-the-Dawn/Components/TransformComponent.h
similarity index 100%
rename from Escape-the-Dawn/Components/Transform.h
rename to Escape-the-Dawn/Components/TransformComponent.h
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
index df41510..65fac93 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
@@ -103,7 +103,7 @@
   <ItemGroup>
     <ClInclude Include="Component.h" />
     <ClInclude Include="ComponentFactory.h" />
-    <ClInclude Include="Components\Transform.h" />
+    <ClInclude Include="Components\TransformComponent.h" />
     <ClInclude Include="Entity.h" />
     <ClInclude Include="logging.h" />
     <ClInclude Include="glerror.h" />
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
index 3fdf496..edf544f 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
@@ -25,9 +25,7 @@
     <ClCompile Include="Systems\SoundsSystem.cpp">
       <Filter>Systems</Filter>
     </ClCompile>
-    <ClCompile Include="Model.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="Model.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Component.h" />
@@ -59,12 +57,10 @@
     <ClInclude Include="Systems\SoundSystem.h">
       <Filter>Systems</Filter>
     </ClInclude>
-    <ClInclude Include="Components\Transform.h">
+    <ClInclude Include="Model.h" />
+    <ClInclude Include="Components\TransformComponent.h">
       <Filter>Components</Filter>
     </ClInclude>
-    <ClInclude Include="Model.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Shaders\Fragment.glsl">
diff --git a/Escape-the-Dawn/Systems/CollisionSystem.h b/Escape-the-Dawn/Systems/CollisionSystem.h
index c5c1bdd..008115a 100644
--- a/Escape-the-Dawn/Systems/CollisionSystem.h
+++ b/Escape-the-Dawn/Systems/CollisionSystem.h
@@ -4,7 +4,7 @@
 #include "System.h"
 #include "logging.h"
 
-#include "Components/Transform.h"
+#include "Components/TransformComponent.h"
 
 
 namespace Systems