From 293753026b448736be1e401a82157fb1dea0a6fe Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Sun, 19 Aug 2012 02:08:31 +0200
Subject: [PATCH] follow new class naming scheme (see #86)

---
 easybuild/easyblocks/a/armadillo.py          |  8 ++++----
 easybuild/easyblocks/b/boost.py              |  2 +-
 easybuild/easyblocks/b/bzip2.py              |  5 ++---
 easybuild/easyblocks/c/cgal.py               |  8 ++++----
 easybuild/easyblocks/c/cmake.py              |  2 +-
 easybuild/easyblocks/c/cmakepythonpackage.py | 18 +++++++++---------
 easybuild/easyblocks/c/cplex.py              | 10 +++++-----
 easybuild/easyblocks/d/dolfin.py             | 10 +++++-----
 easybuild/easyblocks/i/icc.py                |  8 ++++----
 easybuild/easyblocks/i/ifort.py              |  4 ++--
 easybuild/easyblocks/i/imkl.py               | 14 +++++++-------
 easybuild/easyblocks/i/impi.py               |  8 ++++----
 easybuild/easyblocks/i/intelbase.py          |  2 +-
 easybuild/easyblocks/i/ipp.py                |  6 +++---
 easybuild/easyblocks/i/itac.py               | 12 ++++++------
 easybuild/easyblocks/m/metis.py              |  2 +-
 easybuild/easyblocks/m/mtl4.py               | 10 +++++-----
 easybuild/easyblocks/p/packedbinary.py       |  4 ++--
 easybuild/easyblocks/p/parmetis.py           |  2 +-
 easybuild/easyblocks/p/petsc.py              |  2 +-
 easybuild/easyblocks/p/pythonpackage.py      |  2 +-
 easybuild/easyblocks/s/scotch.py             |  2 +-
 easybuild/easyblocks/s/slepc.py              |  2 +-
 easybuild/easyblocks/s/suitesparse.py        |  2 +-
 easybuild/easyblocks/s/swig.py               |  4 ++--
 easybuild/easyblocks/t/tbb.py                | 10 +++++-----
 easybuild/easyblocks/t/trilinos.py           | 12 ++++++------
 easybuild/easyblocks/u/ufc.py                |  8 ++++----
 28 files changed, 89 insertions(+), 90 deletions(-)

diff --git a/easybuild/easyblocks/a/armadillo.py b/easybuild/easyblocks/a/armadillo.py
index c706103b52..47e231d0a7 100644
--- a/easybuild/easyblocks/a/armadillo.py
+++ b/easybuild/easyblocks/a/armadillo.py
@@ -22,11 +22,11 @@
 """
 import os
 
-from easybuild.easyblocks.c.cmake import CMake
+from easybuild.easyblocks.c.cmake import EB_CMake
 from easybuild.tools.modules import get_software_root
 
 
-class Armadillo(CMake):
+class EB_Armadillo(EB_CMake):
     """Support for building Armadillo."""
 
     def configure(self):
@@ -43,7 +43,7 @@ def configure(self):
         self.updatecfg('configopts', '-DBLAS_LIBRARY:PATH="%s"' % os.getenv('LIBBLAS'))
         self.updatecfg('configopts', '-DLAPACK_LIBRARY:PATH="%s"' % os.getenv('LIBLAPACK'))
 
-        CMake.configure(self)
+        EB_CMake.configure(self)
 
     def sanitycheck(self):
         """Custom sanity check for Armadillo."""
@@ -57,4 +57,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        CMake.sanitycheck(self)
\ No newline at end of file
+        EB_CMake.sanitycheck(self)
diff --git a/easybuild/easyblocks/b/boost.py b/easybuild/easyblocks/b/boost.py
index 282c54e8d8..878b743694 100644
--- a/easybuild/easyblocks/b/boost.py
+++ b/easybuild/easyblocks/b/boost.py
@@ -35,7 +35,7 @@
 from easybuild.tools.modules import get_software_root
 
 
-class Boost(Application):
+class EB_Boost(Application):
     """Support for building Boost."""
 
     def __init__(self, *args, **kwargs):
diff --git a/easybuild/easyblocks/b/bzip2.py b/easybuild/easyblocks/b/bzip2.py
index c1124bc2e0..42077df7bc 100644
--- a/easybuild/easyblocks/b/bzip2.py
+++ b/easybuild/easyblocks/b/bzip2.py
@@ -1,5 +1,4 @@
-##
-# Copyright 2012 Kenneth Hoste
+### Copyright 2012 Kenneth Hoste
 # Copyright 2012 Jens Timmerman
 #
 # This file is part of EasyBuild
@@ -27,7 +26,7 @@
 from easybuild.framework.application import Application
 
 
-class Bzip2(Application):
+class EB_bzip2(Application):
     """Support for building and installing bzip2."""
 
     # no configure script
diff --git a/easybuild/easyblocks/c/cgal.py b/easybuild/easyblocks/c/cgal.py
index e900d55392..b3d539bc30 100644
--- a/easybuild/easyblocks/c/cgal.py
+++ b/easybuild/easyblocks/c/cgal.py
@@ -24,11 +24,11 @@
 """
 import os
 
-from easybuild.easyblocks.c.cmake import CMake
+from easybuild.easyblocks.c.cmake import EB_CMake
 from easybuild.tools.modules import get_software_root
 
 
-class CGAL(CMake):
+class EB_CGAL(EB_CMake):
     """Support for building CGAL."""
 
     def configure(self):
@@ -45,7 +45,7 @@ def configure(self):
 
         os.environ['BOOST_ROOT'] = get_software_root("Boost")
 
-        CMake.configure(self)
+        EB_CMake.configure(self)
 
     def sanitycheck(self):
         """Custom sanity check for CGAL."""
@@ -61,4 +61,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        CMake.sanitycheck(self)
+        EB_CMake.sanitycheck(self)
diff --git a/easybuild/easyblocks/c/cmake.py b/easybuild/easyblocks/c/cmake.py
index 9e44a3169a..c37a36a5ed 100644
--- a/easybuild/easyblocks/c/cmake.py
+++ b/easybuild/easyblocks/c/cmake.py
@@ -31,7 +31,7 @@
 from easybuild.tools.filetools import run_cmd
 
 
-class CMake(Application):
+class EB_CMake(Application):
     """Support for configuring build with CMake instead of traditional configure script"""
 
     def configure(self, builddir=None):
diff --git a/easybuild/easyblocks/c/cmakepythonpackage.py b/easybuild/easyblocks/c/cmakepythonpackage.py
index 8308d9f44d..f19e63ef72 100644
--- a/easybuild/easyblocks/c/cmakepythonpackage.py
+++ b/easybuild/easyblocks/c/cmakepythonpackage.py
@@ -25,11 +25,11 @@
 """
 EasyBuild support for Python packages that are configured with CMake, implemented as an easyblock
 """
-from easybuild.easyblocks.c.cmake import CMake
-from easybuild.easyblocks.p.pythonpackage import PythonPackage
+from easybuild.easyblocks.c.cmake import EB_CMake
+from easybuild.easyblocks.p.pythonpackage import EB_PythonPackage
 
 
-class CMakePythonPackage(CMake, PythonPackage):
+class EB_CMakePythonPackage(EB_CMake, EB_PythonPackage):
     """Build a Python package and module with cmake.
 
     Some packages use cmake to first build and install C Python packages
@@ -43,23 +43,23 @@ class CMakePythonPackage(CMake, PythonPackage):
 
     def __init__(self, *args, **kwargs):
         """Initialize with PythonPackage."""
-        PythonPackage.__init__(self, *args, **kwargs)
+        EB_PythonPackage.__init__(self, *args, **kwargs)
 
     def configure(self, *args, **kwargs):
         """Main configuration using cmake"""
 
-        PythonPackage.configure(self, *args, **kwargs)
+        EB_PythonPackage.configure(self, *args, **kwargs)
 
-        return CMake.configure(self, *args, **kwargs)
+        return EB_CMake.configure(self, *args, **kwargs)
 
     def make(self, *args, **kwargs):
         """Build Python package with cmake"""
-        return CMake.make(self, *args, **kwargs)
+        return EB_CMake.make(self, *args, **kwargs)
 
     def make_install(self):
         """Install with cmake install"""
-        return CMake.make_install(self)
+        return EB_CMake.make_install(self)
 
     def make_module_extra(self):
         """Add extra Python package module parameters"""
-        return PythonPackage.make_module_extra(self)
+        return EB_PythonPackage.make_module_extra(self)
diff --git a/easybuild/easyblocks/c/cplex.py b/easybuild/easyblocks/c/cplex.py
index 82206cd1b8..f9cd7dcc70 100644
--- a/easybuild/easyblocks/c/cplex.py
+++ b/easybuild/easyblocks/c/cplex.py
@@ -30,11 +30,11 @@
 import stat
 
 import easybuild.tools.environment as env
-from easybuild.easyblocks.b.binary import Binary
+from easybuild.easyblocks.b.binary import EB_Binary
 from easybuild.tools.filetools import run_cmd_qa
 
 
-class EB_CPLEX(Binary):
+class EB_CPLEX(EB_Binary):
     """
     Support for installing CPLEX.
     Version 12.2 has a self-extracting package with a Java installer
@@ -43,7 +43,7 @@ class EB_CPLEX(Binary):
     def __init__(self, *args, **kwargs):
         """Initialize CPLEX-specific variables."""
 
-        Binary.__init__(self, *args, **kwargs)
+        EB_Binary.__init__(self, *args, **kwargs)
         self.bindir = None
 
     def make_install(self):
@@ -99,7 +99,7 @@ def make_install(self):
     def make_module_extra(self):
         """Add installdir to path and set CPLEX_HOME"""
 
-        txt = Binary.make_module_extra(self)
+        txt = EB_Binary.make_module_extra(self)
         txt += self.moduleGenerator.prependPaths("PATH", [self.bindir])
         txt += self.moduleGenerator.setEnvironment("CPLEX_HOME", "$root/cplex")
         self.log.debug("make_module_extra added %s" % txt)
@@ -116,4 +116,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        Binary.sanitycheck(self)
+        EB_Binary.sanitycheck(self)
diff --git a/easybuild/easyblocks/d/dolfin.py b/easybuild/easyblocks/d/dolfin.py
index 7a60aaf11f..404a74e961 100644
--- a/easybuild/easyblocks/d/dolfin.py
+++ b/easybuild/easyblocks/d/dolfin.py
@@ -26,11 +26,11 @@
 import re
 
 import easybuild.tools.toolkit as toolkit
-from easybuild.easyblocks.c.cmakepythonpackage import CMakePythonPackage
+from easybuild.easyblocks.c.cmakepythonpackage import EB_CMakePythonPackage
 from easybuild.tools.modules import get_software_root, get_software_version
 
 
-class DOLFIN(CMakePythonPackage):
+class EB_DOLFIN(EB_CMakePythonPackage):
     """Support for building and installing DOLFIN."""
 
     def configure(self):
@@ -140,7 +140,7 @@ def configure(self):
         self.updatecfg('configopts', ' -DOpenMP_C_FLAGS="%s"' % openmp)
 
         # configure
-        out = CMakePythonPackage.configure(self)
+        out = EB_CMakePythonPackage.configure(self)
 
         # make sure that all optional packages are found
         not_found_re = re.compile("The following optional packages could not be found")
@@ -150,7 +150,7 @@ def configure(self):
     def make_module_extra(self):
         """Set extra environment variables for DOLFIN."""
 
-        txt = CMakePythonPackage.make_module_extra(self)
+        txt = EB_CMakePythonPackage.make_module_extra(self)
 
         # Dolfin needs to find Boost and the UFC pkgconfig file
         txt += self.moduleGenerator.setEnvironment('BOOST_DIR', get_software_root('Boost'))
@@ -204,4 +204,4 @@ def sanitycheck(self):
             # join all commands into one large single sanity check command
             self.setcfg('sanityCheckCommand', (" && ".join(cmds), ""))
 
-        CMakePythonPackage.sanitycheck(self)
+        EB_CMakePythonPackage.sanitycheck(self)
diff --git a/easybuild/easyblocks/i/icc.py b/easybuild/easyblocks/i/icc.py
index 467a46babb..7976b2c171 100644
--- a/easybuild/easyblocks/i/icc.py
+++ b/easybuild/easyblocks/i/icc.py
@@ -29,10 +29,10 @@
 import os
 from distutils.version import LooseVersion
 
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 
 
-class EB_icc(IntelBase):
+class EB_icc(EB_IntelBase):
     """Support for installing icc
 
     - tested with 11.1.046
@@ -57,7 +57,7 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        IntelBase.sanitycheck(self)
+        EB_IntelBase.sanitycheck(self)
 
     def make_module_req_guess(self):
         """Customize paths to check and add in environment.
@@ -114,7 +114,7 @@ def make_module_req_guess(self):
     def make_module_extra(self):
         """Add extra environment variables for icc, for license file and NLS path."""
 
-        txt = IntelBase.make_module_extra(self)
+        txt = EB_IntelBase.make_module_extra(self)
 
         txt += "prepend-path\t%s\t\t%s\n" % ('INTEL_LICENSE_FILE', self.license)
         txt += "prepend-path\t%s\t\t$root/%s\n" % ('NLSPATH', 'idb/intel64/locale/%l_%t/%N')
diff --git a/easybuild/easyblocks/i/ifort.py b/easybuild/easyblocks/i/ifort.py
index dd89307d87..5e6e6eac75 100644
--- a/easybuild/easyblocks/i/ifort.py
+++ b/easybuild/easyblocks/i/ifort.py
@@ -28,7 +28,7 @@
 
 from distutils.version import LooseVersion
 
-from easybuild.easyblocks.i.icc import Icc, IntelBase
+from easybuild.easyblocks.i.icc import Icc, EB_IntelBase
 
 
 class EB_ifort(Icc):
@@ -57,4 +57,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        IntelBase.sanitycheck(self)
+        EB_IntelBase.sanitycheck(self)
diff --git a/easybuild/easyblocks/i/imkl.py b/easybuild/easyblocks/i/imkl.py
index 7797dc0989..9e06aad511 100644
--- a/easybuild/easyblocks/i/imkl.py
+++ b/easybuild/easyblocks/i/imkl.py
@@ -33,13 +33,13 @@
 
 import easybuild.tools.environment as env
 import easybuild.tools.toolkit as toolkit
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 from easybuild.framework.easyconfig import CUSTOM
 from easybuild.tools.filetools import run_cmd
 from easybuild.tools.modules import Modules
 
 
-class EB_imkl(IntelBase):
+class EB_imkl(EB_IntelBase):
     """
     Class that can be used to install mkl
     - tested with 10.2.1.017
@@ -48,16 +48,16 @@ class EB_imkl(IntelBase):
 
     def __init__(self, *args, **kwargs):
         """Constructor, adds extra config options"""
-        IntelBase.__init__(self, *args, **kwargs)
+        EB_IntelBase.__init__(self, *args, **kwargs)
 
     @staticmethod
     def extra_options():
         extra_vars = [('interfaces', [True, "Indicates whether interfaces should be built (default: True)", CUSTOM])]
-        return IntelBase.extra_options(extra_vars)
+        return EB_IntelBase.extra_options(extra_vars)
 
 
     def configure(self):
-        IntelBase.configure(self)
+        EB_IntelBase.configure(self)
 
         if os.getenv('MKLROOT'):
             self.log.error("Found MKLROOT in current environment, which may cause problems...")
@@ -100,7 +100,7 @@ def make_module_req_guess(self):
 
     def make_module_extra(self):
         """Overwritten from Application to add extra txt"""
-        txt = IntelBase.make_module_extra(self)
+        txt = EB_IntelBase.make_module_extra(self)
         txt += "prepend-path\t%s\t\t%s\n" % ('INTEL_LICENSE_FILE', self.license)
         if self.getcfg('m32'):
             txt += "prepend-path\t%s\t\t$root/%s\n" % ('NLSPATH', 'idb/32/locale/%l_%t/%N')
@@ -381,4 +381,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        IntelBase.sanitycheck(self)
+        EB_IntelBase.sanitycheck(self)
diff --git a/easybuild/easyblocks/i/impi.py b/easybuild/easyblocks/i/impi.py
index b3dd7f498d..da63992a98 100644
--- a/easybuild/easyblocks/i/impi.py
+++ b/easybuild/easyblocks/i/impi.py
@@ -29,11 +29,11 @@
 import os
 from distutils.version import LooseVersion
 
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 from easybuild.tools.filetools import run_cmd
 
 
-class EB_impi(IntelBase):
+class EB_impi(EB_IntelBase):
     """
     Support for installing Intel MPI library
     """
@@ -46,7 +46,7 @@ def make_install(self):
         """
         if LooseVersion(self.version()) >= LooseVersion('4.0.1'):
             #impi starting from version 4.0.1.x uses standard installation procedure.
-            IntelBase.make_install(self)
+            EB_IntelBase.make_install(self)
             return None
         else:
             #impi up until version 4.0.0.x uses custom installation procedure.
@@ -108,7 +108,7 @@ def make_module_req_guess(self):
 
     def make_module_extra(self):
         """Overwritten from Application to add extra txt"""
-        txt = IntelBase.make_module_extra(self)
+        txt = EB_IntelBase.make_module_extra(self)
         txt += "prepend-path\t%s\t\t%s\n" % ('INTEL_LICENSE_FILE', self.license)
         txt += "setenv\t%s\t\t$root\n" % ('I_MPI_ROOT')
 
diff --git a/easybuild/easyblocks/i/intelbase.py b/easybuild/easyblocks/i/intelbase.py
index bc83bdc046..2b9f98a228 100644
--- a/easybuild/easyblocks/i/intelbase.py
+++ b/easybuild/easyblocks/i/intelbase.py
@@ -35,7 +35,7 @@
 from easybuild.tools.filetools import run_cmd
 
 
-class EB_intelBase(Application):
+class EB_IntelBase(Application):
     """
     Base class for Intel software
     - no configure/make : binary release
diff --git a/easybuild/easyblocks/i/ipp.py b/easybuild/easyblocks/i/ipp.py
index f931be3343..11b65c1f87 100644
--- a/easybuild/easyblocks/i/ipp.py
+++ b/easybuild/easyblocks/i/ipp.py
@@ -26,10 +26,10 @@
 EasyBuild support for installing the Intel Performance Primitives (IPP) library, implemented as an easyblock
 """
 
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 
 
-class EB_ipp(IntelBase):
+class EB_ipp(EB_IntelBase):
 
     def sanitycheck(self):
 
@@ -45,4 +45,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        IntelBase.sanitycheck(self)
+        EB_IntelBase.sanitycheck(self)
diff --git a/easybuild/easyblocks/i/itac.py b/easybuild/easyblocks/i/itac.py
index 052e3547f8..d9240c5d7e 100644
--- a/easybuild/easyblocks/i/itac.py
+++ b/easybuild/easyblocks/i/itac.py
@@ -29,11 +29,11 @@
 import os
 
 from easybuild.framework.easyconfig import CUSTOM
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 from easybuild.tools.filetools import run_cmd
 
 
-class EB_itac(IntelBase):
+class EB_itac(EB_IntelBase):
     """
     Class that can be used to install itac
     - tested with Intel Trace Analyzer and Collector 7.2.1.008
@@ -41,12 +41,12 @@ class EB_itac(IntelBase):
 
     def __init__(self, *args, **kwargs):
         """Constructor, adds extra config options"""
-        IntelBase.__init__(self, *args, **kwargs)
+        EB_IntelBase.__init__(self, *args, **kwargs)
 
     @staticmethod
     def extra_options():
         extra_vars = [('preferredmpi', ['impi3', "Preferred MPI type (default: 'impi3')", CUSTOM])]
-        return IntelBase.extra_options(extra_vars)
+        return EB_IntelBase.extra_options(extra_vars)
 
     def make_install(self):
         """
@@ -109,8 +109,8 @@ def make_module_req_guess(self):
         return guesses
 
     def make_module_extra(self):
-        """Overwritten from IntelBase to add extra txt"""
-        txt = IntelBase.make_module_extra(self)
+        """Overwritten from EB_IntelBase to add extra txt"""
+        txt = EB_IntelBase.make_module_extra(self)
         txt += "prepend-path\t%s\t\t%s\n" % ('INTEL_LICENSE_FILE', self.license)
         txt += "setenv\t%s\t\t$root\n" % 'VT_ROOT'
         txt += "setenv\t%s\t\t%s\n" % ('VT_MPI', self.getcfg('preferredmpi'))
diff --git a/easybuild/easyblocks/m/metis.py b/easybuild/easyblocks/m/metis.py
index 84bceee383..b3f4f62ed2 100644
--- a/easybuild/easyblocks/m/metis.py
+++ b/easybuild/easyblocks/m/metis.py
@@ -33,7 +33,7 @@
 from easybuild.tools.filetools import run_cmd, mkdir
 
 
-class METIS(Application):
+class EB_METIS(Application):
     """Support for building and installing METIS."""
 
     def configure(self, *args, **kwargs):
diff --git a/easybuild/easyblocks/m/mtl4.py b/easybuild/easyblocks/m/mtl4.py
index 422e470565..224850df78 100644
--- a/easybuild/easyblocks/m/mtl4.py
+++ b/easybuild/easyblocks/m/mtl4.py
@@ -22,10 +22,10 @@
 """
 import os
 
-from easybuild.easyblocks.t.tarball import Tarball
+from easybuild.easyblocks.t.tarball import EB_Tarball
 
 
-class MTL4(Tarball):
+class EB_MTL4(EB_Tarball):
     """Support for installing MTL4."""
 
     def sanitycheck(self):
@@ -45,12 +45,12 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        Tarball.sanitycheck(self)
+        EB_Tarball.sanitycheck(self)
 
     def make_module_req_guess(self):
         """Adjust CPATH for MTL4."""
 
-        guesses = Tarball.make_module_req_guess(self)
+        guesses = EB_Tarball.make_module_req_guess(self)
         guesses.update({'CPATH': 'include'})
 
-        return guesses
\ No newline at end of file
+        return guesses
diff --git a/easybuild/easyblocks/p/packedbinary.py b/easybuild/easyblocks/p/packedbinary.py
index 78aa23b90d..ceb985275f 100644
--- a/easybuild/easyblocks/p/packedbinary.py
+++ b/easybuild/easyblocks/p/packedbinary.py
@@ -24,10 +24,10 @@
 """
 
 from easybuild.framework.application import Application
-from easybuild.easyblocks.b.binary import Binary
+from easybuild.easyblocks.b.binary import EB_Binary
 
 
-class EB_PackedBinary(Binary, Application):
+class EB_PackedBinary(EB_Binary, Application):
     """Support for installing a packed binary package.
     Just unpack its source in the installdir
     """
diff --git a/easybuild/easyblocks/p/parmetis.py b/easybuild/easyblocks/p/parmetis.py
index ccc88683c5..fc26aadc1e 100644
--- a/easybuild/easyblocks/p/parmetis.py
+++ b/easybuild/easyblocks/p/parmetis.py
@@ -33,7 +33,7 @@
 from easybuild.tools.filetools import run_cmd, mkdir
 
 
-class ParMETIS(Application):
+class EB_ParMETIS(Application):
     """Support for building and installing ParMETIS."""
 
     def configure(self):
diff --git a/easybuild/easyblocks/p/petsc.py b/easybuild/easyblocks/p/petsc.py
index 7c401341f6..17e2d2819b 100644
--- a/easybuild/easyblocks/p/petsc.py
+++ b/easybuild/easyblocks/p/petsc.py
@@ -34,7 +34,7 @@
 from easybuild.tools.systemtools import get_shared_lib_ext
 
 
-class PETSc(Application):
+class EB_PETSc(Application):
     """Support for building and installing PETSc"""
 
     def __init__(self, *args, **kwargs):
diff --git a/easybuild/easyblocks/p/pythonpackage.py b/easybuild/easyblocks/p/pythonpackage.py
index 58e78550a4..ee812db167 100644
--- a/easybuild/easyblocks/p/pythonpackage.py
+++ b/easybuild/easyblocks/p/pythonpackage.py
@@ -33,7 +33,7 @@
 from easybuild.tools.modules import get_software_version
 
 
-class PythonPackage(Application):
+class EB_PythonPackage(Application):
     """Builds and installs a Python package, and provides a dedicated module file."""
 
     def __init__(self, *args, **kwargs):
diff --git a/easybuild/easyblocks/s/scotch.py b/easybuild/easyblocks/s/scotch.py
index 6ecc87fb28..7229391859 100644
--- a/easybuild/easyblocks/s/scotch.py
+++ b/easybuild/easyblocks/s/scotch.py
@@ -36,7 +36,7 @@
 from easybuild.tools.filetools import run_cmd, copytree
 
 
-class SCOTCH(Application):
+class EB_SCOTCH(Application):
     """Support for building/installing SCOTCH."""
 
     def configure(self):
diff --git a/easybuild/easyblocks/s/slepc.py b/easybuild/easyblocks/s/slepc.py
index df130004b0..31f3763928 100644
--- a/easybuild/easyblocks/s/slepc.py
+++ b/easybuild/easyblocks/s/slepc.py
@@ -32,7 +32,7 @@
 from easybuild.tools.modules import get_software_root
 
 
-class SLEPc(Application):
+class EB_SLEPc(Application):
     """Support for building and installing SLEPc"""
 
     def __init__(self, *args, **kwargs):
diff --git a/easybuild/easyblocks/s/suitesparse.py b/easybuild/easyblocks/s/suitesparse.py
index 4b45b0bf41..1b7e1c8652 100644
--- a/easybuild/easyblocks/s/suitesparse.py
+++ b/easybuild/easyblocks/s/suitesparse.py
@@ -36,7 +36,7 @@
 from easybuild.tools.modules import get_software_root
 
 
-class SuiteSparse(Application):
+class EB_SuiteSparse(Application):
     """Support for building SuiteSparse."""
 
     def configure(self):
diff --git a/easybuild/easyblocks/s/swig.py b/easybuild/easyblocks/s/swig.py
index 861c1a9143..7cc32e42f9 100644
--- a/easybuild/easyblocks/s/swig.py
+++ b/easybuild/easyblocks/s/swig.py
@@ -24,7 +24,7 @@
 from easybuild.tools.modules import get_software_root
 
 
-class SWIG(Application):
+class EB_SWIG(Application):
     """Support for building SWIG."""
 
     def configure(self):
@@ -56,4 +56,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        Application.sanitycheck(self)
\ No newline at end of file
+        Application.sanitycheck(self)
diff --git a/easybuild/easyblocks/t/tbb.py b/easybuild/easyblocks/t/tbb.py
index a4a439b455..cf7d3af2d0 100644
--- a/easybuild/easyblocks/t/tbb.py
+++ b/easybuild/easyblocks/t/tbb.py
@@ -30,15 +30,15 @@
 import shutil
 import glob
 
-from easybuild.easyblocks.i.intelbase import IntelBase
+from easybuild.easyblocks.i.intelbase import EB_IntelBase
 
 
-class EB_tbb(IntelBase):
+class EB_tbb(EB_IntelBase):
     """EasyBlock for tbb, threading building blocks"""
 
     def make_install(self):
         """overwrite make_install to add extra symlinks"""
-        IntelBase.make_install(self)
+        EB_IntelBase.make_install(self)
 
         # save libdir
         os.chdir(self.installdir)
@@ -68,12 +68,12 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        IntelBase.sanitycheck(self)
+        EB_IntelBase.sanitycheck(self)
 
     def make_module_extra(self):
         """Add correct path to lib to LD_LIBRARY_PATH. and intel license file"""
 
-        txt = IntelBase.make_module_extra(self)
+        txt = EB_IntelBase.make_module_extra(self)
         txt += "prepend-path\t%s\t\t%s\n" % ('LD_LIBRARY_PATH', self.libpath)
 
         return txt
diff --git a/easybuild/easyblocks/t/trilinos.py b/easybuild/easyblocks/t/trilinos.py
index 22d620240a..aa5c889528 100644
--- a/easybuild/easyblocks/t/trilinos.py
+++ b/easybuild/easyblocks/t/trilinos.py
@@ -24,12 +24,12 @@
 import re
 
 import easybuild.tools.toolkit as toolkit
-from easybuild.easyblocks.c.cmake import CMake
+from easybuild.easyblocks.c.cmake import EB_CMake
 from easybuild.framework.easyconfig import CUSTOM
 from easybuild.tools.modules import get_software_root
 
 
-class Trilinos(CMake):
+class EB_Trilinos(EB_CMake):
     """Support for building Trilinos."""
     # see http://trilinos.sandia.gov/Trilinos10CMakeQuickstart.txt
 
@@ -43,7 +43,7 @@ def extra_options():
                       ('skip_pkgs', [[], "List of packages to skip (default: [])"], CUSTOM),
                       ('verbose', [False, 'Configure for verbose output (default: False)'], CUSTOM)
                      ]
