diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCCcore-8.3.0.eb b/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCC-8.3.0.eb
similarity index 89%
rename from easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCCcore-8.3.0.eb
rename to easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCC-8.3.0.eb
index 958cb48c8f3..2bc8a66cbbf 100644
--- a/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCCcore-8.3.0.eb
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCC-8.3.0.eb
@@ -10,12 +10,10 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
  graphics processing units (GPUs) that they produce. CUDA gives developers access
  to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
 
-toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
+toolchain = {'name': 'GCC', 'version': '8.3.0'}
 
 source_urls = ['https://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/']
 sources = ['%(namelower)s_%(version)s_418.87.00_linux.run']
 checksums = ['e7c22dc21278eb1b82f34a60ad7640b41ad3943d929bebda3008b72536855d31']
 
-builddependencies = [('binutils', '2.32')]
-
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb b/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb
index 1450156df3a..f4bafc1a8d8 100644
--- a/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb
+++ b/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb
@@ -19,7 +19,7 @@ local_comp_mpi_tc = ('gompic', version)
 # gompic toolchain because of toolchain preperation functions.
 dependencies = [
     ('GCC', local_gccver),  # part of gompic
-    ('CUDA', '10.1.243', '', ('GCCcore', local_gccver)),  # part of gompic
+    ('CUDA', '10.1.243', '', ('GCC', local_gccver)),  # part of gompic
     ('OpenMPI', '3.1.4', '', ('gcccuda', version)),  # part of gompic
     ('OpenBLAS', '0.3.7', '', ('GCC', local_gccver)),
     ('FFTW', '3.3.8', '', local_comp_mpi_tc),
diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb b/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb
index 72c68a37ffd..296f03f1ee8 100644
--- a/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb
+++ b/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb
@@ -13,7 +13,7 @@ local_gcc_version = '8.3.0'
 # compiler toolchain dependencies
 dependencies = [
     ('GCC', local_gcc_version),
-    ('CUDA', '10.1.243', '', ('GCCcore', local_gcc_version)),
+    ('CUDA', '10.1.243', '', ('GCC', local_gcc_version)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompic/gompic-2019b.eb b/easybuild/easyconfigs/g/gompic/gompic-2019b.eb
index fdc5506b5c9..ff5385f63a3 100644
--- a/easybuild/easyconfigs/g/gompic/gompic-2019b.eb
+++ b/easybuild/easyconfigs/g/gompic/gompic-2019b.eb
@@ -14,7 +14,7 @@ local_gccver = '8.3.0'
 # compiler toolchain dependencies
 dependencies = [
     ('GCC', local_gccver),  # part of gcccuda
-    ('CUDA', '10.1.243', '', ('GCCcore', local_gccver)),  # part of gcccuda
+    ('CUDA', '10.1.243', '', ('GCC', local_gccver)),  # part of gcccuda
     ('OpenMPI', '3.1.4', '', ('gcccuda', version)),
 ]