diff --git a/docs.it4i/anselm/software/ansys/ansys.md b/docs.it4i/anselm/software/ansys/ansys.md
index 0e4634e5f46bd27afac35f1724b987639a0cf3e8..24b8b1c09721168d11a214f00a2ee50a109e6c20 100644
--- a/docs.it4i/anselm/software/ansys/ansys.md
+++ b/docs.it4i/anselm/software/ansys/ansys.md
@@ -7,7 +7,7 @@ Anselm provides commercial as well as academic variants. Academic variants are d
 To load the latest version of any ANSYS product (Mechanical, Fluent, CFX, MAPDL,...) load the module:
 
 ```console
-$ module load ansys
+$ ml ansys
 ```
 
 ANSYS supports interactive regime, but due to assumed solution of extremely difficult tasks it is not recommended.
diff --git a/docs.it4i/anselm/software/debuggers/allinea-ddt.md b/docs.it4i/anselm/software/debuggers/allinea-ddt.md
index e1fc0ddc508299aee11fc6796a8dd16dceb1bbd2..f85848417002cc5c9f15d54ea437410ca4585f11 100644
--- a/docs.it4i/anselm/software/debuggers/allinea-ddt.md
+++ b/docs.it4i/anselm/software/debuggers/allinea-ddt.md
@@ -25,14 +25,14 @@ In case of debugging on accelerators:
 Load all necessary modules to compile the code. For example:
 
 ```console
-$ module load intel
-$ module load impi   ... or ... module load openmpi/X.X.X-icc
+$ ml intel
+$ ml impi   ... or ... module load openmpi/X.X.X-icc
 ```
 
 Load the Allinea DDT module:
 
 ```console
-$ module load Forge
+$ ml Forge
 ```
 
 Compile the code:
diff --git a/docs.it4i/anselm/software/debuggers/allinea-performance-reports.md b/docs.it4i/anselm/software/debuggers/allinea-performance-reports.md
index e263bb3b07e0bdd1ab406e4cce0277285432667a..a5399a61e7ae133d4c037391a1123b0170a132ec 100644
--- a/docs.it4i/anselm/software/debuggers/allinea-performance-reports.md
+++ b/docs.it4i/anselm/software/debuggers/allinea-performance-reports.md
@@ -13,7 +13,7 @@ Our license is limited to 64 MPI processes.
 Allinea Performance Reports version 6.0 is available
 
 ```console
-$ module load PerformanceReports/6.0
+$ ml PerformanceReports/6.0
 ```
 
 The module sets up environment variables, required for using the Allinea Performance Reports. This particular command loads the default module, which is performance reports version 4.2.
@@ -46,7 +46,7 @@ $ qsub -q qexp -l select=2:ncpus=16:mpiprocs=16:ompthreads=1 -I
 Then we load the modules and run the program the usual way:
 
 ```console
-$ module load intel impi allinea-perf-report/4.2
+$ ml intel impi allinea-perf-report/4.2
 $ mpirun ./mympiprog.x
 ```
 
diff --git a/docs.it4i/anselm/software/debuggers/debuggers.md b/docs.it4i/anselm/software/debuggers/debuggers.md
index 31fbd53700537572ec28e0572fc207655f823aec..3d38fd6a59565a1814df261d6cc2383f9bef7c59 100644
--- a/docs.it4i/anselm/software/debuggers/debuggers.md
+++ b/docs.it4i/anselm/software/debuggers/debuggers.md
@@ -9,7 +9,7 @@ We provide state of the art programms and tools to develop, profile and debug HP
 The intel debugger version 13.0 is available, via module intel. The debugger works for applications compiled with C and C++ compiler and the ifort fortran 77/90/95 compiler. The debugger provides java GUI environment. Use X display for running the GUI.
 
 ```console
-$ module load intel
+$ ml intel
 $ idb
 ```
 
@@ -20,7 +20,7 @@ Read more at the [Intel Debugger](intel-suite/intel-debugger/) page.
 Allinea DDT, is a commercial debugger primarily for debugging parallel MPI or OpenMP programs. It also has a support for GPU (CUDA) and Intel Xeon Phi accelerators. DDT provides all the standard debugging features (stack trace, breakpoints, watches, view variables, threads etc.) for every thread running as part of your program, or for every process even if these processes are distributed across a cluster using an MPI implementation.
 
 ```console
-$ module load Forge
+$ ml Forge
 $ forge
 ```
 
