diff --git a/pisi/actionsapi/__init__.py b/pisi/actionsapi/__init__.py
index 7698c446..988a44dc 100644
--- a/pisi/actionsapi/__init__.py
+++ b/pisi/actionsapi/__init__.py
@@ -13,8 +13,8 @@ __version__ = '0.1'
 
 import pisi
 
-class ActionsApiError(pisi.PisiError):
+class Error(pisi.Error):
     pass
 
-class ActionsApiException(pisi.PisiException):
+class Exception(pisi.Exception):
     pass
diff --git a/pisi/actionsapi/autotools.py b/pisi/actionsapi/autotools.py
index d30d4ed6..1a51375f 100644
--- a/pisi/actionsapi/autotools.py
+++ b/pisi/actionsapi/autotools.py
@@ -24,17 +24,17 @@ from pisi.actionsapi.shelltools import system
 from pisi.actionsapi.shelltools import can_access_file
 from pisi.actionsapi.libtools import gnuconfig_update
 
-class ConfigureError(Exception):
+class ConfigureError(pisi.actionsapi.Error):
     def __init__(self, Exception):
         ui.error(Exception)
         if can_access_file('config.log'):
             ui.error('\n!!! Please attach the config.log to your bug report:\n%s/config.log\n' % os.getcwd())
 
-class MakeError(Exception):
+class MakeError(pisi.actionsapi.Error):
     def __init__(self, Exception):
         ui.error(Exception)
 
-class InstallError(Exception):
+class InstallError(pisi.actionsapi.Error):
     def __init__(self, Exception):
         ui.error(Exception)
 
diff --git a/pisi/actionsapi/get.py b/pisi/actionsapi/get.py
index dfd3345a..c2699238 100644
--- a/pisi/actionsapi/get.py
+++ b/pisi/actionsapi/get.py
@@ -15,11 +15,15 @@
 import os.path
 
 # PISI Modules
+import pisi.actionsapi
 from pisi.ui import ui
 
 # ActionsAPI Modules
 from variables import glb
 
+class BinutilsError(pisi.actionsapi.Error):
+    pass
+
 env = glb.env
 dirs = glb.dirs
 
@@ -97,9 +101,6 @@ def exists_binary(bin):
             return True
     return False
 
-class BinutilsError:
-    pass
-
 def getBinutilsInfo(util):
     cross_build_name = '%s-%s' % (HOST(), util)
     if not exists_binary(cross_build_name):
diff --git a/pisi/actionsapi/pisitoolsfunctions.py b/pisi/actionsapi/pisitoolsfunctions.py
index 6509b97b..60316b09 100644
--- a/pisi/actionsapi/pisitoolsfunctions.py
+++ b/pisi/actionsapi/pisitoolsfunctions.py
@@ -21,10 +21,10 @@ import glob
 import pisi.actionsapi
 from pisi.actionsapi.shelltools import *
 
-class FileError(Exception):
+class FileError(pisi.actionsapi.Error):
     pass
 
-class ArgumentError(Exception):
+class ArgumentError(pisi.actionsapi.Error):
     pass
 
 def executable_insinto(sourceFile, destinationDirectory):
diff --git a/pisi/archive.py b/pisi/archive.py
index b46b869c..dcd3aa6b 100644
--- a/pisi/archive.py
+++ b/pisi/archive.py
@@ -22,7 +22,7 @@ import pisi
 import pisi.util as util
 
 
-class ArchiveError(pisi.PisiError):
+class ArchiveError(pisi.Error):
     pass
 
 
diff --git a/pisi/build.py b/pisi/build.py
index beeec95d..0340717b 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -29,7 +29,7 @@ from pisi.metadata import MetaData
 from pisi.package import Package
 
 
-class PisiBuildError(pisi.PisiError):
+class PisiBuildError(pisi.Error):
     pass
 
 
diff --git a/pisi/fetcher.py b/pisi/fetcher.py
index 8a3c421e..5728daef 100644
--- a/pisi/fetcher.py
+++ b/pisi/fetcher.py
@@ -27,7 +27,7 @@ from pisi.purl import PUrl
 from pisi.ui import ui
 
 
-class FetchError(pisi.PisiError):
+class FetchError(pisi.Error):
     pass
 
 
diff --git a/pisi/install.py b/pisi/install.py
index 436b822e..dcad3764 100644
--- a/pisi/install.py
+++ b/pisi/install.py
@@ -31,7 +31,7 @@ from pisi.comariface import comard
 import pisi.operations as operations
 #import conflicts
 
-class InstallError(pisi.PisiError):
+class InstallError(pisi.Error):
     pass
 
 class Installer:
diff --git a/pisi/installdb.py b/pisi/installdb.py
index 259ea05d..8fa114a4 100644
--- a/pisi/installdb.py
+++ b/pisi/installdb.py
@@ -26,7 +26,7 @@ from pisi.files import Files
 import pisi.util as util
 
 
-class InstallDBError(pisi.PisiError):
+class InstallDBError(pisi.Error):
     pass
 
 
diff --git a/pisi/package.py b/pisi/package.py
index 2be88629..3f5cd331 100644
--- a/pisi/package.py
+++ b/pisi/package.py
@@ -26,7 +26,7 @@ from pisi.metadata import MetaData
 from pisi.files import Files
 
 
-class PackageError(pisi.PisiError):
+class PackageError(pisi.Error):
     pass
 
 
diff --git a/pisi/packagedb.py b/pisi/packagedb.py
index 9089d66b..133df58f 100644
--- a/pisi/packagedb.py
+++ b/pisi/packagedb.py
@@ -28,7 +28,7 @@ import pisi
 import pisi.util as util
 from pisi.config import config
 
-class PackageDBError(pisi.PisiError):
+class PackageDBError(pisi.Error):
     pass
 
 class PackageDB(object):
diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py
index 59d94aae..5d69897c 100644
--- a/pisi/sourcearchive.py
+++ b/pisi/sourcearchive.py
@@ -28,7 +28,7 @@ from pisi.config import config
 from pisi.fetcher import fetchUrl
 import pisi.util as util
 
-class SourceArchiveError(pisi.PisiError):
+class SourceArchiveError(pisi.Error):
     pass
 
 class SourceArchive:
diff --git a/pisi/util.py b/pisi/util.py
index e16a7d55..5dc538e4 100644
--- a/pisi/util.py
+++ b/pisi/util.py
@@ -29,10 +29,10 @@ from pisi.ui import ui
 from pisi.constants import const
 from pisi.config import config
 
-class FileError(pisi.PisiError):
+class FileError(pisi.Error):
     pass
 
-class UtilError(pisi.PisiError):
+class UtilError(pisi.Error):
     pass
 
 
diff --git a/pisi/xmlext.py b/pisi/xmlext.py
index 50b0d34f..8a8ea3ba 100644
--- a/pisi/xmlext.py
+++ b/pisi/xmlext.py
@@ -18,7 +18,7 @@
 
 import pisi
 
-class XmlError(pisi.PisiError):
+class XmlError(pisi.Error):
     pass
 
 def getNodeAttribute(node, attrname):