diff --git a/src/MessageRelay.h b/src/EventRelay.h
similarity index 79%
rename from src/MessageRelay.h
rename to src/EventRelay.h
index 692f8a7..a7629af 100644
--- a/src/MessageRelay.h
+++ b/src/EventRelay.h
@@ -5,17 +5,17 @@
 #include <unordered_map>
 #include <list>
 
-struct Message
+struct Event
 {
 protected:
-	Message() { }
+	Event() { }
 };
 
-class MessageRelay
+class EventRelay
 {
 private:
 	typedef std::string MessageType_t;
-	typedef std::function<bool(Message)> MessageCallback_t;
+	typedef std::function<bool(Event)> MessageCallback_t;
 
 public:
 	void Subscribe(std::string messageType, MessageCallback_t callback)
@@ -23,7 +23,7 @@ public:
 		m_Callbacks[messageType].push_back(callback);
 	}
 
-	void Raise(std::string messageType, Message message)
+	void Raise(std::string messageType, Event message)
 	{
 		auto callbackIt = m_Callbacks.find(messageType);
 		if (callbackIt == m_Callbacks.end())
diff --git a/vs11/Returngeance/Returngeance.vcxproj b/vs11/Returngeance/Returngeance.vcxproj
index f2e85c8..64aea48 100755
--- a/vs11/Returngeance/Returngeance.vcxproj
+++ b/vs11/Returngeance/Returngeance.vcxproj
@@ -140,7 +140,7 @@
     <ClInclude Include="..\..\src\Factory.h" />
     <ClInclude Include="..\..\src\GameWorld.h" />
     <ClInclude Include="..\..\src\GUI\Frame.h" />
-    <ClInclude Include="..\..\src\MessageRelay.h" />
+    <ClInclude Include="..\..\src\EventRelay.h" />
     <ClInclude Include="..\..\src\Model.h" />
     <ClInclude Include="..\..\src\OBJ.h" />
     <ClInclude Include="..\..\src\PrecompiledHeader.h" />
diff --git a/vs11/Returngeance/Returngeance.vcxproj.filters b/vs11/Returngeance/Returngeance.vcxproj.filters
index 67c8abe..e716742 100755
--- a/vs11/Returngeance/Returngeance.vcxproj.filters
+++ b/vs11/Returngeance/Returngeance.vcxproj.filters
@@ -220,10 +220,10 @@
     <ClInclude Include="..\..\src\GUI\Frame.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\MessageRelay.h" />
     <ClInclude Include="..\..\src\Util\Rectangle.h">
       <Filter>Util</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\EventRelay.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\Shaders\AABB.frag.glsl">