diff --git a/Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb b/Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb
similarity index 95%
rename from Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb
rename to Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb
index a24a015854f9d5fd10f82d0bd7b46efe363a7440..9d8b36beaea602c9ccb14e9ebbf403d3ee2bddc7 100644
--- a/Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb
+++ b/Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb
@@ -7,7 +7,7 @@ homepage = 'https://github.com/flame/blis/'
 description = """BLIS is a portable software framework for instantiating high-performance
 BLAS-like dense linear algebra libraries."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
 source_urls = ['https://github.com/flame/blis/archive/']
 sources = ['%(version)s.tar.gz']
diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb
similarity index 89%
rename from Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb
rename to Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb
index 99e7044835e673f2744509f34db639d9485527a2..2e8ebbded3b019e4d759b0c59e54db705920e156 100644
--- a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb
+++ b/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb
@@ -5,7 +5,7 @@ homepage = 'https://www.fftw.org'
 description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
 in one or more dimensions, of arbitrary input size, and of both real and complex data."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 toolchainopts = {'pic': True}
 
 source_urls = [homepage]
diff --git a/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb b/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb
similarity index 95%
rename from Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb
rename to Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb
index 73c7f6deef16c3ed19d20d0cd40e6d0eb393685f..5f008c4373e47f0bc983412189066fbe347f6910 100644
--- a/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb
+++ b/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb
@@ -7,9 +7,10 @@ homepage = 'https://gitlab.mpi-magdeburg.mpg.de/software/flexiblas-release'
 description = """FlexiBLAS is a wrapper library that enables the exchange of the BLAS and LAPACK implementation
 used by a program without recompiling or relinking it."""
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 local_extra_flags = "-fstack-protector-strong -fstack-clash-protection"
-toolchainopts = {'pic': True, 'extra_cflags': local_extra_flags, 'extra_fflags': local_extra_flags}
+toolchainopts = {'pic': True, 'extra_cflags': local_extra_flags,
+                 'extra_fflags': local_extra_flags}
 
 builddependencies = [
     ('CMake', '3.23.1'),
diff --git a/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb b/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb
similarity index 95%
rename from Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb
rename to Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb
index 72e27286e561fb237c0e45f7823ed480329b4199..e071d6825e86cc41c4040785a3b8c29ec03f371f 100644
--- a/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb
+++ b/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb
@@ -4,7 +4,7 @@ version = '0.3.20'
 homepage = 'http://www.openblas.net/'
 description = "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."
 
-toolchain = {'name': 'GCC', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
 source_urls = [
     # order matters, trying to download the large.tgz/timing.tgz LAPACK tarballs from GitHub causes trouble