diff --git a/lib/Event_handler.php b/lib/EventHandler.php
similarity index 96%
rename from lib/Event_handler.php
rename to lib/EventHandler.php
index 0472aa9cc..b6ede964d 100644
--- a/lib/Event_handler.php
+++ b/lib/EventHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-class Event_handler
+class EventHandler
 {
 	private $widgets = NULL;
 	private $conf;
diff --git a/lib/XMPPConnect.php b/lib/XMPPConnect.php
index db0d6fa27..659f63b63 100644
--- a/lib/XMPPConnect.php
+++ b/lib/XMPPConnect.php
@@ -134,7 +134,7 @@ class XMPPConnect
         }
         
         if($html != '') {
-			$evt = new Event_handler();
+			$evt = new EventHandler();
 			$evt->runEvent('incomechat', $html);
         }
 	}
diff --git a/lib/widgets/Chat.php b/lib/widgets/Chat.php
index ce3df1527..d7886ee28 100644
--- a/lib/widgets/Chat.php
+++ b/lib/widgets/Chat.php
@@ -43,4 +43,4 @@ class Chat extends Widget
 	}
 }
 
-p?>
+?>