diff --git a/common/exceptions.py b/common/exceptions.py
index a38dcdb..aed6e64 100644
--- a/common/exceptions.py
+++ b/common/exceptions.py
@@ -21,5 +21,5 @@ class TaskListError(Exception):
 		return "Error in tasklist: {0}".format(self.message)
 
 
-class TaskException(Exception):
+class TaskError(Exception):
 	pass
diff --git a/common/tasks.py b/common/tasks.py
index 15d948b..24dcb65 100644
--- a/common/tasks.py
+++ b/common/tasks.py
@@ -8,5 +8,5 @@ class TriggerRollback(Task):
 	description = 'Triggering a rollback by throwing an exception'
 
 	def run(self, info):
-		from common.exceptions import TaskException
-		raise TaskException('Trigger rollback')
+		from common.exceptions import TaskError
+		raise TaskError('Trigger rollback')
diff --git a/providers/ec2/tasks/ebs.py b/providers/ec2/tasks/ebs.py
index 2ffde74..1c0758b 100644
--- a/providers/ec2/tasks/ebs.py
+++ b/providers/ec2/tasks/ebs.py
@@ -1,6 +1,6 @@
 from base import Task
 from common import phases
-from common.exceptions import TaskException
+from common.exceptions import TaskError
 from connection import Connect
 import time
 
@@ -79,5 +79,5 @@ class DeleteVolume(Task):
 		del info.volume
 
 
-class VolumeError(TaskException):
+class VolumeError(TaskError):
 	pass