diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
index b2db4dfc702451a2fddf89f48bf72dece68210e5..6eca41a13ae1f7cf09af2963f35ef36bae559d49 100644
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gompi-2021b.eb
@@ -21,4 +21,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
 }
 
-moduleclass = 'mpi'
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
index 5450fb8fa487edf8d8cc0e497d8b90093093beca..15e9e0bc5a5226ecc5391aa67547f949e09555ab 100644
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-gpsmpi-2021b.eb
@@ -22,4 +22,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
 }
 
-moduleclass = 'mpi'
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
index 59107b67bf6ba2836b676261d2fa7b10e9586c38..075bbede27d2c79701ac9896eb66282d5a3514a3 100644
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iimpi-2021b.eb
@@ -22,4 +22,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
 }
 
-moduleclass = 'mpi'
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
index 2df8e3a66928f4112b3104d878ca0f61968b9f0b..aad19e990d536ad436cb768527f4233768038b58 100644
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-iompi-2021b.eb
@@ -22,4 +22,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
 }
 
-moduleclass = 'mpi'
+moduleclass = 'lib'
diff --git a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
index 49e30affa671a1ae9884cfdefaee2eef6083b424..ca5f7076afccf73740adee17275f3a62e44e4472 100644
--- a/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
+++ b/Golden_Repo/m/mpi4py/mpi4py-3.1.3-ipsmpi-2021b.eb
@@ -22,4 +22,4 @@ sanity_check_paths = {
     'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
 }
 
-moduleclass = 'mpi'
+moduleclass = 'lib'