diff --git a/pykd/breakpoint.cpp b/pykd/eventhandler.cpp
similarity index 94%
rename from pykd/breakpoint.cpp
rename to pykd/eventhandler.cpp
index 39540e7..28d9859 100644
--- a/pykd/breakpoint.cpp
+++ b/pykd/eventhandler.cpp
@@ -2,7 +2,7 @@
 
 #include "kdlib\eventhandler.h"
 
-#include "breakpoint.h"
+#include "eventhandler.h"
 #include "dbgexcept.h"
 
 namespace pykd {
diff --git a/pykd/breakpoint.h b/pykd/eventhandler.h
similarity index 100%
rename from pykd/breakpoint.h
rename to pykd/eventhandler.h
diff --git a/pykd/pykd.vcxproj b/pykd/pykd.vcxproj
index 2821400..550e378 100644
--- a/pykd/pykd.vcxproj
+++ b/pykd/pykd.vcxproj
@@ -123,9 +123,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="breakpoint.h" />
     <ClInclude Include="dbgengine.h" />
     <ClInclude Include="dbgexcept.h" />
+    <ClInclude Include="eventhandler.h" />
     <ClInclude Include="memaccess.h" />
     <ClInclude Include="module.h" />
     <ClInclude Include="stdafx.h" />
@@ -137,7 +137,6 @@
     <ClInclude Include="windbgext.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="breakpoint.cpp" />
     <ClCompile Include="dbgengine.cpp" />
     <ClCompile Include="dbgexcept.cpp" />
     <ClCompile Include="dllmain.cpp">
@@ -151,6 +150,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="eventhandler.cpp" />
     <ClCompile Include="pymod.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/pykd/pykd.vcxproj.filters b/pykd/pykd.vcxproj.filters
index dc85d21..bdaccbc 100644
--- a/pykd/pykd.vcxproj.filters
+++ b/pykd/pykd.vcxproj.filters
@@ -48,7 +48,7 @@
     <ClInclude Include="dbgengine.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="breakpoint.h">
+    <ClInclude Include="eventhandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -71,7 +71,7 @@
     <ClCompile Include="dbgengine.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="breakpoint.cpp">
+    <ClCompile Include="eventhandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/pykd/pymod.cpp b/pykd/pymod.cpp
index aaa141c..3ad3cc3 100644
--- a/pykd/pymod.cpp
+++ b/pykd/pymod.cpp
@@ -12,7 +12,7 @@
 #include "typeinfo.h"
 #include "typedvar.h"
 #include "windbgext.h"
-#include "breakpoint.h"
+#include "eventhandler.h"
 
 using namespace pykd;
 
@@ -634,11 +634,11 @@ BOOST_PYTHON_MODULE( pykd )
         .value("NoDebuggee", kdlib::DebugStatusNoDebuggee )
         .export_values();
 
-   // python::class_<EventHandlerWrap, EventHandlerPtr, boost::noncopyable>(
-   //     "eventHandler", "Base class for overriding and handling debug notifications" )
-   //     .def( "onBreakpoint", &EventHandlerWrap::OnBreakpoint,
-   //         "Triggered breakpoint event. Parameter is int: ID of breakpoint\n"
-   //         "For ignore event method must return eventResult.noChange" )
+    //python::class_<EventHandler, EventHandlerPtr, boost::noncopyable>(
+    //    "eventHandler", "Base class for overriding and handling debug notifications" )
+    //     .def( "onBreakpoint", &EventHandler::OnBreakpoint,
+    //        "Triggered breakpoint event. Parameter is int: ID of breakpoint\n"
+    //        "For ignore event method must return eventResult.noChange" )
    //     .def( "onModuleLoad", &EventHandlerWrap::OnModuleLoad,
    //         "Triggered module load event. Parameter are long: module base, string: module name\n"
    //         "For ignore event method must return eventResult.noChange" )