diff --git a/Custom_Hooks/eb_hooks.py b/Custom_Hooks/eb_hooks.py
index 20973f47595bcce36da6db1c45dd8541e34a493f..a2cad0853b87f37a20a38fc2697489f840f9f104 100644
--- a/Custom_Hooks/eb_hooks.py
+++ b/Custom_Hooks/eb_hooks.py
@@ -433,7 +433,7 @@ def inject_ucx_tweaks(ec):
 -- Unfortunately we can't do better (like preserving the UCX transport for CUDA, since the loaded
 -- UCX-settings module is lost during the reload
 if mode()=="load" then
-    if isloaded("mpi-settings/CUDA") then
+    if isloaded("MPI-settings/CUDA") then
         try_load("UCX-settings/RC-CUDA")
     else
         try_load("UCX-settings")
@@ -456,12 +456,12 @@ def inject_mpi_tweaks(ec):
     if ec.name == 'impi':
         ec['set_mpi_wrappers_all'] = 'True'
         ec.log.info("[parse hook] Injecting set_mpi_wrappers_all = True ")
-    # MPIs are a family (in the Lmod sense) and require to load mpi-settings
+    # MPIs are a family (in the Lmod sense) and require to load MPI-settings
     if ec.name in SUPPORTED_MPIS and install_path().lower().startswith('/p/software'):
         key = "modluafooter"
         value = '''
-if not ( isloaded("mpi-settings") ) then
-    load("mpi-settings")
+if not ( isloaded("MPI-settings") ) then
+    load("MPI-settings")
 end
 family("mpi")
         '''
@@ -471,7 +471,7 @@ family("mpi")
         else:
             ec[key] = value
         ec.log.info(
-            "[parse hook] Injecting Lmod mpi family and mpi-settings loading")
+            "[parse hook] Injecting Lmod mpi family and MPI-settings loading")
 
     return ec
 
diff --git a/Custom_MNS/flexible_custom_hierarchical_mns.py b/Custom_MNS/flexible_custom_hierarchical_mns.py
index bc0abe4627e038d41008bef0bace44fda799ef84..5129c2856e0d4e8ac923bfc60004e7d333f5abb4 100644
--- a/Custom_MNS/flexible_custom_hierarchical_mns.py
+++ b/Custom_MNS/flexible_custom_hierarchical_mns.py
@@ -78,7 +78,7 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
         elif name == 'impi':
             modname_regex = re.compile('^%s/\S+$' % re.escape('IntelMPI'))
         elif name in ['-'.join([x, 'settings']) for x in mpi_with_settings]:
-            modname_regex = re.compile('^%s/\S+$' % re.escape('mpi-settings'))
+            modname_regex = re.compile('^%s/\S+$' % re.escape('MPI-settings'))
         elif name == 'LWP-settings':
             # Match almost anything, since the name depends actually on the version, to avoid load conflicts
             modname_regex = re.compile('^LWP-\S+/enable$')
@@ -204,11 +204,11 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
         """
         Determine short module name, i.e. the name under which modules will be exposed to users.
         Examples: GCC/4.8.3, OpenMPI/1.6.5, OpenBLAS/0.2.9, HPL/2.1, Python/2.7.5
-                  mpi-settings/plain, etc
+                  MPI-settings/plain, etc
         """
         stripped_name = re.sub('-settings$', '', ec['name'])
         if stripped_name in mpi_with_settings and '-settings' in ec['name']:
-            return os.path.join('mpi-settings', ec['versionsuffix'])
+            return os.path.join('MPI-settings', ec['versionsuffix'])
         elif stripped_name.startswith('LWP') and '-settings' in ec['name']:
             return os.path.join(ec['version'], 'enable')
         else: