From 82b6bd836cfd253c07b588637c1902d64b953688 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Fri, 9 Aug 2019 16:10:38 +0200
Subject: [PATCH] fix names of local variables in c/*/*.eb easyconfigs

---
 .../CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb  |  6 +++---
 .../easyconfigs/c/CD-HIT/CD-HIT-4.6.6-foss-2016b.eb  |  6 +++---
 .../easyconfigs/c/CD-HIT/CD-HIT-4.6.8-foss-2018b.eb  |  6 +++---
 .../easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2017a.eb |  6 +++---
 .../easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2018a.eb |  6 +++---
 .../easyconfigs/c/CD-HIT/CD-HIT-4.8.1-foss-2018b.eb  |  6 +++---
 easybuild/easyconfigs/c/CDO/CDO-1.9.1-intel-2017b.eb |  6 +++---
 easybuild/easyconfigs/c/CDO/CDO-1.9.2-intel-2017b.eb |  6 +++---
 .../easyconfigs/c/CFITSIO/CFITSIO-3.38-foss-2016a.eb |  4 ++--
 .../c/CFITSIO/CFITSIO-3.38-intel-2016a.eb            |  4 ++--
 .../c/CFITSIO/CFITSIO-3.41-GCCcore-5.4.0.eb          |  4 ++--
 .../c/CFITSIO/CFITSIO-3.41-GCCcore-6.3.0.eb          |  4 ++--
 .../c/CFITSIO/CFITSIO-3.41-intel-2016b.eb            |  4 ++--
 .../c/CFITSIO/CFITSIO-3.42-GCCcore-6.4.0.eb          |  4 ++--
 .../c/CFITSIO/CFITSIO-3.42-intel-2017b.eb            |  4 ++--
 .../c/CFITSIO/CFITSIO-3.45-GCCcore-7.3.0.eb          |  4 ++--
 .../c/CFITSIO/CFITSIO-3.45-intel-2018b.eb            |  4 ++--
 .../c/CODEX2/CODEX2-20180227-intel-2017b-R-3.4.3.eb  |  4 ++--
 .../c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb      |  3 +--
 .../c/Caffe/Caffe-1.0-intel-2017a-Python-2.7.13.eb   |  6 +++---
 ...affe-1.0-intel-2017b-CUDA-9.1.85-Python-2.7.14.eb | 10 +++++-----
 ...Caffe-rc3-foss-2016a-CUDA-7.5.18-Python-2.7.11.eb | 12 ++++++------
 .../Cantera-2.2.1-intel-2016b-Python-2.7.12.eb       | 10 +++++-----
 .../Cantera-2.3.0-foss-2016b-Python-2.7.12.eb        | 10 +++++-----
 .../Cantera-2.3.0-foss-2017b-Python-2.7.14.eb        | 12 ++++++------
 .../Cantera-2.3.0-intel-2016b-Python-2.7.12.eb       | 10 +++++-----
 .../Cantera-2.3.0-intel-2017a-Python-2.7.13.eb       | 12 ++++++------
 .../Cantera-2.3.0-intel-2017b-Python-2.7.14.eb       | 12 ++++++------
 .../Cantera-2.3.0-intel-2018a-Python-2.7.14.eb       | 12 ++++++------
 .../Cantera-2.4.0-intel-2018a-Python-2.7.14.eb       | 12 ++++++------
 .../c/CastXML/CastXML-20160617-foss-2016a.eb         |  4 ++--
 .../c/CastXML/CastXML-20180806-foss-2018a.eb         |  4 ++--
 .../CatMAP-20170927-intel-2017b-Python-2.7.14.eb     |  4 ++--
 easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb |  6 ++----
 .../Clang/Clang-8.0.0-GCCcore-8.2.0-CUDA-10.1.105.eb |  6 +++---
 .../easyconfigs/c/ClusterShell/ClusterShell-1.7.3.eb |  4 ++--
 .../Commet-20150415-foss-2016a-Python-2.7.11.eb      |  8 ++++----
 .../Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb      |  6 +++---
 .../Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb |  6 +++---
 .../Cython/Cython-0.25.2-foss-2016b-Python-2.7.12.eb |  6 +++---
 .../c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb   |  6 +++---
 .../easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb   |  4 +---
 .../c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb  |  6 +++---
 .../easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb  |  4 +---
 ...rable-http-proxy-1.3.0-foss-2016a-nodejs-4.4.7.eb |  6 +++---
 ...rable-http-proxy-3.1.1-foss-2017a-nodejs-8.9.4.eb |  6 +++---
 .../c/cramtools/cramtools-2.0-Java-1.7.0_80.eb       |  6 ++----
 .../easyconfigs/c/cuDNN/cuDNN-5.0-CUDA-7.5.18.eb     |  6 +++---
 .../easyconfigs/c/cuDNN/cuDNN-5.1-CUDA-8.0.44.eb     |  6 +++---
 .../easyconfigs/c/cuDNN/cuDNN-6.0-CUDA-8.0.61.eb     |  6 +++---
 .../easyconfigs/c/cuDNN/cuDNN-7.0.2-CUDA-9.0.176.eb  | 10 +++++-----
 .../easyconfigs/c/cuDNN/cuDNN-7.0.5-CUDA-9.1.85.eb   | 10 +++++-----
 .../c/cuDNN/cuDNN-7.4.2.24-CUDA-10.0.130.eb          | 10 +++++-----
 53 files changed, 170 insertions(+), 179 deletions(-)

diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
index 9c71be82909..def1653db1b 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
@@ -24,11 +24,11 @@ sources = ['%(namelower)s-v%(version)s%(versionsuffix)s.tar.gz']
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
+local_list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
 files_to_copy = [
-    (list_of_executables, "bin"),
+    (local_list_of_executables, "bin"),
     (["*.pl"], 'bin'),
     (["psi-cd-hit/*.pl"], 'bin'),
     "README",
@@ -38,7 +38,7 @@ files_to_copy = [
 ]
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in list_of_executables],
+    'files': ["bin/%s" % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.6-foss-2016b.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.6-foss-2016b.eb
index 47badeab0fc..b377dc3f4a0 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.6-foss-2016b.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.6-foss-2016b.eb
@@ -21,13 +21,13 @@ checksums = ['14f61c56b48a81edc8f1b6d9e012fe55']
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
+local_list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
-files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
+files_to_copy = [(local_list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in list_of_executables],
+    'files': ["bin/%s" % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-foss-2018b.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-foss-2018b.eb
index 55cd0c78024..ab267713655 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-foss-2018b.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-foss-2018b.eb
@@ -22,15 +22,15 @@ dependencies = [('Perl', '5.28.0')]
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
+local_list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
-files_to_copy = [(list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
+files_to_copy = [(local_list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
 
 postinstallcmds = ["sed -i 's@#!/usr/bin/perl@/usr/bin/env perl@' %(installdir)s/bin/*.pl"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in list_of_executables],
+    'files': ['bin/%s' % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2017a.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2017a.eb
index 57f60dd797f..6f02997b423 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2017a.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2017a.eb
@@ -22,15 +22,15 @@ dependencies = [('Perl', '5.24.1')]
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
+local_list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
-files_to_copy = [(list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
+files_to_copy = [(local_list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
 
 postinstallcmds = ["sed -i 's@#!/usr/bin/perl@/usr/bin/env perl@' %(installdir)s/bin/*.pl"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in list_of_executables],
+    'files': ['bin/%s' % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2018a.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2018a.eb
index e8a98a39346..206ca3d0019 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2018a.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.8-intel-2018a.eb
@@ -22,15 +22,15 @@ dependencies = [('Perl', '5.26.1')]
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
+local_list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
-files_to_copy = [(list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
+files_to_copy = [(local_list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
 
 postinstallcmds = ["sed -i 's@#!/usr/bin/perl@/usr/bin/env perl@' %(installdir)s/bin/*.pl"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in list_of_executables],
+    'files': ['bin/%s' % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.8.1-foss-2018b.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.8.1-foss-2018b.eb
index 7ddb9fca6e6..ed82ec8f189 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.8.1-foss-2018b.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.8.1-foss-2018b.eb
@@ -22,15 +22,15 @@ dependencies = [('Perl', '5.28.0')]
 buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 
 # put here the list of generated executables when compiling
-list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
+local_list_of_executables = ['cd-hit', 'cd-hit-est', 'cd-hit-2d', 'cd-hit-est-2d', 'cd-hit-div', 'cd-hit-454']
 
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
-files_to_copy = [(list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
+files_to_copy = [(local_list_of_executables, 'bin'), (['*.pl'], 'bin'), 'README', 'doc', 'license.txt']
 
 postinstallcmds = ["sed -i 's@#!/usr/bin/perl@/usr/bin/env perl@' %(installdir)s/bin/*.pl"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in list_of_executables],
+    'files': ['bin/%s' % x for x in local_list_of_executables],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CDO/CDO-1.9.1-intel-2017b.eb b/easybuild/easyconfigs/c/CDO/CDO-1.9.1-intel-2017b.eb
index 6efc993ef12..f4c955b0a1b 100644
--- a/easybuild/easyconfigs/c/CDO/CDO-1.9.1-intel-2017b.eb
+++ b/easybuild/easyconfigs/c/CDO/CDO-1.9.1-intel-2017b.eb
@@ -13,10 +13,10 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://code.mpimet.mpg.de/attachments/download/15653/']
 checksums = ['33cba3cfcc27e5896769143c5f8e2f300ca14c7a40d1f19ffd1ed24b49ea3d55']
 
-hdf5_ver = '1.8.19'
+local_hdf5_ver = '1.8.19'
 dependencies = [
-    ('HDF5', hdf5_ver),
-    ('netCDF', '4.4.1.1', '-HDF5-%s' % hdf5_ver),
+    ('HDF5', local_hdf5_ver),
+    ('netCDF', '4.4.1.1', '-HDF5-%s' % local_hdf5_ver),
     ('YAXT', '0.5.1'),
 ]
 
diff --git a/easybuild/easyconfigs/c/CDO/CDO-1.9.2-intel-2017b.eb b/easybuild/easyconfigs/c/CDO/CDO-1.9.2-intel-2017b.eb
index a3780cee9ae..fbe3a23416a 100644
--- a/easybuild/easyconfigs/c/CDO/CDO-1.9.2-intel-2017b.eb
+++ b/easybuild/easyconfigs/c/CDO/CDO-1.9.2-intel-2017b.eb
@@ -13,10 +13,10 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://code.mpimet.mpg.de/attachments/download/16035/']
 checksums = ['d1c5092167034a48e4b8ada24cf78a1d4b84e364ffbb08b9ca70d13f428f300c']
 
-hdf5_ver = '1.8.19'
+local_hdf5_ver = '1.8.19'
 dependencies = [
-    ('HDF5', hdf5_ver),
-    ('netCDF', '4.4.1.1', '-HDF5-%s' % hdf5_ver),
+    ('HDF5', local_hdf5_ver),
+    ('netCDF', '4.4.1.1', '-HDF5-%s' % local_hdf5_ver),
     ('YAXT', '0.5.1'),
     ('grib_api', '1.24.0'),
 ]
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-foss-2016a.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-foss-2016a.eb
index 4ea772d549a..93d250c0ee7 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-foss-2016a.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-foss-2016a.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'foss', 'version': '2016a'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 
 sanity_check_paths = {
     'files': ["lib/libcfitsio.a"],
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-intel-2016a.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-intel-2016a.eb
index d7830dc6332..9513017c9e0 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-intel-2016a.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.38-intel-2016a.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 
 sanity_check_paths = {
     'files': ["lib/libcfitsio.a"],
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-5.4.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-5.4.0.eb
index d2b83c1aac8..c83ae2a7289 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-5.4.0.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-5.4.0.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'GCCcore', 'version': '5.4.0'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 checksums = ['a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb5734c']
 
 builddependencies = [('binutils', '2.26')]
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-6.3.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-6.3.0.eb
index 76eae3e43ea..a6130cbca38 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-6.3.0.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-GCCcore-6.3.0.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'GCCcore', 'version': '6.3.0'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 checksums = ['a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb5734c']
 
 builddependencies = [('binutils', '2.27')]
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-intel-2016b.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-intel-2016b.eb
index 382c9e20612..9a4592dc897 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-intel-2016b.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.41-intel-2016b.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'intel', 'version': '2016b'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 
 sanity_check_paths = {
     'files': ['lib/libcfitsio.a'],
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-GCCcore-6.4.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-GCCcore-6.4.0.eb
index 218c2475320..444ecfd713f 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-GCCcore-6.4.0.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-GCCcore-6.4.0.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'GCCcore', 'version': '6.4.0'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 checksums = ['6c10aa636118fa12d9a5e2e66f22c6436fb358da2af6dbf7e133c142e2ac16b8']
 
 builddependencies = [('binutils', '2.28')]
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-intel-2017b.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-intel-2017b.eb
index 9a0b7f33d75..0cb363c249c 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-intel-2017b.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.42-intel-2017b.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'intel', 'version': '2017b'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 checksums = ['6c10aa636118fa12d9a5e2e66f22c6436fb358da2af6dbf7e133c142e2ac16b8']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-GCCcore-7.3.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-GCCcore-7.3.0.eb
index aed4c6c7616..4255d235a61 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-GCCcore-7.3.0.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-GCCcore-7.3.0.eb
@@ -10,9 +10,9 @@ FITS (Flexible Image Transport System) data format."""
 toolchain = {'name': 'GCCcore', 'version': '7.3.0'}
 toolchainopts = {'pic': True}
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 patches = ['CFITSIO_install_test_data.patch']
 
 checksums = [
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-intel-2018b.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-intel-2018b.eb
index 27ce36e62f3..0f012126a2d 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-intel-2018b.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.45-intel-2018b.eb
@@ -16,9 +16,9 @@ dependencies = [('cURL', '7.60.0')]
 # standard make would create just static libcfitsio.a
 buildopts = '&& make shared'
 
-srcversion = '%s0' % version.replace('.', '')
+local_srcversion = '%s0' % version.replace('.', '')
 source_urls = ['http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/']
-sources = ['%%(namelower)s%s.tar.gz' % srcversion]
+sources = ['%%(namelower)s%s.tar.gz' % local_srcversion]
 checksums = ['bf6012dbe668ecb22c399c4b7b2814557ee282c74a7d5dc704eb17c30d9fb92e']
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/CODEX2/CODEX2-20180227-intel-2017b-R-3.4.3.eb b/easybuild/easyconfigs/c/CODEX2/CODEX2-20180227-intel-2017b-R-3.4.3.eb
index 04fef2475c2..39702397216 100644
--- a/easybuild/easyconfigs/c/CODEX2/CODEX2-20180227-intel-2017b-R-3.4.3.eb
+++ b/easybuild/easyconfigs/c/CODEX2/CODEX2-20180227-intel-2017b-R-3.4.3.eb
@@ -2,7 +2,7 @@ easyblock = 'RPackage'
 
 name = 'CODEX2'
 version = '20180227'
-commit = '20bf1c8'
+local_commit = '20bf1c8'
 versionsuffix = '-R-%(rver)s'
 
 homepage = 'https://github.com/yuchaojiang/CODEX2'
@@ -11,7 +11,7 @@ description = "Full-spectrum copy number variation detection by high-throughput
 toolchain = {'name': 'intel', 'version': '2017b'}
 
 source_urls = ['https://github.com/yuchaojiang/CODEX2/archive/']
-sources = [{'filename': SOURCE_TAR_GZ, 'download_filename': '%s.tar.gz' % commit}]
+sources = [{'filename': SOURCE_TAR_GZ, 'download_filename': '%s.tar.gz' % local_commit}]
 checksums = ['60258ffd6e88216b5563b36ebbd0830610e6a938d93fe9b95891ef24a934575f']
 
 dependencies = [
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
index 5dba9cb6c62..63d5651a4d6 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
@@ -1,8 +1,7 @@
 # contributed by Luca Marsella (CSCS)
 name = 'CP2K'
 version = "3.0"
-cudaversion = '7.0'
-versionsuffix = '-cuda-%s' % cudaversion
+versionsuffix = '-cuda-7.0'
 
 homepage = 'http://www.cp2k.org/'
 description = """CP2K is a freely available (GPL) program, written in Fortran 95, to perform atomistic and molecular
diff --git a/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017a-Python-2.7.13.eb
index b75b12ec59e..aee4498c7e0 100644
--- a/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017a-Python-2.7.13.eb
@@ -32,13 +32,13 @@ builddependencies = [
     ('CMake', '3.9.1'),
 ]
 
-protobuf_ver = '3.3.0'
+local_protobuf_ver = '3.3.0'
 
 # See http://caffe.berkeleyvision.org/installation.html
 dependencies = [
     ('Boost', '1.63.0', '-Python-%(pyver)s'),
-    ('protobuf', protobuf_ver),
-    ('protobuf-python', protobuf_ver, '-Python-%(pyver)s'),
+    ('protobuf', local_protobuf_ver),
+    ('protobuf-python', local_protobuf_ver, '-Python-%(pyver)s'),
     ('glog', '0.3.5'),
     ('gflags', '2.2.1'),
     ('HDF5', '1.8.18'),
diff --git a/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017b-CUDA-9.1.85-Python-2.7.14.eb b/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017b-CUDA-9.1.85-Python-2.7.14.eb
index 0c48f776d2b..564c03d5e98 100644
--- a/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017b-CUDA-9.1.85-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/Caffe/Caffe-1.0-intel-2017b-CUDA-9.1.85-Python-2.7.14.eb
@@ -11,8 +11,8 @@ name = 'Caffe'
 version = '1.0'
 
 versionsuffix = '-Python-%(pyver)s'
-cudaversion = '9.1.85'
-versionsuffix = '-CUDA-%s-Python-%%(pyver)s' % cudaversion
+local_cudaversion = '9.1.85'
+versionsuffix = '-CUDA-%s-Python-%%(pyver)s' % local_cudaversion
 
 homepage = 'https://github.com/BVLC/caffe'
 description = """
@@ -45,14 +45,14 @@ dependencies = [
     ('LevelDB', '1.18'),
     ('snappy', '1.1.7'),
     ('scikit-image', '0.13.1', '-Python-%(pyver)s'),
-    ('cuDNN', '7.0.5', '-CUDA-' + cudaversion, True),
+    ('cuDNN', '7.0.5', '-CUDA-' + local_cudaversion, True),
 ]
 
 # Known NVIDIA GPU achitectures Caffe 1.0 can be compiled for, and not lower than 3.0 supported by CUDA 9.1:
-cuda_compute_capabilities = '"30 35 50 60 61"'
+local_cuda_compute_capabilities = '"30 35 50 60 61"'
 
 configopts = '-DBLAS=mkl -DUSE_OPENCV=0 -DUSE_MKL2017_AS_DEFAULT_ENGINE=1 -DCPU_ONLY=0 '
-configopts += '-DUSE_CUDNN=1 -DCUDA_ARCH_BIN=%s -DCUDA_ARCH_NAME=Manual' % cuda_compute_capabilities
+configopts += '-DUSE_CUDNN=1 -DCUDA_ARCH_BIN=%s -DCUDA_ARCH_NAME=Manual' % local_cuda_compute_capabilities
 
 modextrapaths = {'PYTHONPATH': ['python']}
 
diff --git a/easybuild/easyconfigs/c/Caffe/Caffe-rc3-foss-2016a-CUDA-7.5.18-Python-2.7.11.eb b/easybuild/easyconfigs/c/Caffe/Caffe-rc3-foss-2016a-CUDA-7.5.18-Python-2.7.11.eb
index 4a545a7291c..bcf0c9ef120 100644
--- a/easybuild/easyconfigs/c/Caffe/Caffe-rc3-foss-2016a-CUDA-7.5.18-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/c/Caffe/Caffe-rc3-foss-2016a-CUDA-7.5.18-Python-2.7.11.eb
@@ -3,8 +3,8 @@ easyblock = 'CMakeMake'
 name = 'Caffe'
 version = 'rc3'
 
-cudaversion = '7.5.18'
-versionsuffix = '-CUDA-%s-Python-%%(pyver)s' % cudaversion
+local_cudaversion = '7.5.18'
+versionsuffix = '-CUDA-%s-Python-%%(pyver)s' % local_cudaversion
 
 homepage = 'https://github.com/BVLC/caffe'
 description = """
@@ -23,19 +23,19 @@ builddependencies = [
     ('CMake', '3.4.3'),
 ]
 
-protobuf_ver = '3.0.2'
+local_protobuf_ver = '3.0.2'
 
 dependencies = [
     ('glog', '0.3.4'),
     ('gflags', '2.1.2'),
     ('OpenCV', '3.1.0'),
-    ('CUDA', cudaversion, '', True),
+    ('CUDA', local_cudaversion, '', True),
     ('cuDNN', '4.0', '', True),
     ('LMDB', '0.9.18'),
     ('LevelDB', '1.18'),
     ('snappy', '1.1.3'),
-    ('protobuf', protobuf_ver),
-    ('protobuf-python', protobuf_ver, '-Python-%(pyver)s'),
+    ('protobuf', local_protobuf_ver),
+    ('protobuf-python', local_protobuf_ver, '-Python-%(pyver)s'),
     ('HDF5', '1.8.16', '-serial'),
     ('Boost', '1.61.0', '-Python-%(pyver)s'),
     ('Python', '2.7.11'),
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb
index 6ba32558a29..d6ffd3092ae 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.2.1-intel-2016b-Python-2.7.12.eb
@@ -22,11 +22,11 @@ builddependencies = [
     ('3to2', '1.1.1', versionsuffix),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
-common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
-runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
+local_common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
+runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2016b-Python-2.7.12.eb
index db41f09ce8a..275ac807d9e 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2016b-Python-2.7.12.eb
@@ -31,11 +31,11 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=openblas blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
-common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
-runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=openblas blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
+local_common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
+runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2017b-Python-2.7.14.eb
index 614046aac84..dea47b25389 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-foss-2017b-Python-2.7.14.eb
@@ -36,13 +36,13 @@ builddependencies = [
     ('fmt', '3.0.2'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
-common_opts += 'blas_lapack_libs=openblas blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
-common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
+local_common_opts += 'blas_lapack_libs=openblas blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
+local_common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
 # tests hang, so disable them for now
-# runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+# runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2016b-Python-2.7.12.eb
index 9a428d5da85..743818d0b20 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2016b-Python-2.7.12.eb
@@ -31,11 +31,11 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
-common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
-runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR'
+local_common_opts += ' sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
+runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017a-Python-2.7.13.eb
index 91ed40d45e8..2aca050dae2 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017a-Python-2.7.13.eb
@@ -35,13 +35,13 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
-common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
-common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
+local_common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
+local_common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
 # tests hang, so disable them for now
-# runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+# runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017b-Python-2.7.14.eb
index 3ceb52ab732..adf2eb1798e 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2017b-Python-2.7.14.eb
@@ -36,13 +36,13 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
-common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
-common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
+local_common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
+local_common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
 # tests hang, so disable them for now
-# runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+# runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2018a-Python-2.7.14.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2018a-Python-2.7.14.eb
index 5996101563f..49e2af27122 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2018a-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.3.0-intel-2018a-Python-2.7.14.eb
@@ -36,13 +36,13 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
-common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
-common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
+local_common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
+local_common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
 # tests hang, so disable them for now
-# runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+# runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/Cantera/Cantera-2.4.0-intel-2018a-Python-2.7.14.eb b/easybuild/easyconfigs/c/Cantera/Cantera-2.4.0-intel-2018a-Python-2.7.14.eb
index ffe151b661c..dd2f84d5e11 100644
--- a/easybuild/easyconfigs/c/Cantera/Cantera-2.4.0-intel-2018a-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/Cantera/Cantera-2.4.0-intel-2018a-Python-2.7.14.eb
@@ -26,13 +26,13 @@ builddependencies = [
     ('googletest', '1.8.0'),
 ]
 
-common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
-common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
-common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
-buildopts = 'build ' + common_opts
+local_common_opts = 'env_vars=all CC="$CC" CXX="$CXX" cc_flags="$CFLAGS" cxx_flags="$CXXFLAGS" '
+local_common_opts += 'blas_lapack_libs=mkl_rt blas_lapack_dir=$BLAS_LAPACK_LIB_DIR '
+local_common_opts += 'sundials_include=$EBROOTSUNDIALS/include sundials_libdir=$EBROOTSUNDIALS/lib'
+buildopts = 'build ' + local_common_opts
 # tests hang, so disable them for now
-# runtest = 'test ' + common_opts
-installopts = 'install ' + common_opts
+# runtest = 'test ' + local_common_opts
+installopts = 'install ' + local_common_opts
 prefix_arg = 'prefix='
 
 modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
diff --git a/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb b/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb
index 553587edc64..f6b5fcdb03d 100644
--- a/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb
+++ b/easybuild/easyconfigs/c/CastXML/CastXML-20160617-foss-2016a.eb
@@ -2,7 +2,7 @@ easyblock = 'CMakeMake'
 
 name = 'CastXML'
 version = '20160617'
-commit_id = 'd5934bd'
+local_commit_id = 'd5934bd'
 
 homepage = 'https://github.com/CastXML/CastXML'
 description = """CastXML is a C-family abstract syntax tree XML output tool."""
@@ -10,7 +10,7 @@ description = """CastXML is a C-family abstract syntax tree XML output tool."""
 toolchain = {'name': 'foss', 'version': '2016a'}
 
 source_urls = ['https://github.com/CastXML/CastXML/archive']
-sources = ['%s.tar.gz' % commit_id]
+sources = ['%s.tar.gz' % local_commit_id]
 
 builddependencies = [
     ('CMake', '3.4.3'),
diff --git a/easybuild/easyconfigs/c/CastXML/CastXML-20180806-foss-2018a.eb b/easybuild/easyconfigs/c/CastXML/CastXML-20180806-foss-2018a.eb
index d9bfd0d5849..a5761afc6bb 100644
--- a/easybuild/easyconfigs/c/CastXML/CastXML-20180806-foss-2018a.eb
+++ b/easybuild/easyconfigs/c/CastXML/CastXML-20180806-foss-2018a.eb
@@ -2,7 +2,7 @@ easyblock = 'CMakeMake'
 
 name = 'CastXML'
 version = '20180806'
-commit_id = 'ae93121'
+local_commit_id = 'ae93121'
 
 homepage = 'https://github.com/CastXML/CastXML'
 description = """CastXML is a C-family abstract syntax tree XML output tool."""
@@ -10,7 +10,7 @@ description = """CastXML is a C-family abstract syntax tree XML output tool."""
 toolchain = {'name': 'foss', 'version': '2018a'}
 
 source_urls = ['https://github.com/CastXML/CastXML/archive']
-sources = [{'download_filename': '%s.tar.gz' % commit_id, 'filename': SOURCE_TAR_GZ}]
+sources = [{'download_filename': '%s.tar.gz' % local_commit_id, 'filename': SOURCE_TAR_GZ}]
 checksums = ['b53e7d343e1e06043eb17992e1d4907c0114cb87e2875ab2dffb49434cdb986f']
 
 builddependencies = [('CMake', '3.12.1')]
diff --git a/easybuild/easyconfigs/c/CatMAP/CatMAP-20170927-intel-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/c/CatMAP/CatMAP-20170927-intel-2017b-Python-2.7.14.eb
index 516aec25b47..c2691c0a065 100644
--- a/easybuild/easyconfigs/c/CatMAP/CatMAP-20170927-intel-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/c/CatMAP/CatMAP-20170927-intel-2017b-Python-2.7.14.eb
@@ -2,7 +2,7 @@ easyblock = 'Bundle'
 
 name = 'CatMAP'
 version = '20170927'
-commit_id = '5d3d6c0'
+local_commit_id = '5d3d6c0'
 versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://catmap.readthedocs.io/'
@@ -36,7 +36,7 @@ exts_list = [
         ],
     }),
     ('CatMAP', '20170927', {
-        'source_tmpl': '5d3d6c0.tar.gz',
+        'source_tmpl': '%s.tar.gz' % local_commit_id,
         'source_urls': ['https://github.com/SUNCAT-Center/catmap/archive/'],
         'checksums': [
             '3906fdae05407244bb7c936d62eb326ce0b93421ef5c03c726a85eab6894926b',  # 5d3d6c0.tar.gz
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
index 066a79dfcb6..ef75d9573a1 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.3-GCC-4.8.1.eb
@@ -38,12 +38,10 @@ patches = [
 
 builddependencies = [('CMake', '2.8.11')]
 
-languages = ['c', 'c++']
-
-moduleclass = 'compiler'
-
 assertions = False
 
 build_targets = ['X86']
 
 usepolly = False
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/c/Clang/Clang-8.0.0-GCCcore-8.2.0-CUDA-10.1.105.eb b/easybuild/easyconfigs/c/Clang/Clang-8.0.0-GCCcore-8.2.0-CUDA-10.1.105.eb
index 2e4b2a8d3c8..4df558df85a 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-8.0.0-GCCcore-8.2.0-CUDA-10.1.105.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-8.0.0-GCCcore-8.2.0-CUDA-10.1.105.eb
@@ -11,8 +11,8 @@
 name = 'Clang'
 version = '8.0.0'
 
-cudaver = '10.1.105'
-versionsuffix = '-CUDA-%s' % (cudaver)
+local_cudaver = '10.1.105'
+versionsuffix = '-CUDA-%s' % (local_cudaver)
 
 homepage = 'http://clang.llvm.org/'
 description = """C, C++, Objective-C compiler, based on LLVM.  Does not
@@ -51,7 +51,7 @@ dependencies = [
     # since Clang is a compiler, binutils is a runtime dependency too
     ('binutils', '2.31.1'),
     ('GMP', '6.1.2'),
-    ('CUDA', cudaver, '', True),
+    ('CUDA', local_cudaver, '', True),
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/c/ClusterShell/ClusterShell-1.7.3.eb b/easybuild/easyconfigs/c/ClusterShell/ClusterShell-1.7.3.eb
index 4b8eddf099b..2c7c87e6d80 100644
--- a/easybuild/easyconfigs/c/ClusterShell/ClusterShell-1.7.3.eb
+++ b/easybuild/easyconfigs/c/ClusterShell/ClusterShell-1.7.3.eb
@@ -17,10 +17,10 @@ allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
 
 options = {'modulename': 'ClusterShell'}
 
-pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
+local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
 sanity_check_paths = {
     'files': ['bin/clubak', 'bin/clush', 'bin/nodeset'],
-    'dirs': ['lib/python%s/site-packages' % pyshortver]
+    'dirs': ['lib/python%s/site-packages' % local_pyshortver]
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb
index 4000cc8571d..e40519ca1d1 100644
--- a/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb
@@ -2,7 +2,7 @@ easyblock = 'MakeCp'
 
 name = 'Commet'
 version = '20150415'
-commit = '4ef0705'
+local_commit = '4ef0705'
 versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'https://colibread.inria.fr/software/commet/'
@@ -13,7 +13,7 @@ description = """ COMMET ("COmpare Multiple METagenomes") provides a global simi
 toolchain = {'name': 'foss', 'version': '2016a'}
 
 source_urls = ['https://github.com/pierrepeterlongo/commet/archive']
-sources = ['%s.tar.gz' % commit]
+sources = ['%s.tar.gz' % local_commit]
 
 checksums = ['19cba09ca7a92eaed75ed6af820d9451']
 
@@ -24,8 +24,8 @@ dependencies = [
 files_to_copy = ['bin', 'doc', 'include', 'ABCDE_bench', (['Commet.py'], 'bin')]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % binfile for binfile in ['Commet.py', 'bvop', 'compare_reads',
-                                                 'extract_reads', 'filter_reads', 'index_and_search']],
+    'files': ['bin/%s' % x for x in ['Commet.py', 'bvop', 'compare_reads',
+                                     'extract_reads', 'filter_reads', 'index_and_search']],
     'dirs': ['doc', 'include'],
 }
 
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb b/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb
index dd9fc1ad56a..090809599da 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb
@@ -16,10 +16,10 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [('Python', '2.7.10')]
 
-cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
+local_cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
-    'dirs': [cythonlibdir + '/%(name)s']
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % local_cythonlibdir],
+    'dirs': [local_cythonlibdir + '/%(name)s']
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb
index 0dfcb1056b7..558454ebb95 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.24.1-foss-2016a-Python-2.7.11.eb
@@ -16,10 +16,10 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [('Python', '2.7.11')]
 
-cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
+local_cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
-    'dirs': [cythonlibdir + '/%(name)s']
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % local_cythonlibdir],
+    'dirs': [local_cythonlibdir + '/%(name)s']
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.25.2-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/c/Cython/Cython-0.25.2-foss-2016b-Python-2.7.12.eb
index 9257f52f810..f7014694979 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.25.2-foss-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.25.2-foss-2016b-Python-2.7.12.eb
@@ -28,10 +28,10 @@ checksums = ['f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306']
 
 dependencies = [('Python', '2.7.12')]
 
-cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
+local_cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
 sanity_check_paths = {
-    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
-    'dirs': [cythonlibdir + '/%(name)s']
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % local_cythonlibdir],
+    'dirs': [local_cythonlibdir + '/%(name)s']
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb
index 92598548412..ab1a38beb23 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a-GLib-2.48.0.eb
@@ -2,8 +2,8 @@ easyblock = 'ConfigureMake'
 
 name = 'cairo'
 version = '1.14.6'
-glibver = '2.48.0'
-versionsuffix = '-GLib-%s' % glibver
+local_glibver = '2.48.0'
+versionsuffix = '-GLib-%s' % local_glibver
 
 homepage = 'http://cairographics.org'
 description = """Cairo is a 2D graphics library with support for multiple output devices.
@@ -29,7 +29,7 @@ dependencies = [
     ('libXext', '1.3.3'),
     ('libXau', '1.0.8'),
     ('libXdmcp', '1.1.2'),
-    ('GLib', glibver),
+    ('GLib', local_glibver),
 ]
 builddependencies = [
     ('renderproto', '0.11'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb
index 8d8841ea433..b6c079b406e 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb
@@ -13,8 +13,6 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_XZ]
 
-glibver = '2.47.5'
-
 dependencies = [
     ('bzip2', '1.0.6'),
     ('zlib', '1.2.8'),
@@ -23,7 +21,7 @@ dependencies = [
     ('pixman', '0.34.0'),
     ('fontconfig', '2.11.94'),
     ('expat', '2.1.0'),
-    ('GLib', glibver),
+    ('GLib', '2.47.5'),
     ('libX11', '1.6.3'),
     ('libxcb', '1.11.1'),
     ('libXrender', '0.9.9'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb
index ecd56f91662..2840370280d 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb
@@ -2,8 +2,8 @@ easyblock = 'ConfigureMake'
 
 name = 'cairo'
 version = '1.14.6'
-glibver = '2.48.0'
-versionsuffix = '-GLib-%s' % glibver
+local_glibver = '2.48.0'
+versionsuffix = '-GLib-%s' % local_glibver
 
 homepage = 'http://cairographics.org'
 description = """Cairo is a 2D graphics library with support for multiple output devices.
@@ -23,7 +23,7 @@ dependencies = [
     ('pixman', '0.34.0'),
     ('fontconfig', '2.11.95'),
     ('expat', '2.1.1'),
-    ('GLib', glibver),
+    ('GLib', local_glibver),
     ('libX11', '1.6.3'),
     ('libxcb', '1.11.1'),
     ('libXrender', '0.9.9'),
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
index a289e5fb021..67b4a3ee9f6 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
@@ -13,8 +13,6 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 source_urls = ['http://cairographics.org/releases/']
 sources = [SOURCE_TAR_XZ]
 
-glibver = '2.47.5'
-
 dependencies = [
     ('bzip2', '1.0.6'),
     ('zlib', '1.2.8'),
@@ -23,7 +21,7 @@ dependencies = [
     ('pixman', '0.34.0'),
     ('fontconfig', '2.11.94'),
     ('expat', '2.1.0'),
-    ('GLib', glibver),
+    ('GLib', '2.47.5'),
     ('libX11', '1.6.3'),
     ('libxcb', '1.11.1'),
     ('libXrender', '0.9.9'),
diff --git a/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-1.3.0-foss-2016a-nodejs-4.4.7.eb b/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-1.3.0-foss-2016a-nodejs-4.4.7.eb
index 049f03862b4..7006282414a 100644
--- a/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-1.3.0-foss-2016a-nodejs-4.4.7.eb
+++ b/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-1.3.0-foss-2016a-nodejs-4.4.7.eb
@@ -2,8 +2,8 @@ easyblock = 'PackedBinary'
 
 name = 'configurable-http-proxy'
 version = '1.3.0'
-nodejsver = '4.4.7'
-versionsuffix = '-nodejs-%s' % nodejsver
+local_nodejsver = '4.4.7'
+versionsuffix = '-nodejs-%s' % local_nodejsver
 
 homepage = 'https://github.com/jupyterhub/configurable-http-proxy'
 description = """HTTP proxy for node.js including a REST API for updating the routing table.
@@ -15,7 +15,7 @@ source_urls = ['https://github.com/jupyterhub/configurable-http-proxy/archive/']
 sources = ['%(version)s.tar.gz']
 
 dependencies = [
-    ('nodejs', nodejsver),
+    ('nodejs', local_nodejsver),
 ]
 
 preinstallopts = 'cd %(name)s-%(version)s && '
diff --git a/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-3.1.1-foss-2017a-nodejs-8.9.4.eb b/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-3.1.1-foss-2017a-nodejs-8.9.4.eb
index 19266d36c49..8e5ab281793 100644
--- a/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-3.1.1-foss-2017a-nodejs-8.9.4.eb
+++ b/easybuild/easyconfigs/c/configurable-http-proxy/configurable-http-proxy-3.1.1-foss-2017a-nodejs-8.9.4.eb
@@ -2,8 +2,8 @@ easyblock = 'Binary'
 
 name = 'configurable-http-proxy'
 version = '3.1.1'
-nodejsver = '8.9.4'
-versionsuffix = '-nodejs-%s' % nodejsver
+local_nodejsver = '8.9.4'
+versionsuffix = '-nodejs-%s' % local_nodejsver
 
 homepage = 'https://github.com/jupyterhub/configurable-http-proxy'
 description = """HTTP proxy for node.js including a REST API for updating the routing table.
@@ -12,7 +12,7 @@ description = """HTTP proxy for node.js including a REST API for updating the ro
 toolchain = {'name': 'foss', 'version': '2017a'}
 
 dependencies = [
-    ('nodejs', nodejsver),
+    ('nodejs', local_nodejsver),
 ]
 
 source_urls = ['https://github.com/jupyterhub/configurable-http-proxy/archive/']
diff --git a/easybuild/easyconfigs/c/cramtools/cramtools-2.0-Java-1.7.0_80.eb b/easybuild/easyconfigs/c/cramtools/cramtools-2.0-Java-1.7.0_80.eb
index 5de680ccb2c..d7bf2ec912a 100644
--- a/easybuild/easyconfigs/c/cramtools/cramtools-2.0-Java-1.7.0_80.eb
+++ b/easybuild/easyconfigs/c/cramtools/cramtools-2.0-Java-1.7.0_80.eb
@@ -2,6 +2,7 @@ easyblock = 'Tarball'
 
 name = 'cramtools'
 version = '2.0'
+versionsuffix = '-Java-%(javaver)s'
 
 homepage = 'https://github.com/enasequence/cramtools/'
 description = """CRAMTools is a set of Java tools and APIs for efficient compression of sequence 
@@ -14,10 +15,7 @@ toolchain = SYSTEM
 sources = ['v%(version)s.tar.gz']
 source_urls = ['https://github.com/enasequence/%(name)s/archive/']
 
-java = 'Java'
-javaver = '1.7.0_80'
-versionsuffix = '-%s-%s' % (java, javaver)
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_80')]
 
 modloadmsg = "To execute cramtools run: java -jar $EBROOTCRAMTOOLS/%(name)s-%(version)s.jar\n"
 
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-CUDA-7.5.18.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-CUDA-7.5.18.eb
index 32b2c7f4537..92f89f5c4a4 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-CUDA-7.5.18.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-CUDA-7.5.18.eb
@@ -7,9 +7,9 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '5.0'
-cuda_version = '7.5.18'
+local_cuda_version = '7.5.18'
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -25,7 +25,7 @@ checksums = [
     '6f9110f66c8a48e15766b1f8c2a1baf3',    # cudnn-7.5-linux-x64-v5.0-ga.tgz
 ]
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 sanity_check_paths = {
     'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-5.1-CUDA-8.0.44.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.1-CUDA-8.0.44.eb
index 82104ee440d..8e2332638eb 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-5.1-CUDA-8.0.44.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.1-CUDA-8.0.44.eb
@@ -7,9 +7,9 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '5.1'
-cuda_version = '8.0.44'
+local_cuda_version = '8.0.44'
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -21,7 +21,7 @@ toolchain = SYSTEM
 # Download link: https://developer.nvidia.com/rdp/cudnn-download
 sources = ['%(namelower)s-8.0-linux-x64-v%(version)s.tgz']
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 checksums = [
     '406f4ac7f7ee8aa9e41304c143461a69',    # cudnn-8.0-linux-x64-v5.1.tgz, Jan 20 2017 download
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-6.0-CUDA-8.0.61.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-6.0-CUDA-8.0.61.eb
index e97571c5553..386a7751316 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-6.0-CUDA-8.0.61.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-6.0-CUDA-8.0.61.eb
@@ -7,9 +7,9 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '6.0'
-cuda_version = '8.0.61'
+local_cuda_version = '8.0.61'
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -21,7 +21,7 @@ toolchain = SYSTEM
 # Download link: https://developer.nvidia.com/rdp/cudnn-download
 sources = ['%(namelower)s-8.0-linux-x64-v%(version)s.tgz']
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 checksums = [
     '4aacb7acb93c5e4dfa9db814df496219',    # cudnn-8.0-linux-x64-v6.0.tgz, Jan 20 2017 download
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.2-CUDA-9.0.176.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.2-CUDA-9.0.176.eb
index 98c36351dd8..2dcde5e718c 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.2-CUDA-9.0.176.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.2-CUDA-9.0.176.eb
@@ -7,11 +7,11 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '7.0.2'
-cuda_version = '9.0.176'
+local_cuda_version = '9.0.176'
 
-cuda_version_major_minor = '.'.join(cuda_version.split('.')[:2])
+local_cuda_version_major_minor = '.'.join(local_cuda_version.split('.')[:2])
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -22,10 +22,10 @@ toolchain = SYSTEM
 # Nvidia developer registration required.
 # Download link: https://developer.nvidia.com/rdp/cudnn-download
 # Download as cudnn-9.0-linux-x64-v7.tgz, rename to cudnn-9.0-linux-x64-v7.0.2.tgz
-sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % cuda_version_major_minor]
+sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % local_cuda_version_major_minor]
 checksums = ['ec2a89453ef6454d417b7f3dad67405e30953e1df1e47aafb846f99d02eaa5d1']
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 sanity_check_paths = {
     'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.5-CUDA-9.1.85.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.5-CUDA-9.1.85.eb
index b4a0c8b2f56..549407dfcb5 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.5-CUDA-9.1.85.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.0.5-CUDA-9.1.85.eb
@@ -7,11 +7,11 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '7.0.5'
-cuda_version = '9.1.85'
+local_cuda_version = '9.1.85'
 
-cuda_version_major_minor = '.'.join(cuda_version.split('.')[:2])
+local_cuda_version_major_minor = '.'.join(local_cuda_version.split('.')[:2])
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -22,10 +22,10 @@ toolchain = SYSTEM
 # Nvidia developer registration required.
 # Download link: https://developer.nvidia.com/rdp/cudnn-download
 # Download as cudnn-9.0-linux-x64-v7.tgz, rename to cudnn-9.0-linux-x64-v<VERSION>.tgz
-sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % cuda_version_major_minor]
+sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % local_cuda_version_major_minor]
 checksums = ['1ead5da7324db35dcdb3721a8d4fc020b217c68cdb3b3daa1be81eb2456bd5e5']
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 sanity_check_paths = {
     'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.4.2.24-CUDA-10.0.130.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.4.2.24-CUDA-10.0.130.eb
index 1e185e98fac..a633c59c947 100644
--- a/easybuild/easyconfigs/c/cuDNN/cuDNN-7.4.2.24-CUDA-10.0.130.eb
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-7.4.2.24-CUDA-10.0.130.eb
@@ -7,11 +7,11 @@ easyblock = 'Tarball'
 
 name = 'cuDNN'
 version = '7.4.2.24'
-cuda_version = '10.0.130'
+local_cuda_version = '10.0.130'
 
-cuda_version_major_minor = '.'.join(cuda_version.split('.')[:2])
+local_cuda_version_major_minor = '.'.join(local_cuda_version.split('.')[:2])
 
-versionsuffix = '-CUDA-%s' % cuda_version
+versionsuffix = '-CUDA-%s' % local_cuda_version
 
 homepage = 'https://developer.nvidia.com/cudnn'
 description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
@@ -22,10 +22,10 @@ toolchain = SYSTEM
 # Nvidia developer registration required.
 # Download link: https://developer.nvidia.com/rdp/cudnn-download
 # Download as cudnn-10.0-linux-x64-v7.4.2.24.tgz
-sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % cuda_version_major_minor]
+sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % local_cuda_version_major_minor]
 checksums = ['2edfc86a02b50d17e88c478955a332e6a1e8174e7e53a3458b4ea51faf02daa3']
 
-dependencies = [('CUDA', cuda_version)]
+dependencies = [('CUDA', local_cuda_version)]
 
 sanity_check_paths = {
     'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],