@@ -31,7 +31,7 @@ Read more at the [Allinea DDT](debuggers/allinea-ddt/) page.
 Allinea Performance Reports characterize the performance of HPC application runs. After executing your application through the tool, a synthetic HTML report is generated automatically, containing information about several metrics along with clear behavior statements and hints to help you improve the efficiency of your runs. Our license is limited to 64 MPI processes.
 
 ```console
-$ module load PerformanceReports/6.0
+$ ml PerformanceReports/6.0
 $ perf-report mpirun -n 64 ./my_application argument01 argument02
 ```
 
@@ -42,7 +42,7 @@ Read more at the [Allinea Performance Reports](debuggers/allinea-performance-rep
 TotalView is a source- and machine-level debugger for multi-process, multi-threaded programs. Its wide range of tools provides ways to analyze, organize, and test programs, making it easy to isolate and identify problems in individual threads and processes in programs of great complexity.
 
 ```console
-$ module load totalview
+$ ml totalview
 $ totalview
 ```
 
@@ -53,7 +53,7 @@ Read more at the [Totalview](debuggers/total-view/) page.
 Vampir is a GUI trace analyzer for traces in OTF format.
 
 ```console
-$ module load Vampir/8.5.0
+$ ml Vampir/8.5.0
 $ vampir
 ```
 
diff --git a/docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md b/docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md
index 16b4502135dad987cade356d65753475684aa5c2..b46b472b68577a3f0764199439de310a967a4bde 100644
--- a/docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md
+++ b/docs.it4i/anselm/software/debuggers/intel-performance-counter-monitor.md
@@ -9,7 +9,7 @@ Intel PCM (Performance Counter Monitor) is a tool to monitor performance hardwar
 Currently installed version 2.6. To load the [module](../../environment-and-modules/), issue:
 
 ```console
-$ module load intelpcm
+$ ml intelpcm
 ```
 
 ## Command Line Tools
diff --git a/docs.it4i/anselm/software/debuggers/papi.md b/docs.it4i/anselm/software/debuggers/papi.md
index e4a4bae93cbcda8250d12c21b13cb68b90ba3a4f..d03dd8354769895e3b7f8454f5a0dd613a626bc3 100644
--- a/docs.it4i/anselm/software/debuggers/papi.md
+++ b/docs.it4i/anselm/software/debuggers/papi.md
@@ -13,7 +13,7 @@ PAPI can be used with parallel as well as serial programs.
 To use PAPI, load [module](../../environment-and-modules/) papi:
 
 ```console
-$ module load papi
+$ ml papi
 ```
 
 This will load the default version. Execute module avail papi for a list of installed versions.
@@ -196,13 +196,13 @@ $ ./matrix
 To use PAPI in [Intel Xeon Phi](../intel-xeon-phi/) native applications, you need to load module with " -mic" suffix, for example " papi/5.3.2-mic" :
 
 ```console
-$ module load papi/5.3.2-mic
+$ ml papi/5.3.2-mic
 ```
 
 Then, compile your application in the following way:
 
 ```console
-$ module load intel
+$ ml intel
 $ icc -mmic -Wl,-rpath,/apps/intel/composer_xe_2013.5.192/compiler/lib/mic matrix-mic.c -o matrix-mic -lpapi -lpfm
 ```
 
@@ -226,7 +226,7 @@ $ /apps/tools/papi/5.4.0-mic/bin/papi_native_avail
 To use PAPI in offload mode, you need to provide both host and MIC versions of PAPI:
 
 ```console
-$ module load papi/5.4.0
+$ ml papi/5.4.0
 $ icc matrix-offload.c -o matrix-offload -offload-option,mic,compiler,"-L$PAPI_HOME-mic/lib -lpapi" -lpapi
 ```
 
diff --git a/docs.it4i/anselm/software/debuggers/vampir.md b/docs.it4i/anselm/software/debuggers/vampir.md
index d9d44d8478fce5bd004eb141abf8f6b922e1bf96..1dfa23e7b8eed6c9deaf04439df6b01ed6358480 100644
--- a/docs.it4i/anselm/software/debuggers/vampir.md
+++ b/docs.it4i/anselm/software/debuggers/vampir.md
@@ -9,7 +9,7 @@ Vampir is a commercial trace analysis and visualization tool. It can work with t
 Version 8.5.0 is currently installed as module Vampir/8.5.0 :
 
 ```console
-$ module load Vampir/8.5.0
+$ ml Vampir/8.5.0
 $ vampir &
 ```
 
diff --git a/docs.it4i/anselm/software/intel-suite/intel-mkl.md b/docs.it4i/anselm/software/intel-suite/intel-mkl.md
index e09b8d2f3c295849e52f2f49aea03aaf40d73d04..d77d4d77037a4fa9a99b83196a6da7c2ad256809 100644
--- a/docs.it4i/anselm/software/intel-suite/intel-mkl.md
+++ b/docs.it4i/anselm/software/intel-suite/intel-mkl.md
@@ -96,8 +96,8 @@ In this example, we compile and link the cblas_dgemm example, using LP64 interfa
 ### Example: MKL and GNU Compiler
 
 ```console
-$ module load gcc
-$ module load imkl
+$ ml gcc
+$ ml imkl
 $ cp -a $MKL_EXAMPLES/cblas /tmp/
 $ cd /tmp/cblas
 $ gcc -w source/cblas_dgemmx.c source/common_func.c -o cblas_dgemmx.x -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lm
diff --git a/docs.it4i/anselm/software/numerical-languages/matlab_1314.md b/docs.it4i/anselm/software/numerical-languages/matlab_1314.md
index 69f54eb3b1d594d0b5970f9627700f2a3d2a7733..1b72f5b4cf41c308a7a6ec9c11718fca927813fb 100644
--- a/docs.it4i/anselm/software/numerical-languages/matlab_1314.md
+++ b/docs.it4i/anselm/software/numerical-languages/matlab_1314.md
@@ -90,8 +90,8 @@ The second part of the command shows how to request all necessary licenses. In t
 Once the access to compute nodes is granted by PBS, user can load following modules and start Matlab:
 
 ```console
-    cn79$ module load matlab/R2013a-EDU
-    cn79$ module load impi/4.1.1.036
+    cn79$ ml matlab/R2013a-EDU
+    cn79$ ml impi/4.1.1.036
     cn79$ matlab &
 ```
 
diff --git a/docs.it4i/salomon/software/comsol/comsol-multiphysics.md b/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
index 7279793d99d0c8fc9d32711f076f6e3da0fde331..431294469311b408c9e023c17347cae239037622 100644
--- a/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
+++ b/docs.it4i/salomon/software/comsol/comsol-multiphysics.md
@@ -37,7 +37,7 @@ If user needs to prepare COMSOL jobs in the interactive mode it is recommend to
 ```console
 $ xhost +
 $ qsub -I -X -A PROJECT_ID -q qprod -l select=1:ppn=24
-$ module load COMSOL
+$ ml COMSOL
 $ comsol
 ```
 
@@ -79,8 +79,8 @@ LiveLink for MATLAB is available in both **EDU** and **COM** **variant** of the
 ```console
 $ xhost +
 $ qsub -I -X -A PROJECT_ID -q qexp -l select=1:ppn=24
-$ module load MATLAB
-$ module load COMSOL
+$ ml MATLAB
+$ ml COMSOL
 $ comsol server MATLAB
 ```
 
diff --git a/docs.it4i/salomon/software/debuggers/Introduction.md b/docs.it4i/salomon/software/debuggers/Introduction.md
index de8c00c66c96b98980ac789d7bf395fbd5eb1c99..4ce2fc77b013659f5b128408e4ec5f0e78c9c686 100644
--- a/docs.it4i/salomon/software/debuggers/Introduction.md
+++ b/docs.it4i/salomon/software/debuggers/Introduction.md
@@ -33,7 +33,7 @@ Read more at the [Allinea DDT](allinea-ddt/) page.
 Allinea Performance Reports characterize the performance of HPC application runs. After executing your application through the tool, a synthetic HTML report is generated automatically, containing information about several metrics along with clear behavior statements and hints to help you improve the efficiency of your runs. Our license is limited to 64 MPI processes.
 
 ```console
-$ module load PerformanceReports/6.0
+$ ml PerformanceReports/6.0
 $ perf-report mpirun -n 64 ./my_application argument01 argument02
 ```
 
@@ -55,7 +55,7 @@ Read more at the [Totalview](total-view/) page.
 Vampir is a GUI trace analyzer for traces in OTF format.
 
 ```console
-    $ module load Vampir/8.5.0
+    $ ml Vampir/8.5.0
     $ vampir
 ```
 
diff --git a/docs.it4i/salomon/software/debuggers/allinea-ddt.md b/docs.it4i/salomon/software/debuggers/allinea-ddt.md
index b73d21a8a33378eff3ff4236efbc42fde0b94245..6e1f046f10fd2d521343a995cb59580440080a73 100644
--- a/docs.it4i/salomon/software/debuggers/allinea-ddt.md
+++ b/docs.it4i/salomon/software/debuggers/allinea-ddt.md
@@ -32,7 +32,7 @@ $ ml impi **or** ml OpenMPI/X.X.X-icc
 Load the Allinea DDT module:
 
 ```console
-$ module load Forge
+$ ml Forge
 ```
 
 Compile the code:
diff --git a/docs.it4i/salomon/software/debuggers/allinea-performance-reports.md b/docs.it4i/salomon/software/debuggers/allinea-performance-reports.md
index 2fcaee9f6ca8674f11ff92cbcf59364a074648f1..ead91a093c83ba9503f2be7ba702e698d7bca0df 100644
--- a/docs.it4i/salomon/software/debuggers/allinea-performance-reports.md
+++ b/docs.it4i/salomon/software/debuggers/allinea-performance-reports.md
@@ -13,7 +13,7 @@ Our license is limited to 64 MPI processes.
 Allinea Performance Reports version 6.0 is available
 
 ```console
-$ module load PerformanceReports/6.0
+$ ml PerformanceReports/6.0
 ```
 
 The module sets up environment variables, required for using the Allinea Performance Reports.
diff --git a/docs.it4i/salomon/software/intel-suite/intel-mkl.md b/docs.it4i/salomon/software/intel-suite/intel-mkl.md
index 13bae44b6d1aa16d39cb8207da60c04fbe287420..6b54e0890202f817dd42c04eabf886489bd695d0 100644
--- a/docs.it4i/salomon/software/intel-suite/intel-mkl.md
+++ b/docs.it4i/salomon/software/intel-suite/intel-mkl.md
@@ -18,7 +18,7 @@ For details see the [Intel MKL Reference Manual](http://software.intel.com/sites
 Intel MKL version 11.2.3.187 is available on the cluster
 
 ```console
-$ module load imkl
+$ ml imkl
 ```
 
 The module sets up environment variables, required for linking and running mkl enabled applications. The most important variables are the $MKLROOT, $CPATH, $LD_LIBRARY_PATH and $MKL_EXAMPLES
@@ -64,8 +64,8 @@ Number of examples, demonstrating use of the Intel MKL library and its linking i
 ### Working With Examples
 
 ```console
-$ module load intel
-$ module load imkl
+$ ml intel
+$ ml imkl
 $ cp -a $MKL_EXAMPLES/cblas /tmp/
 $ cd /tmp/cblas
 $ make sointel64 function=cblas_dgemm
@@ -76,8 +76,8 @@ In this example, we compile, link and run the cblas_dgemm example, demonstrating
 ### Example: MKL and Intel Compiler
 
 ```console
-$ module load intel
-$ module load imkl
+$ ml intel
+$ ml imkl
 $ cp -a $MKL_EXAMPLES/cblas /tmp/
 $ cd /tmp/cblas
 $
@@ -96,8 +96,8 @@ In this example, we compile and link the cblas_dgemm example, using LP64 interfa
 ### Example: Intel MKL and GNU Compiler
 
 ```console
-$ module load GCC
-$ module load imkl
+$ ml GCC
+$ ml imkl
 $ cp -a $MKL_EXAMPLES/cblas /tmp/
 $ cd /tmp/cblas
 $ gcc -w source/cblas_dgemmx.c source/common_func.c -o cblas_dgemmx.x -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lgomp -lm
diff --git a/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md b/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
index ab8194b5aaab951ade7374f9e8d4862ce14ff3b9..9cae361ca43dccb382bd5b09f5c5a9d270e0414c 100644
--- a/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
+++ b/docs.it4i/salomon/software/intel-suite/intel-trace-analyzer-and-collector.md
@@ -24,7 +24,7 @@ The trace will be saved in file myapp.stf in the current directory.
 To view and analyze the trace, open ITAC GUI in a [graphical environment](../../../general/accessing-the-clusters/graphical-user-interface/x-window-system/):
 
 ```console
-$ module load itac/9.1.2.024
+$ ml itac/9.1.2.024
 $ traceanalyzer
 ```
 
diff --git a/docs.it4i/salomon/software/mpi/mpi.md b/docs.it4i/salomon/software/mpi/mpi.md
index 902fc4f7acfefd725006534a474d3b745ecddd48..99f8745aca779ad71a3ab5322499aa9e8bc9fd25 100644
--- a/docs.it4i/salomon/software/mpi/mpi.md
+++ b/docs.it4i/salomon/software/mpi/mpi.md
@@ -44,7 +44,7 @@ In this example, we activate the latest OpenMPI with latest GNU compilers (OpenM
 To use OpenMPI with the intel compiler suite, use
 
 ```console
-$ module load iompi/2015.03
+$ ml iompi/2015.03
 ```
 
 In this example, the openmpi 1.8.6 using intel compilers is activated. It's used "iompi" toolchain.
diff --git a/docs.it4i/salomon/software/numerical-languages/introduction.md b/docs.it4i/salomon/software/numerical-languages/introduction.md
index 6f140ef9d0a1a33f0656a69af2c03e729b77c178..13ba67071a136612568b6772104f0c8c5430ba40 100644
--- a/docs.it4i/salomon/software/numerical-languages/introduction.md
+++ b/docs.it4i/salomon/software/numerical-languages/introduction.md
@@ -11,7 +11,7 @@ This section contains a collection of high-level interpreted languages, primaril
 MATLAB®^ is a high-level language and interactive environment for numerical computation, visualization, and programming.
 
 ```console
-$ module load MATLAB
+$ ml MATLAB
 $ matlab
 ```
 
@@ -22,7 +22,7 @@ Read more at the [Matlab page](matlab/).
 GNU Octave is a high-level interpreted language, primarily intended for numerical computations. The Octave language is quite similar to Matlab so that most programs are easily portable.
 
 ```console
-$ module load Octave
+$ ml Octave
 $ octave
 ```
 
@@ -33,7 +33,7 @@ Read more at the [Octave page](octave/).
 The R is an interpreted language and environment for statistical computing and graphics.
 
 ```console
-$ module load R
+$ ml R
 $ R
 ```
 
diff --git a/docs.it4i/salomon/software/numerical-languages/matlab.md b/docs.it4i/salomon/software/numerical-languages/matlab.md
index 31602bf0f5359ffc35365dcbdb867000c274b332..e08bf9099ee9d5175a8579afe2fc9d6d32b1aa8f 100644
--- a/docs.it4i/salomon/software/numerical-languages/matlab.md
+++ b/docs.it4i/salomon/software/numerical-languages/matlab.md
@@ -10,7 +10,7 @@ Matlab is available in versions R2015a and R2015b. There are always two variants
 To load the latest version of Matlab load the module
 
 ```console
-$ module load MATLAB
+$ ml MATLAB
 ```
 
 By default the EDU variant is marked as default. If you need other version or variant, load the particular version. To obtain the list of available versions use
@@ -79,7 +79,7 @@ The second part of the command shows how to request all necessary licenses. In t
 Once the access to compute nodes is granted by PBS, user can load following modules and start Matlab:
 
 ```console
-    r1i0n17$ module load MATLAB/2015a-EDU
+    r1i0n17$ ml MATLAB/2015a-EDU
     r1i0n17$ matlab &
 ```
 
diff --git a/docs.it4i/salomon/software/numerical-languages/r.md b/docs.it4i/salomon/software/numerical-languages/r.md
index 1563b4e5ae7a4feb3e4da6382b255ffb5d449080..693ef18f689d0cc39dce873ca1432baffc9ebb37 100644
--- a/docs.it4i/salomon/software/numerical-languages/r.md
+++ b/docs.it4i/salomon/software/numerical-languages/r.md
@@ -34,7 +34,7 @@ The R on Anselm is linked to highly optimized MKL mathematical library. This pro
 To run R interactively, using Rstudio GUI, log in with ssh -X parameter for X11 forwarding. Run rstudio:
 
 ```console
-$ module load Rstudio
+$ ml Rstudio
 $ rstudio
 ```