-        return CMake.extra_options(extra_vars)
+        return EB_CMake.extra_options(extra_vars)
 
     def configure(self):
         """Set some extra environment variables before configuring."""
@@ -196,11 +196,11 @@ def configure(self):
             self.log.error("Failed to create and move into build directory: %s" % err)
 
         # configure using cmake
-        CMake.configure(self, "..")
+        EB_CMake.configure(self, "..")
 
     def make(self):
         """Build with make (verbose logging enabled)."""
-        CMake.make(self, verbose=True)
+        EB_CMake.make(self, verbose=True)
 
     def sanitycheck(self):
         """Custom sanity check for Trilinos."""
@@ -223,4 +223,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        CMake.sanitycheck(self)
\ No newline at end of file
+        EB_CMake.sanitycheck(self)
diff --git a/easybuild/easyblocks/u/ufc.py b/easybuild/easyblocks/u/ufc.py
index 15b2fcd08d..56b4d77eed 100644
--- a/easybuild/easyblocks/u/ufc.py
+++ b/easybuild/easyblocks/u/ufc.py
@@ -22,11 +22,11 @@
 """
 from distutils.version import LooseVersion
 
-from easybuild.easyblocks.c.cmakepythonpackage import CMakePythonPackage
+from easybuild.easyblocks.c.cmakepythonpackage import EB_CMakePythonPackage
 from easybuild.tools.modules import get_software_root, get_software_version
 
 
-class UFC(CMakePythonPackage):
+class EB_UFC(EB_CMakePythonPackage):
     """Support for building UFC."""
 
     def configure(self):
@@ -62,7 +62,7 @@ def configure(self):
         self.updatecfg('configopts', '-DPYTHON_INCLUDE_PATH=%s/include/python%s' % (depsdict['Python'],
                                                                                     self.pyver))
 
-        CMakePythonPackage.configure(self)
+        EB_CMakePythonPackage.configure(self)
 
     def sanitycheck(self):
         """Custom sanity check for UFC."""
@@ -76,4 +76,4 @@ def sanitycheck(self):
 
             self.log.info("Customized sanity check paths: %s" % self.getcfg('sanityCheckPaths'))
 
-        CMakePythonPackage.sanitycheck(self)
\ No newline at end of file
+        EB_CMakePythonPackage.sanitycheck(self)