diff --git a/archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb b/archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb
index d4e5e160..14600b7d 100644
--- a/archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb
+++ b/archive/l/LLVM/LLVM-3.7.1-foss-2015g.eb
@@ -32,4 +32,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb b/b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb
index a8d34de9..82e6cf6c 100644
--- a/b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb
+++ b/b/BerkeleyUPC/BerkeleyUPC-2.16.2-gompi-2015b.eb
@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 parallel = 1
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb b/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
index 480081d3..6c6655f8 100644
--- a/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
+++ b/c/CLooG/CLooG-0.18.1-GCC-4.8.2.eb
@@ -28,4 +28,4 @@ sanity_check_paths = {
         SHLIB_EXT],
     'dirs': []}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb b/c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb
index f33f0abe..1df99736 100644
--- a/c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb
+++ b/c/Clang/Clang-3.7.0-GNU-5.1.0-2.25.eb
@@ -39,4 +39,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb b/c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb
index b232efcf..5b7c94d3 100644
--- a/c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb
+++ b/c/Clang/Clang-3.8.1-GCC-6.3.0-2.27.eb
@@ -46,4 +46,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb b/c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb
index ddbf04e7..6b67c0d9 100644
--- a/c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb
+++ b/c/Clang/Clang-5.0.0-GCC-6.3.0-2.27.eb
@@ -42,4 +42,4 @@ usepolly = True
 
 build_targets = ['X86']
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/Clang/Clang-7.0.1-gompi-2019.02.eb b/c/Clang/Clang-7.0.1-gompi-2019.02.eb
index 64ac3f74..13743e15 100644
--- a/c/Clang/Clang-7.0.1-gompi-2019.02.eb
+++ b/c/Clang/Clang-7.0.1-gompi-2019.02.eb
@@ -36,4 +36,4 @@ assertions = True
 usepolly = True
 skip_all_tests = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/c/Clang/Clang-7.0.1.eb b/c/Clang/Clang-7.0.1.eb
index b0844b33..9b08df9a 100644
--- a/c/Clang/Clang-7.0.1.eb
+++ b/c/Clang/Clang-7.0.1.eb
@@ -36,4 +36,4 @@ assertions = True
 usepolly = True
 skip_all_tests = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.4.7-system.eb b/g/GCC/GCC-4.4.7-system.eb
