diff --git a/telegram/__init__.py b/telegram/__init__.py
index 742c83718..52f49691d 100644
--- a/telegram/__init__.py
+++ b/telegram/__init__.py
@@ -48,7 +48,7 @@ from .message import Message
 from .update import Update
 from .bot import Bot
 from .dispatcher import Dispatcher
-from .boteventhandler import Updater
+from .updater import Updater
 
 __all__ = ['Bot', 'Updater', 'Dispatcher', 'Emoji', 'TelegramError',
            'InputFile', 'ReplyMarkup', 'ForceReply', 'ReplyKeyboardHide',
diff --git a/telegram/boteventhandler.py b/telegram/updater.py
similarity index 98%
rename from telegram/boteventhandler.py
rename to telegram/updater.py
index 4d58f65da..ee302e234 100644
--- a/telegram/boteventhandler.py
+++ b/telegram/updater.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
 """
-This module contains the class BotEventHandler, which tries to make creating
-
-Telegram Bots intuitive!
+This module contains the class Updater, which tries to make creating Telegram
+Bots intuitive!
 """
 import logging
 import os