diff --git a/Custom_Toolchains/npsmpic.py b/Custom_Toolchains/npsmpic.py
index 33ee2bb06a5c7f081d5500ae6bec860414271477..bb0315b6c2b6b002b80886b419ed5e461b94f2c8 100644
--- a/Custom_Toolchains/npsmpic.py
+++ b/Custom_Toolchains/npsmpic.py
@@ -29,13 +29,15 @@ EasyBuild support for npsmpi compiler toolchain (includes NVHPC and ParaStationM
 @author: Damian Alvarez (Forschungszentrum Juelich)
 """
 
-from easybuild.toolchains.nvhpc import NvhpcToolchain
+from easybuild.toolchains.nvhpc import NVHPCToolchain
 # We pull in MPI and CUDA at once so this maps nicely to HMNS
 from easybuild.toolchains.mpi.psmpi import Psmpi
 from easybuild.toolchains.compiler.cuda import Cuda
 
 # Order matters!
-class Npsmpic(NvhpcToolchain, Cuda, Psmpi):
+
+
+class Npsmpic(NVHPCToolchain, Cuda, Psmpi):
     """Compiler toolchain with NVHPC and ParaStationMPI, with CUDA as dependency."""
     NAME = 'npsmpic'
-    SUBTOOLCHAIN = NvhpcToolchain.NAME
+    SUBTOOLCHAIN = NVHPCToolchain.NAME
diff --git a/Custom_Toolchains/nvompic.py b/Custom_Toolchains/nvompic.py
index b0a0e54a02fb833d33317810e1d83aa663b41fa3..c080deb838ea86e6e0bc568cc83d037618945ca7 100644
--- a/Custom_Toolchains/nvompic.py
+++ b/Custom_Toolchains/nvompic.py
@@ -30,7 +30,7 @@ EasyBuild support for nvompic compiler toolchain (includes NVHPC and OpenMPI, an
 @author: Sebastian Achilles (Forschungszentrum Juelich)
 """
 
-from easybuild.toolchains.nvhpc import NvhpcToolchain
+from easybuild.toolchains.nvhpc import NVHPCToolchain
 # We pull in MPI and CUDA at once so this maps nicely to HMNS
 from easybuild.toolchains.mpi.openmpi import OpenMPI
 from easybuild.toolchains.compiler.cuda import Cuda
@@ -38,7 +38,7 @@ from easybuild.toolchains.compiler.cuda import Cuda
 # Order matters!
 
 
-class NVompic(NvhpcToolchain, Cuda, OpenMPI):
+class NVompic(NVHPCToolchain, Cuda, OpenMPI):
     """Compiler toolchain with NVHPC and OpenMPI, with CUDA as dependency."""
     NAME = 'nvompic'
-    SUBTOOLCHAIN = NvhpcToolchain.NAME
+    SUBTOOLCHAIN = NVHPCToolchain.NAME