index 6aeae45e..6ec99661 100644
--- a/g/GCC/GCC-4.4.7-system.eb
+++ b/g/GCC/GCC-4.4.7-system.eb
@@ -27,4 +27,4 @@ sanity_check_paths = {
     'dirs': ['/usr/share/doc/gcc-4.4.7']
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.7.0.eb b/g/GCC/GCC-4.7.0.eb
index d8d4130d..b4854a10 100644
--- a/g/GCC/GCC-4.7.0.eb
+++ b/g/GCC/GCC-4.7.0.eb
@@ -37,4 +37,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.1-CLooG.eb b/g/GCC/GCC-4.8.1-CLooG.eb
index 6d69fca9..aaf71b03 100644
--- a/g/GCC/GCC-4.8.1-CLooG.eb
+++ b/g/GCC/GCC-4.8.1-CLooG.eb
@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.1.eb b/g/GCC/GCC-4.8.1.eb
index 278d5bbb..fc692532 100644
--- a/g/GCC/GCC-4.8.1.eb
+++ b/g/GCC/GCC-4.8.1.eb
@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.2-CLooG-multilib.eb b/g/GCC/GCC-4.8.2-CLooG-multilib.eb
index 46e3f2bf..6cabb5e0 100644
--- a/g/GCC/GCC-4.8.2-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.8.2-CLooG-multilib.eb
@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.2-CLooG.eb b/g/GCC/GCC-4.8.2-CLooG.eb
index 90107813..a26731cf 100644
--- a/g/GCC/GCC-4.8.2-CLooG.eb
+++ b/g/GCC/GCC-4.8.2-CLooG.eb
@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.2-multilib.eb b/g/GCC/GCC-4.8.2-multilib.eb
index 8d3e02ec..53e333c6 100644
--- a/g/GCC/GCC-4.8.2-multilib.eb
+++ b/g/GCC/GCC-4.8.2-multilib.eb
@@ -37,4 +37,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.2.eb b/g/GCC/GCC-4.8.2.eb
index 778ca0a6..d0facee3 100644
--- a/g/GCC/GCC-4.8.2.eb
+++ b/g/GCC/GCC-4.8.2.eb
@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.3-CLooG-multilib.eb b/g/GCC/GCC-4.8.3-CLooG-multilib.eb
index ae09fb2b..291ef301 100644
--- a/g/GCC/GCC-4.8.3-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.8.3-CLooG-multilib.eb
@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.3.eb b/g/GCC/GCC-4.8.3.eb
index 668874a9..2229e518 100644
--- a/g/GCC/GCC-4.8.3.eb
+++ b/g/GCC/GCC-4.8.3.eb
@@ -34,7 +34,7 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 opt = True
 
diff --git a/g/GCC/GCC-4.8.4-CLooG-multilib.eb b/g/GCC/GCC-4.8.4-CLooG-multilib.eb
index 48db7c86..ade47302 100644
--- a/g/GCC/GCC-4.8.4-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.8.4-CLooG-multilib.eb
@@ -48,4 +48,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.4-CLooG.eb b/g/GCC/GCC-4.8.4-CLooG.eb
index 5ae2a8bd..ba543d3c 100644
--- a/g/GCC/GCC-4.8.4-CLooG.eb
+++ b/g/GCC/GCC-4.8.4-CLooG.eb
@@ -46,4 +46,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.4.eb b/g/GCC/GCC-4.8.4.eb
index 21281667..38d64643 100644
--- a/g/GCC/GCC-4.8.4.eb
+++ b/g/GCC/GCC-4.8.4.eb
@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.8.5.eb b/g/GCC/GCC-4.8.5.eb
index a5460b3f..02e52cf8 100644
--- a/g/GCC/GCC-4.8.5.eb
+++ b/g/GCC/GCC-4.8.5.eb
@@ -34,4 +34,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.0-CLooG-multilib.eb b/g/GCC/GCC-4.9.0-CLooG-multilib.eb
index 76950f80..7d35049a 100644
--- a/g/GCC/GCC-4.9.0-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.9.0-CLooG-multilib.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.0-CLooG.eb b/g/GCC/GCC-4.9.0-CLooG.eb
index d5780680..de000c04 100644
--- a/g/GCC/GCC-4.9.0-CLooG.eb
+++ b/g/GCC/GCC-4.9.0-CLooG.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.0.eb b/g/GCC/GCC-4.9.0.eb
index 98b8fdee..8550c698 100644
--- a/g/GCC/GCC-4.9.0.eb
+++ b/g/GCC/GCC-4.9.0.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '9709b49ae0e904cbb0a6a1b62853b556',     # gcc-4.9.0.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.1-CLooG-multilib.eb b/g/GCC/GCC-4.9.1-CLooG-multilib.eb
index bdc35b75..5469291d 100644
--- a/g/GCC/GCC-4.9.1-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.9.1-CLooG-multilib.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.1-CLooG.eb b/g/GCC/GCC-4.9.1-CLooG.eb
index 8ee1045b..47a8c84e 100644
--- a/g/GCC/GCC-4.9.1-CLooG.eb
+++ b/g/GCC/GCC-4.9.1-CLooG.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.1.eb b/g/GCC/GCC-4.9.1.eb
index 83b6ceac..69492912 100644
--- a/g/GCC/GCC-4.9.1.eb
+++ b/g/GCC/GCC-4.9.1.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'fddf71348546af523353bd43d34919c1',     # gcc-4.9.1.tar.gz
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.2-CLooG-multilib.eb b/g/GCC/GCC-4.9.2-CLooG-multilib.eb
index 8be581ca..059690a3 100644
--- a/g/GCC/GCC-4.9.2-CLooG-multilib.eb
+++ b/g/GCC/GCC-4.9.2-CLooG-multilib.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -57,4 +57,4 @@ multilib = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.2-CLooG.eb b/g/GCC/GCC-4.9.2-CLooG.eb
index 1da7e0d1..b0e0234f 100644
--- a/g/GCC/GCC-4.9.2-CLooG.eb
+++ b/g/GCC/GCC-4.9.2-CLooG.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
     'cloog-0.18.1.tar.gz',
     'isl-0.12.2.tar.bz2',
@@ -31,9 +31,9 @@ sources = [
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -55,4 +55,4 @@ clooguseisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.2-binutils-2.25.eb b/g/GCC/GCC-4.9.2-binutils-2.25.eb
index 48b26ea0..669d3ceb 100644
--- a/g/GCC/GCC-4.9.2-binutils-2.25.eb
+++ b/g/GCC/GCC-4.9.2-binutils-2.25.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,7 +22,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -30,9 +30,9 @@ builddependencies = [('binutils', local_local_binutilsver)]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.2.eb b/g/GCC/GCC-4.9.2.eb
index ec27741a..7c3ca51e 100644
--- a/g/GCC/GCC-4.9.2.eb
+++ b/g/GCC/GCC-4.9.2.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20140630.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.3-binutils-2.25.eb b/g/GCC/GCC-4.9.3-binutils-2.25.eb
index c198eeac..734aacd9 100644
--- a/g/GCC/GCC-4.9.3-binutils-2.25.eb
+++ b/g/GCC/GCC-4.9.3-binutils-2.25.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,7 +22,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -30,9 +30,9 @@ builddependencies = [('binutils', local_local_binutilsver)]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -60,4 +60,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.3-experimental.eb b/g/GCC/GCC-4.9.3-experimental.eb
index 858a742b..ea6329de 100644
--- a/g/GCC/GCC-4.9.3-experimental.eb
+++ b/g/GCC/GCC-4.9.3-experimental.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -20,15 +20,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.3-tf.eb b/g/GCC/GCC-4.9.3-tf.eb
index 858a742b..ea6329de 100644
--- a/g/GCC/GCC-4.9.3-tf.eb
+++ b/g/GCC/GCC-4.9.3-tf.eb
@@ -8,7 +8,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -20,15 +20,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-4.9.3.eb b/g/GCC/GCC-4.9.3.eb
index f394a609..15850bfa 100644
--- a/g/GCC/GCC-4.9.3.eb
+++ b/g/GCC/GCC-4.9.3.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -19,15 +19,15 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -43,4 +43,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-5.1.0-binutils-2.25.eb b/g/GCC/GCC-5.1.0-binutils-2.25.eb
index c758fde7..64d9f81c 100644
--- a/g/GCC/GCC-5.1.0-binutils-2.25.eb
+++ b/g/GCC/GCC-5.1.0-binutils-2.25.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'd5525b1127d07d215960e6051c5da35e',     # gcc-5.1.0.tar.bz2
@@ -58,7 +58,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCC/GCC-5.1.0.eb b/g/GCC/GCC-5.1.0.eb
index 99e3c7b9..92116b80 100644
--- a/g/GCC/GCC-5.1.0.eb
+++ b/g/GCC/GCC-5.1.0.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,7 +52,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCC/GCC-5.2.0.eb b/g/GCC/GCC-5.2.0.eb
index 8ada0b15..bf8bc70b 100644
--- a/g/GCC/GCC-5.2.0.eb
+++ b/g/GCC/GCC-5.2.0.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.14.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20150717.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,4 +52,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-5.3.0-2.25.eb b/g/GCC/GCC-5.3.0-2.25.eb
index 79a9fbe5..88786fc0 100644
--- a/g/GCC/GCC-5.3.0-2.25.eb
+++ b/g/GCC/GCC-5.3.0-2.25.eb
@@ -24,4 +24,4 @@ altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked
 # as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-5.3.0-binutils-2.25.eb b/g/GCC/GCC-5.3.0-binutils-2.25.eb
index fadc8627..028b7467 100644
--- a/g/GCC/GCC-5.3.0-binutils-2.25.eb
+++ b/g/GCC/GCC-5.3.0-binutils-2.25.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,16 +25,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('M4', '1.4.17'),
@@ -58,7 +58,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # IT4I specific optimalization
 modextravars = {
diff --git a/g/GCC/GCC-5.3.0.eb b/g/GCC/GCC-5.3.0.eb
index 94446236..5ef4754c 100644
--- a/g/GCC/GCC-5.3.0.eb
+++ b/g/GCC/GCC-5.3.0.eb
@@ -7,7 +7,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -22,16 +22,16 @@ source_urls = [
 sources = [
     SOURCELOWER_TAR_BZ2,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [('M4', '1.4.17')]
 
@@ -52,4 +52,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb b/g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb
index 32c98729..945ff5aa 100644
--- a/g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb
+++ b/g/GCC/GCC-5.3.1-snapshot-20160419-2.25.eb
@@ -24,4 +24,4 @@ altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked
 # as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-7.3.0-2.30.eb b/g/GCC/GCC-7.3.0-2.30.eb
index cd33c19b..028b8686 100644
--- a/g/GCC/GCC-7.3.0-2.30.eb
+++ b/g/GCC/GCC-7.3.0-2.30.eb
@@ -22,4 +22,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-8.1.0-2.30.eb b/g/GCC/GCC-8.1.0-2.30.eb
index 468d3a08..ec37bfeb 100644
--- a/g/GCC/GCC-8.1.0-2.30.eb
+++ b/g/GCC/GCC-8.1.0-2.30.eb
@@ -22,4 +22,4 @@ dependencies = [
 altroot = 'GCCcore'
 altversion = 'GCCcore'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-8.3.0-2.32.eb b/g/GCC/GCC-8.3.0-2.32.eb
index c61dd1c0..a7189f4a 100644
--- a/g/GCC/GCC-8.3.0-2.32.eb
+++ b/g/GCC/GCC-8.3.0-2.32.eb
@@ -24,4 +24,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCC/GCC-9.2.0-2.32.eb b/g/GCC/GCC-9.2.0-2.32.eb
index 6aca3eea..f86e5f23 100644
--- a/g/GCC/GCC-9.2.0-2.32.eb
+++ b/g/GCC/GCC-9.2.0-2.32.eb
@@ -24,4 +24,4 @@ altroot = 'GCCcore'
 altversion = 'GCCcore'
 
 # this bundle serves as a local_compiler-only toolchain, so it should be marked as local_compiler (important for HMNS)
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-4.9.2.eb b/g/GCCcore/GCCcore-4.9.2.eb
index 0da7d163..193f8764 100644
--- a/g/GCCcore/GCCcore-4.9.2.eb
+++ b/g/GCCcore/GCCcore-4.9.2.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 gcc_name = 'GCC'
 
 source_urls = [
@@ -21,7 +21,7 @@ source_urls = [
 sources = [
     '%s-%s.tar.bz2' % (gcc_name.lower(), version),
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -32,9 +32,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
@@ -50,4 +50,4 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-4.9.3.eb b/g/GCCcore/GCCcore-4.9.3.eb
index c0708b6b..dc5c7fad 100644
--- a/g/GCCcore/GCCcore-4.9.3.eb
+++ b/g/GCCcore/GCCcore-4.9.3.eb
@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.2'
+local_mpfr_version = '3.1.2'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gcc/gcc-%s' % version,  # GCC auto-resolving HTTP mirror
@@ -23,7 +23,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.0.0a.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
@@ -34,9 +34,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20141204.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     '6f831b4d251872736e8e9cc09746f327',     # gcc-4.9.3.tar.bz2
@@ -52,7 +52,7 @@ languages = ['c', 'c++', 'fortran']
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCCcore/GCCcore-5.3.0.eb b/g/GCCcore/GCCcore-5.3.0.eb
index ec668f69..c6085573 100644
--- a/g/GCCcore/GCCcore-5.3.0.eb
+++ b/g/GCCcore/GCCcore-5.3.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -24,16 +24,16 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('binutils', '2.26'),
@@ -57,7 +57,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb b/g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb
index e021eece..a73411b9 100644
--- a/g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb
+++ b/g/GCCcore/GCCcore-5.3.1-snapshot-20160419.eb
@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.3'
+local_mpfr_version = '3.1.3'
 gcc_name = 'GCC'
 
 source_urls = [
@@ -24,7 +24,7 @@ source_urls = [
 sources = [
     'gcc-5-%s.tar.bz2' % snapshot,
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
@@ -33,9 +33,9 @@ builddependencies = [('binutils', '2.25')]
 
 patches = [
     ('mpfr-%s-allpatches-20151029.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 checksums = [
     'bf701ac49b63272cf77ba0f272214a38',     # gcc-5-20160419.tar.bz2
@@ -54,7 +54,7 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCCcore/GCCcore-5.4.0.eb b/g/GCCcore/GCCcore-5.4.0.eb
index b9f58899..b737aced 100644
--- a/g/GCCcore/GCCcore-5.4.0.eb
+++ b/g/GCCcore/GCCcore-5.4.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,16 +25,16 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.0.tar.bz2',
-    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpfr-%s.tar.gz' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.15.tar.bz2',
 ]
 
 patches = [
     ('mpfr-%s-allpatches-20160601.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version)]
+     local_mpfr_version)]
 
 builddependencies = [
     ('binutils', '2.26'),
@@ -58,4 +58,4 @@ withisl = True
 # limit it
 maxparallel = 4
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-6.1.0.eb b/g/GCCcore/GCCcore-6.1.0.eb
index 391d48b5..ab9e7f50 100644
--- a/g/GCCcore/GCCcore-6.1.0.eb
+++ b/g/GCCcore/GCCcore-6.1.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gmp',  # idem for GMP
@@ -26,7 +26,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -38,8 +38,8 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20160804.patch' %
-     mpfr_version, '../mpfr-%s' %
-     mpfr_version), ('%s-%s_fix-find-isl.patch' %
+     local_mpfr_version, '../mpfr-%s' %
+     local_mpfr_version), ('%s-%s_fix-find-isl.patch' %
                      (name, version)), ]
 
 checksums = [
@@ -54,4 +54,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-6.2.0.eb b/g/GCCcore/GCCcore-6.2.0.eb
index db92517f..3de63b1c 100644
--- a/g/GCCcore/GCCcore-6.2.0.eb
+++ b/g/GCCcore/GCCcore-6.2.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.4'
+local_mpfr_version = '3.1.4'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20160804.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     '%(name)s-%(version)s-fix-find-isl.patch',
 ]
 
@@ -55,7 +55,7 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
 
 # Salomon specific optimalization
 modextravars = {
diff --git a/g/GCCcore/GCCcore-6.3.0.eb b/g/GCCcore/GCCcore-6.3.0.eb
index fbcab035..7550c65c 100644
--- a/g/GCCcore/GCCcore-6.3.0.eb
+++ b/g/GCCcore/GCCcore-6.3.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -30,7 +30,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.1.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -42,9 +42,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20161215.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -71,4 +71,4 @@ modextravars = {
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-6.4.0.eb b/g/GCCcore/GCCcore-6.4.0.eb
index 16dd75d6..1dfcbaff 100644
--- a/g/GCCcore/GCCcore-6.4.0.eb
+++ b/g/GCCcore/GCCcore-6.4.0.eb
@@ -13,7 +13,7 @@ description = """
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -29,7 +29,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -41,9 +41,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20170606.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -74,4 +74,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-7.1.0.eb b/g/GCCcore/GCCcore-7.1.0.eb
index 0606c4f9..4c56e72e 100644
--- a/g/GCCcore/GCCcore-7.1.0.eb
+++ b/g/GCCcore/GCCcore-7.1.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '3.1.5'
+local_mpfr_version = '3.1.5'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.bz2',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.0.3.tar.gz',
     'isl-0.16.1.tar.bz2',
 ]
@@ -37,9 +37,9 @@ builddependencies = [
 
 patches = [
     ('mpfr-%s-allpatches-20161219.patch' %
-     mpfr_version,
+     local_mpfr_version,
      '../mpfr-%s' %
-     mpfr_version),
+     local_mpfr_version),
     'GCCcore-6.2.0-fix-find-isl.patch',
 ]
 
@@ -66,4 +66,4 @@ modextravars = {
     'DEBUGFLAGS': '-O0 -g'
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-8.1.0.eb b/g/GCCcore/GCCcore-8.1.0.eb
index b26613a3..a8dfb745 100644
--- a/g/GCCcore/GCCcore-8.1.0.eb
+++ b/g/GCCcore/GCCcore-8.1.0.eb
@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '4.0.1'
+local_mpfr_version = '4.0.1'
 
 source_urls = [
     # GCC auto-resolving HTTP mirror
@@ -26,7 +26,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.19.tar.bz2',
 ]
@@ -52,4 +52,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-8.2.0.eb b/g/GCCcore/GCCcore-8.2.0.eb
index b3323414..5b6090c3 100644
--- a/g/GCCcore/GCCcore-8.2.0.eb
+++ b/g/GCCcore/GCCcore-8.2.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-mpfr_version = '4.0.1'
+local_mpfr_version = '4.0.1'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
@@ -24,7 +24,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % mpfr_version,
+    'mpfr-%s.tar.bz2' % local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.20.tar.bz2',
 ]
@@ -51,4 +51,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-8.3.0.eb b/g/GCCcore/GCCcore-8.3.0.eb
index 9db8058a..28a21f65 100644
--- a/g/GCCcore/GCCcore-8.3.0.eb
+++ b/g/GCCcore/GCCcore-8.3.0.eb
@@ -46,4 +46,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/GCCcore/GCCcore-9.2.0.eb b/g/GCCcore/GCCcore-9.2.0.eb
index 17bb295c..a89f71b0 100644
--- a/g/GCCcore/GCCcore-9.2.0.eb
+++ b/g/GCCcore/GCCcore-9.2.0.eb
@@ -11,7 +11,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 
 toolchain = SYSTEM
 
-local_mpfr_version = '4.0.2'
+local_local_mpfr_version = '4.0.2'
 
 source_urls = [
     'https://ftpmirror.gnu.org/gnu/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
@@ -25,7 +25,7 @@ source_urls = [
 sources = [
     'gcc-%(version)s.tar.gz',
     'gmp-6.1.2.tar.bz2',
-    'mpfr-%s.tar.bz2' % local_mpfr_version,
+    'mpfr-%s.tar.bz2' % local_local_mpfr_version,
     'mpc-1.1.0.tar.gz',
     'isl-0.21.tar.bz2',
 ]
@@ -48,4 +48,4 @@ languages = ['c', 'c++', 'fortran']
 
 withisl = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/Go/Go-1.11.1.eb b/g/Go/Go-1.11.1.eb
index e200d422..9971ea40 100644
--- a/g/Go/Go-1.11.1.eb
+++ b/g/Go/Go-1.11.1.eb
@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/Go/Go-1.12.7.eb b/g/Go/Go-1.12.7.eb
index d9cdc761..a753cc38 100644
--- a/g/Go/Go-1.12.7.eb
+++ b/g/Go/Go-1.12.7.eb
@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/g/Go/Go-1.13.1.eb b/g/Go/Go-1.13.1.eb
index bc74de26..37c21090 100644
--- a/g/Go/Go-1.13.1.eb
+++ b/g/Go/Go-1.13.1.eb
@@ -23,4 +23,4 @@ sanity_check_paths = {
 
 modextravars = {'GOROOT': '%(installdir)s'}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
index a1357c44..3452a8ed 100644
--- a/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb
index e2ab6691..b349bb3c 100644
--- a/i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.2.174-GCC-6.3.0-2.27.eb
@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb
index d554208b..18ecade4 100644
--- a/i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.4.196-GCC-6.3.0-2.27.eb
@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
index 084a9f71..db09e6a3 100644
--- a/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.5.239-GCC-6.3.0-2.27.eb
@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb
index 4f3f685b..5742ce41 100644
--- a/i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.7.259-GCC-6.3.0-2.27.eb
@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb b/i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb
index 1b0278dd..173893c9 100644
--- a/i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2018.1.163-GCC-6.3.0-2.27.eb
@@ -38,4 +38,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb b/i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb
index 238dc016..97aed3a4 100644
--- a/i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2018.3.222-GCC-6.3.0-2.27.eb
@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb b/i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb
index 4ff6684c..33f5756e 100644
--- a/i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb
+++ b/i/icc/icc-2018.3.222-GCC-8.1.0-2.30.eb
@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb b/i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb
index 071faccc..fb6417dd 100644
--- a/i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2018.5.274-GCC-6.3.0-2.27.eb
@@ -36,4 +36,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb b/i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb
index f03089ba..53ee4392 100644
--- a/i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2019.2.187-GCC-6.3.0-2.27.eb
@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb b/i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb
index 7d70fe0d..3e2949ea 100644
--- a/i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2019.4.227-GCC-6.3.0-2.27.eb
@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb b/i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb
index 8b6c6351..c08d496e 100644
--- a/i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb
+++ b/i/icc/icc-2019.4.227-GCC-8.3.0-2.32.eb
@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb b/i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb
index bd7934d0..34694303 100644
--- a/i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb
+++ b/i/icc/icc-2019.4.227-GCC-9.1.0-2.32.eb
@@ -38,4 +38,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
index f9a04c93..2094a0a4 100644
--- a/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
@@ -42,4 +42,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb b/i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb
index 0788720b..fa7c57ae 100644
--- a/i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb
+++ b/i/ifort/ifort-2017.4.196-GCC-6.4.0-2.28.eb
@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
index 6998276e..ced0e9bc 100644
--- a/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2017.5.239-GCC-6.3.0-2.27.eb
@@ -39,4 +39,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb
index 7bf7ec8b..4cc7423b 100644
--- a/i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2017.7.259-GCC-6.3.0-2.27.eb
@@ -41,4 +41,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb
index 8615f37f..7174df14 100644
--- a/i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2018.1.163-GCC-6.3.0-2.27.eb
@@ -43,4 +43,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb
index 1ef2aadb..ea089e17 100644
--- a/i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2018.3.222-GCC-6.3.0-2.27.eb
@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb b/i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb
index 32c202dc..acc3f3b9 100644
--- a/i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb
+++ b/i/ifort/ifort-2018.3.222-GCC-8.1.0-2.30.eb
@@ -37,4 +37,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb
index ffbe917c..9e6db424 100644
--- a/i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2018.5.274-GCC-6.3.0-2.27.eb
@@ -35,4 +35,4 @@ dontcreateinstalldir = 'True'
 
 license_file = '/apps/licenses/intel/license.lic'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb
index fc683e5e..d83bad97 100644
--- a/i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2019.2.187-GCC-6.3.0-2.27.eb
@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb
index bcc5989d..aea606c5 100644
--- a/i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2019.4.227-GCC-6.3.0-2.27.eb
@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb b/i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb
index da7bc2c2..f471b973 100644
--- a/i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb
+++ b/i/ifort/ifort-2019.4.227-GCC-8.3.0-2.32.eb
@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb b/i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb
index 78bc6773..f80c39b6 100644
--- a/i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb
+++ b/i/ifort/ifort-2019.4.227-GCC-9.1.0-2.32.eb
@@ -40,4 +40,4 @@ modextravars = {
 
 modluafooter = 'add_property("state","experimental")'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/i/ispc/ispc-1.9.1.eb b/i/ispc/ispc-1.9.1.eb
index b5f8098b..b5aa7df8 100644
--- a/i/ispc/ispc-1.9.1.eb
+++ b/i/ispc/ispc-1.9.1.eb
@@ -24,4 +24,4 @@ sanity_check_paths = {
 
 modextrapaths = {'PATH': ''}
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-3.8.1-intel-2017a.eb b/l/LLVM/LLVM-3.8.1-intel-2017a.eb
index cf5e9f63..d537649e 100644
--- a/l/LLVM/LLVM-3.8.1-intel-2017a.eb
+++ b/l/LLVM/LLVM-3.8.1-intel-2017a.eb
@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-3.9.0-intel-2017.00.eb b/l/LLVM/LLVM-3.9.0-intel-2017.00.eb
index d572b19b..9d35cc88 100644
--- a/l/LLVM/LLVM-3.9.0-intel-2017.00.eb
+++ b/l/LLVM/LLVM-3.9.0-intel-2017.00.eb
@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb b/l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb
index e4fa8f39..d44d6035 100644
--- a/l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb
+++ b/l/LLVM/LLVM-4.0.0-GCC-6.3.0-2.27.eb
@@ -37,4 +37,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb b/l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb
index 0425ef27..2ff2062e 100644
--- a/l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb
+++ b/l/LLVM/LLVM-5.0.0-GCC-6.3.0-2.27.eb
@@ -37,4 +37,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-6.0.0-Py-2.7.eb b/l/LLVM/LLVM-6.0.0-Py-2.7.eb
index ab458792..a8cf4a58 100644
--- a/l/LLVM/LLVM-6.0.0-Py-2.7.eb
+++ b/l/LLVM/LLVM-6.0.0-Py-2.7.eb
@@ -36,4 +36,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb b/l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb
index 01f83769..494f07b2 100644
--- a/l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb
+++ b/l/LLVM/LLVM-6.0.1-GCC-6.3.0-2.27.eb
@@ -39,4 +39,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-6.0.1.eb b/l/LLVM/LLVM-6.0.1.eb
index 39826278..f40f5947 100644
--- a/l/LLVM/LLVM-6.0.1.eb
+++ b/l/LLVM/LLVM-6.0.1.eb
@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-7.0.0-intel-2017c.eb b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
index f3011eaf..a5a6ef92 100644
--- a/l/LLVM/LLVM-7.0.0-intel-2017c.eb
+++ b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/l/LLVM/LLVM-7.0.0.eb b/l/LLVM/LLVM-7.0.0.eb
index adda3655..2c10aab0 100644
--- a/l/LLVM/LLVM-7.0.0.eb
+++ b/l/LLVM/LLVM-7.0.0.eb
@@ -42,4 +42,4 @@ sanity_check_paths = {
 
 separate_build_dir = True
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/o/OpenCoarrays/OpenCoarrays-1.4.0.eb b/o/OpenCoarrays/OpenCoarrays-1.4.0.eb
index 0c74c615..146f357c 100644
--- a/o/OpenCoarrays/OpenCoarrays-1.4.0.eb
+++ b/o/OpenCoarrays/OpenCoarrays-1.4.0.eb
@@ -25,4 +25,4 @@ sanity_check_paths = {
     'dirs': ['bin', 'lib'],
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/o/OpenCoarrays/OpenCoarrays-1.8.10-GCC-6.3.0-2.27.eb b/o/OpenCoarrays/OpenCoarrays-1.8.10-GCC-6.3.0-2.27.eb
index f5393fc5..630ae98f 100644
--- a/o/OpenCoarrays/OpenCoarrays-1.8.10-GCC-6.3.0-2.27.eb
+++ b/o/OpenCoarrays/OpenCoarrays-1.8.10-GCC-6.3.0-2.27.eb
@@ -22,4 +22,4 @@ sanity_check_paths = {
     'dirs': ['bin', 'lib64'],
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PCC/PCC-20131024.eb b/p/PCC/PCC-20131024.eb
index 486d719f..3f581143 100644
--- a/p/PCC/PCC-20131024.eb
+++ b/p/PCC/PCC-20131024.eb
@@ -32,4 +32,4 @@ sanity_check_paths = {
     'dirs': ["lib"]
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb b/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
index a1fb979c..4957d437 100644
--- a/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
+++ b/p/PGI/PGI-15.10-GCC-4.9.3-2.25.eb
@@ -27,4 +27,4 @@ license_file = os.path.join(
     "pgi",
     "license.dat")
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb b/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
index c491f376..9b970aab 100644
--- a/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
+++ b/p/PGI/PGI-15.7-GNU-4.9.2-2.25.eb
@@ -23,4 +23,4 @@ license_file = os.path.join(
     "pgi",
     "license.dat")
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb b/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
index fdb2d798..3035c1ad 100644
--- a/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
+++ b/p/PGI/PGI-15.7-GNU-4.9.3-2.25.eb
@@ -23,4 +23,4 @@ license_file = os.path.join(
     "pgi",
     "license.dat")
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-16.10-GNU-4.9.3-2.25.eb b/p/PGI/PGI-16.10-GNU-4.9.3-2.25.eb
index 8de6de48..865d3540 100644
--- a/p/PGI/PGI-16.10-GNU-4.9.3-2.25.eb
+++ b/p/PGI/PGI-16.10-GNU-4.9.3-2.25.eb
@@ -20,4 +20,4 @@ dependencies = [(gnu, gnuver)]
 #license_file = os.path.join(os.getenv('HOME'), "licenses", "pgi", "license.dat")
 license_file = HOME + '/licenses/pgi/license.dat'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb b/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
index 7867f358..6514f702 100644
--- a/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
+++ b/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
@@ -23,4 +23,4 @@ dependencies = [
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-17.9-GCC-6.3.0-2.28.eb b/p/PGI/PGI-17.9-GCC-6.3.0-2.28.eb
index ae6050e7..58b0186e 100644
--- a/p/PGI/PGI-17.9-GCC-6.3.0-2.28.eb
+++ b/p/PGI/PGI-17.9-GCC-6.3.0-2.28.eb
@@ -23,4 +23,4 @@ dependencies = [
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-18.5-GCC-6.3.0-2.27.eb b/p/PGI/PGI-18.5-GCC-6.3.0-2.27.eb
index e2341fd2..c6ef45c2 100644
--- a/p/PGI/PGI-18.5-GCC-6.3.0-2.27.eb
+++ b/p/PGI/PGI-18.5-GCC-6.3.0-2.27.eb
@@ -25,4 +25,4 @@ dependencies = [
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.1-GCC-6.3.0-2.27.eb b/p/PGI/PGI-19.1-GCC-6.3.0-2.27.eb
index 7bc689de..16fff0dd 100644
--- a/p/PGI/PGI-19.1-GCC-6.3.0-2.27.eb
+++ b/p/PGI/PGI-19.1-GCC-6.3.0-2.27.eb
@@ -23,4 +23,4 @@ dependencies = [
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb b/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
index fc8e052a..d568e91f 100644
--- a/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
+++ b/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
@@ -36,4 +36,4 @@ modextrapaths = {
     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
index 4399d340..2032c36e 100644
--- a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
@@ -37,4 +37,4 @@ modextrapaths = {
     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
index e63ce0e7..e5355362 100644
--- a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
@@ -36,4 +36,4 @@ modextrapaths = {
     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb b/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
index 31300907..a616e06b 100644
--- a/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
+++ b/p/PGI/PGI-19.7-GCC-8.3.0-2.32-CUDA-10.1.243.eb
@@ -37,4 +37,4 @@ modextrapaths = {
     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb b/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb
index e0c6a509..39685a89 100644
--- a/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb
+++ b/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb
@@ -36,4 +36,4 @@ modextrapaths = {
     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
 }
 
-moduleclass = 'local_compiler'
+moduleclass = 'compiler'