diff --git a/Blarg.GameFramework/Blarg.GameFramework.csproj b/Blarg.GameFramework/Blarg.GameFramework.csproj
index 63f1692..415242e 100644
--- a/Blarg.GameFramework/Blarg.GameFramework.csproj
+++ b/Blarg.GameFramework/Blarg.GameFramework.csproj
@@ -144,7 +144,7 @@
     <Compile Include="Events\Event.cs" />
     <Compile Include="Events\EventManager.cs" />
     <Compile Include="Events\IEventListener.cs" />
-    <Compile Include="Events\EventHandler.cs" />
+    <Compile Include="Events\EventListener.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ItemGroup>
diff --git a/Blarg.GameFramework/Events/EventHandler.cs b/Blarg.GameFramework/Events/EventListener.cs
similarity index 82%
rename from Blarg.GameFramework/Events/EventHandler.cs
rename to Blarg.GameFramework/Events/EventListener.cs
index 76a4112..0d33a28 100644
--- a/Blarg.GameFramework/Events/EventHandler.cs
+++ b/Blarg.GameFramework/Events/EventListener.cs
@@ -2,11 +2,11 @@ using System;
 
 namespace Blarg.GameFramework.Events
 {
-	public abstract class EventHandler : IEventListener
+	public abstract class EventListener : IEventListener
 	{
 		public readonly EventManager EventManager;
 
-		public EventHandler(EventManager eventManager)
+		public EventListener(EventManager eventManager)
 		{
 			if (eventManager == null)
 				throw new ArgumentNullException("eventManager");