diff --git a/archive/p/Python/Python-2.7.10-foss-2015a.eb b/archive/p/Python/Python-2.7.10-foss-2015a.eb
index f07c4b67..344f9d40 100644
--- a/archive/p/Python/Python-2.7.10-foss-2015a.eb
+++ b/archive/p/Python/Python-2.7.10-foss-2015a.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.10-foss-2015b.eb b/archive/p/Python/Python-2.7.10-foss-2015b.eb
index fe7123b8..78d31f29 100644
--- a/archive/p/Python/Python-2.7.10-foss-2015b.eb
+++ b/archive/p/Python/Python-2.7.10-foss-2015b.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.10-intel-2015a.eb b/archive/p/Python/Python-2.7.10-intel-2015a.eb
index 49651d1d..37959e9c 100644
--- a/archive/p/Python/Python-2.7.10-intel-2015a.eb
+++ b/archive/p/Python/Python-2.7.10-intel-2015a.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.10-intel-2015b.eb b/archive/p/Python/Python-2.7.10-intel-2015b.eb
index 33f63afe..f0f4b720 100644
--- a/archive/p/Python/Python-2.7.10-intel-2015b.eb
+++ b/archive/p/Python/Python-2.7.10-intel-2015b.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,12 +40,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.11-foss-2015a.eb b/archive/p/Python/Python-2.7.11-foss-2015a.eb
index 249c1ed5..8b313f0b 100644
--- a/archive/p/Python/Python-2.7.11-foss-2015a.eb
+++ b/archive/p/Python/Python-2.7.11-foss-2015a.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.11-foss-2016a.eb b/archive/p/Python/Python-2.7.11-foss-2016a.eb
index e5e9a31a..824dcd45 100644
--- a/archive/p/Python/Python-2.7.11-foss-2016a.eb
+++ b/archive/p/Python/Python-2.7.11-foss-2016a.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'foss', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/archive/p/Python/Python-2.7.11-intel-2015b.eb b/archive/p/Python/Python-2.7.11-intel-2015b.eb
index 5a75a4e8..7317d4e1 100644
--- a/archive/p/Python/Python-2.7.11-intel-2015b.eb
+++ b/archive/p/Python/Python-2.7.11-intel-2015b.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb b/archive/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
index 566f6a2e..5052e20e 100644
--- a/archive/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
+++ b/archive/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb b/archive/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
index 364a09ec..629f3eed 100644
--- a/archive/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
+++ b/archive/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
@@ -10,8 +10,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,15 +43,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.11-intel-2016a.eb b/archive/p/Python/Python-2.7.11-intel-2016a.eb
index 45b04c12..f2c91fac 100644
--- a/archive/p/Python/Python-2.7.11-intel-2016a.eb
+++ b/archive/p/Python/Python-2.7.11-intel-2016a.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-foss-2015.05.eb b/archive/p/Python/Python-2.7.9-foss-2015.05.eb
index 17e5501b..ecd37c66 100644
--- a/archive/p/Python/Python-2.7.9-foss-2015.05.eb
+++ b/archive/p/Python/Python-2.7.9-foss-2015.05.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015.05'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-foss-2015a.eb b/archive/p/Python/Python-2.7.9-foss-2015a.eb
index 86b1ffb0..560f3ced 100644
--- a/archive/p/Python/Python-2.7.9-foss-2015a.eb
+++ b/archive/p/Python/Python-2.7.9-foss-2015a.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-foss-2015b.eb b/archive/p/Python/Python-2.7.9-foss-2015b.eb
index ba05d350..f0fbceef 100644
--- a/archive/p/Python/Python-2.7.9-foss-2015b.eb
+++ b/archive/p/Python/Python-2.7.9-foss-2015b.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-foss-2015g.eb b/archive/p/Python/Python-2.7.9-foss-2015g.eb
index 37028fd7..e5d44497 100644
--- a/archive/p/Python/Python-2.7.9-foss-2015g.eb
+++ b/archive/p/Python/Python-2.7.9-foss-2015g.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015g'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -38,11 +38,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['http://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-intel-2015a.eb b/archive/p/Python/Python-2.7.9-intel-2015a.eb
index e6fbc439..fccee62a 100644
--- a/archive/p/Python/Python-2.7.9-intel-2015a.eb
+++ b/archive/p/Python/Python-2.7.9-intel-2015a.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,12 +39,12 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/archive/p/Python/Python-2.7.9-intel-2015b.eb b/archive/p/Python/Python-2.7.9-intel-2015b.eb
index 77a8e812..7f4b1694 100644
--- a/archive/p/Python/Python-2.7.9-intel-2015b.eb
+++ b/archive/p/Python/Python-2.7.9-intel-2015b.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/archive/p/Python/Python-3.5.0-intel-2015b.eb b/archive/p/Python/Python-3.5.0-intel-2015b.eb
index 00e100a1..352c6e61 100644
--- a/archive/p/Python/Python-3.5.0-intel-2015b.eb
+++ b/archive/p/Python/Python-3.5.0-intel-2015b.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.3'
-scilocal_pyversion = '0.16.0'
+local_numpyversion = '1.9.3'
+local_scipyversion = '0.16.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,11 +40,11 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {
diff --git a/archive/p/Python/Python-3.5.1-foss-2015a.eb b/archive/p/Python/Python-3.5.1-foss-2015a.eb
index c5df9e7f..519fd6c9 100644
--- a/archive/p/Python/Python-3.5.1-foss-2015a.eb
+++ b/archive/p/Python/Python-3.5.1-foss-2015a.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {
diff --git a/archive/p/Python/Python-3.5.1-foss-2016a.eb b/archive/p/Python/Python-3.5.1-foss-2016a.eb
index f695958e..1ab4e823 100644
--- a/archive/p/Python/Python-3.5.1-foss-2016a.eb
+++ b/archive/p/Python/Python-3.5.1-foss-2016a.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'foss', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {
diff --git a/archive/p/Python/Python-3.5.1-intel-2016.01.eb b/archive/p/Python/Python-3.5.1-intel-2016.01.eb
index 105a9481..aa316655 100644
--- a/archive/p/Python/Python-3.5.1-intel-2016.01.eb
+++ b/archive/p/Python/Python-3.5.1-intel-2016.01.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2016.01'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,14 +41,14 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {
diff --git a/archive/p/Python/Python-3.5.1-intel-2016a.eb b/archive/p/Python/Python-3.5.1-intel-2016a.eb
index 3c64cd9c..f9486ea9 100644
--- a/archive/p/Python/Python-3.5.1-intel-2016a.eb
+++ b/archive/p/Python/Python-3.5.1-intel-2016a.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,14 +41,14 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
+    ('numpy', local_numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
+    ('scipy', local_scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     }),
     ('blist', '1.3.6', {
diff --git a/p/Python/Python-2.7.10-gimkl-2.11.5.eb b/p/Python/Python-2.7.10-gimkl-2.11.5.eb
index 7914b1eb..55d79336 100644
--- a/p/Python/Python-2.7.10-gimkl-2.11.5.eb
+++ b/p/Python/Python-2.7.10-gimkl-2.11.5.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -40,12 +40,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.10-goolf-1.4.10.eb b/p/Python/Python-2.7.10-goolf-1.4.10.eb
index ab16568c..f7bc33e3 100644
--- a/p/Python/Python-2.7.10-goolf-1.4.10.eb
+++ b/p/Python/Python-2.7.10-goolf-1.4.10.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.10-goolf-1.7.20.eb b/p/Python/Python-2.7.10-goolf-1.7.20.eb
index bf73566e..6068d21d 100644
--- a/p/Python/Python-2.7.10-goolf-1.7.20.eb
+++ b/p/Python/Python-2.7.10-goolf-1.7.20.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.2'
-scilocal_pyversion = '0.15.1'
+local_numpyversion = '1.9.2'
+local_scipyversion = '0.15.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,12 +41,12 @@ exts_list = [
     ('nose', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-CrayGNU-2015.11.eb b/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
index 88a3d066..a3a5aeb3 100644
--- a/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
+++ b/p/Python/Python-2.7.11-CrayGNU-2015.11.eb
@@ -10,8 +10,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-CrayGNU-2016.03.eb b/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
index d78c4813..2b3b30f1 100644
--- a/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
+++ b/p/Python/Python-2.7.11-CrayGNU-2016.03.eb
@@ -10,8 +10,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2016.03'}
 toolchainopts = {'pic': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-gimkl-2.11.5.eb b/p/Python/Python-2.7.11-gimkl-2.11.5.eb
index 7132f601..0857c2be 100644
--- a/p/Python/Python-2.7.11-gimkl-2.11.5.eb
+++ b/p/Python/Python-2.7.11-gimkl-2.11.5.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,15 +41,15 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
             'numpy-1.8.0-mkl.patch',
-            'numpy-%s-sse42.patch' % numlocal_pyversion,
+            'numpy-%s-sse42.patch' % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-goolf-1.7.20.eb b/p/Python/Python-2.7.11-goolf-1.7.20.eb
index 53b5e326..e35b3110 100644
--- a/p/Python/Python-2.7.11-goolf-1.7.20.eb
+++ b/p/Python/Python-2.7.11-goolf-1.7.20.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -42,12 +42,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-iomkl-2016.07.eb b/p/Python/Python-2.7.11-iomkl-2016.07.eb
index de5a60d0..ffe66dfc 100644
--- a/p/Python/Python-2.7.11-iomkl-2016.07.eb
+++ b/p/Python/Python-2.7.11-iomkl-2016.07.eb
@@ -10,8 +10,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'iomkl', 'version': '2016.07'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -46,12 +46,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.11-iomkl-2016.09-GCC-4.9.3-2.25.eb b/p/Python/Python-2.7.11-iomkl-2016.09-GCC-4.9.3-2.25.eb
index b54af92f..1d15819d 100644
--- a/p/Python/Python-2.7.11-iomkl-2016.09-GCC-4.9.3-2.25.eb
+++ b/p/Python/Python-2.7.11-iomkl-2016.09-GCC-4.9.3-2.25.eb
@@ -8,8 +8,8 @@ description = """Python is a programming language that lets you work more quickl
 toolchain = {'name': 'iomkl', 'version': '2016.09-GCC-4.9.3-2.25'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.1'
-scilocal_pyversion = '0.16.1'
+local_numpyversion = '1.10.1'
+local_scipyversion = '0.16.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -44,12 +44,12 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': ['numpy-1.8.0-mkl.patch'],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9-CrayGNU-2015.06.eb b/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
index 58fc4709..24b662fb 100644
--- a/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
+++ b/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,14 +43,14 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch',  # % numlocal_pyversion,
+            'numpy-1.8.0-mkl.patch',  # % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9-CrayGNU-2015.11.eb b/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
index 2b28cf2f..e7f261e6 100644
--- a/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
+++ b/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -43,14 +43,14 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch',  # % numlocal_pyversion,
+            'numpy-1.8.0-mkl.patch',  # % local_numpyversion,
         ],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9-GNU-5.1.0-2.25.eb b/p/Python/Python-2.7.9-GNU-5.1.0-2.25.eb
index c0457e04..cb186fe1 100644
--- a/p/Python/Python-2.7.9-GNU-5.1.0-2.25.eb
+++ b/p/Python/Python-2.7.9-GNU-5.1.0-2.25.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/p/Python/Python-2.7.9-gompi-2015e.eb b/p/Python/Python-2.7.9-gompi-2015e.eb
index e8d67d30..460eef7f 100644
--- a/p/Python/Python-2.7.9-gompi-2015e.eb
+++ b/p/Python/Python-2.7.9-gompi-2015e.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'gompi', 'version': '2015e'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/p/Python/Python-2.7.9-goolf-1.5.14.eb b/p/Python/Python-2.7.9-goolf-1.5.14.eb
index 2b543238..1063f159 100644
--- a/p/Python/Python-2.7.9-goolf-1.5.14.eb
+++ b/p/Python/Python-2.7.9-goolf-1.5.14.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9-goolf-1.5.16.eb b/p/Python/Python-2.7.9-goolf-1.5.16.eb
index 89ae0726..7ad69dac 100644
--- a/p/Python/Python-2.7.9-goolf-1.5.16.eb
+++ b/p/Python/Python-2.7.9-goolf-1.5.16.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.5.16'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9-goolf-1.7.20.eb b/p/Python/Python-2.7.9-goolf-1.7.20.eb
index f919cd43..e737ddfc 100644
--- a/p/Python/Python-2.7.9-goolf-1.7.20.eb
+++ b/p/Python/Python-2.7.9-goolf-1.7.20.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['https://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -39,11 +39,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    ('numpy', numlocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    ('numpy', local_numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     }),
-    ('scipy', scilocal_pyversion, {
-        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    ('scipy', local_scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     }),
     ('blist', '1.3.6', {
         'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-2.7.9.eb b/p/Python/Python-2.7.9.eb
index 2c5dd5f9..4bb0f575 100644
--- a/p/Python/Python-2.7.9.eb
+++ b/p/Python/Python-2.7.9.eb
@@ -9,8 +9,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.9.1'
-scilocal_pyversion = '0.14.1'
+local_numpyversion = '1.9.1'
+local_scipyversion = '0.14.1'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -42,11 +42,11 @@ exts_list = [
     ('nose', '1.3.4', {
         'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
-    #        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numlocal_pyversion, 'download')],
+    #    ('numpy', local_numpyversion, {
+    #        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % local_numpyversion, 'download')],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
-    #        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scilocal_pyversion, 'download')],
+    #    ('scipy', local_scipyversion, {
+    #        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % local_scipyversion, 'download')],
     #    }),
     #    ('blist', '1.3.6', {
     #        'source_urls': ['http://pypi.python.org/packages/source/b/blist/'],
diff --git a/p/Python/Python-3.5.1-intel-2017.00.eb b/p/Python/Python-3.5.1-intel-2017.00.eb
index ac5cc59c..842fad9e 100644
--- a/p/Python/Python-3.5.1-intel-2017.00.eb
+++ b/p/Python/Python-3.5.1-intel-2017.00.eb
@@ -7,7 +7,7 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2017.00'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-scilocal_pyversion = '0.17.0'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/p/Python/Python-3.5.1.eb b/p/Python/Python-3.5.1.eb
index 5248735d..e7a1fbb2 100644
--- a/p/Python/Python-3.5.1.eb
+++ b/p/Python/Python-3.5.1.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
+    #    ('numpy', local_numpyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
+    #    ('scipy', local_scipyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     #    }),
     #    ('blist', '1.3.6', {
diff --git a/p/Python/Python-3.5.2-intel-2017.00.eb b/p/Python/Python-3.5.2-intel-2017.00.eb
index a92d5183..921f2ce2 100644
--- a/p/Python/Python-3.5.2-intel-2017.00.eb
+++ b/p/Python/Python-3.5.2-intel-2017.00.eb
@@ -7,7 +7,7 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = {'name': 'intel', 'version': '2017.00'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-scilocal_pyversion = '0.17.0'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
diff --git a/p/Python/Python-3.5.2.eb b/p/Python/Python-3.5.2.eb
index 04f976c9..2a37efd2 100644
--- a/p/Python/Python-3.5.2.eb
+++ b/p/Python/Python-3.5.2.eb
@@ -7,8 +7,8 @@ description = "Python is a programming language that lets you work more quickly
 toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
-numlocal_pyversion = '1.10.4'
-scilocal_pyversion = '0.17.0'
+local_numpyversion = '1.10.4'
+local_scipyversion = '0.17.0'
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
@@ -41,10 +41,10 @@ exts_list = [
     ('nose', '1.3.7', {
         'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
     }),
-    #    ('numpy', numlocal_pyversion, {
+    #    ('numpy', local_numpyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
     #    }),
-    #    ('scipy', scilocal_pyversion, {
+    #    ('scipy', local_scipyversion, {
     #        'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
     #    }),
     #    ('blist', '1.3.6', {