diff --git a/homeassistant/__init__.py b/homeassistant/__init__.py
index db52a1226f7..2127f3b4865 100644
--- a/homeassistant/__init__.py
+++ b/homeassistant/__init__.py
@@ -471,9 +471,9 @@ class Timer(threading.Thread):
                                 {'now': now})
 
 
-class HomeAssistantException(Exception):
+class HomeAssistantError(Exception):
     """ General Home Assistant exception occured. """
 
 
-class ServiceDoesNotExistException(HomeAssistantException):
+class ServiceDoesNotExistError(HomeAssistantError):
     """ A service has been referenced that deos not exist. """