diff --git a/docs/amg4psblas_1.2-guide.pdf b/docs/amg4psblas_1.2-guide.pdf
index d4618a40..93d45fc7 100644
Binary files a/docs/amg4psblas_1.2-guide.pdf and b/docs/amg4psblas_1.2-guide.pdf differ
diff --git a/docs/html/userhtmlse4.html b/docs/html/userhtmlse4.html
index d149d1ab..286b0483 100644
--- a/docs/html/userhtmlse4.html
+++ b/docs/html/userhtmlse4.html
@@ -355,12 +355,12 @@ class="content">Preconditioner types, corresponding strings and default choices.
 class="cmr-12">Note that the module </span><code class="lstinline"><span style="color:#000000">amg_prec_mod</span></code><span 
 class="cmr-12">, containing the definition of the preconditioner</span>
 <span 
-class="cmr-12">data type and the interfaces to the routines of AMG4PSBLAS, must be used</span>
+class="cmr-12">data type and the interfaces to the routines of AMG4PSBLAS, must be used in any</span>
 <span 
-class="cmr-12">in any program calling such routines. The modules </span><code class="lstinline"><span style="color:#000000">psb_base_mod</span></code><span 
-class="cmr-12">, for the</span>
+class="cmr-12">program calling such routines. The modules </span><code class="lstinline"><span style="color:#000000">psb_base_mod</span></code><span 
+class="cmr-12">, for the sparse</span>
 <span 
-class="cmr-12">sparse matrix and communication descriptor data types, and </span><code class="lstinline"><span style="color:#000000">psb_krylov_mod</span></code><span 
+class="cmr-12">matrix and communication descriptor data types, and </span><code class="lstinline"><span style="color:#000000">psb_linsolve_mod</span></code><span 
 class="cmr-12">,</span>
 <span 
 class="cmr-12">for interfacing with the Krylov solvers, must be also used (see Section</span><span 
@@ -414,7 +414,7 @@ class="cmr-12">with the CG solver provided by PSBLAS (the matrix of the system t
 class="cmr-12">solved is assumed to be positive definite). As previously observed, the modules</span>
 <code class="lstinline"><span style="color:#000000">psb_base_mod</span></code><span 
 class="cmr-12">, </span><code class="lstinline"><span style="color:#000000">amg_prec_mod</span></code> <span 
-class="cmr-12">and </span><code class="lstinline"><span style="color:#000000">psb_krylov_mod</span></code> <span 
+class="cmr-12">and </span><code class="lstinline"><span style="color:#000000">psb_linsolve_mod</span></code> <span 
 class="cmr-12">must be used by the example</span>
 <span 
 class="cmr-12">program.</span>
@@ -485,7 +485,7 @@ class="cmr-12">.</span>
 <div class="minipage"><pre class="verbatim" id="verbatim-7">
 &#x00A0;&#x00A0;use&#x00A0;psb_base_mod
 &#x00A0;&#x00A0;use&#x00A0;amg_prec_mod
-&#x00A0;&#x00A0;use&#x00A0;psb_krylov_mod
+&#x00A0;&#x00A0;use&#x00A0;psb_linsolve_mod
 ...&#x00A0;...
 !
 !&#x00A0;sparse&#x00A0;matrix
@@ -763,7 +763,7 @@ class="cmr-12">variables:</span>
 program&#x00A0;amg_dexample_gpu
 &#x00A0;&#x00A0;use&#x00A0;psb_base_mod
 &#x00A0;&#x00A0;use&#x00A0;amg_prec_mod
-&#x00A0;&#x00A0;use&#x00A0;psb_krylov_mod
+&#x00A0;&#x00A0;use&#x00A0;psb_linsolve_mod
 &#x00A0;&#x00A0;use&#x00A0;psb_util_mod
 &#x00A0;&#x00A0;use&#x00A0;psb_gpu_mod
 &#x00A0;&#x00A0;use&#x00A0;data_input
diff --git a/docs/src/gettingstarted.tex b/docs/src/gettingstarted.tex
index d3cd09ab..4e1678a2 100644
--- a/docs/src/gettingstarted.tex
+++ b/docs/src/gettingstarted.tex
@@ -99,7 +99,7 @@ Note that the module \fortinline|amg_prec_mod|, containing the definition of the
 preconditioner data type and the interfaces to the routines of AMG4PSBLAS,
 must be used in any program calling such routines.
 The modules \fortinline|psb_base_mod|, for the sparse matrix and communication descriptor
-data types, and \fortinline|psb_krylov_mod|, for interfacing with the
+data types, and \fortinline|psb_linsolve_mod|, for interfacing with the
 Krylov solvers, must be also used (see Section~\ref{sec:examples}). \\
 
 \textbf{Remark 1.} Coarsest-level solvers based on the LU factorization,
@@ -120,7 +120,7 @@ by simply specifying \fortinline|'ML'| as the second argument of \fortinline|P%i
 (a call to \fortinline|P%set| is not needed) and is applied with the CG
 solver provided by PSBLAS (the matrix of the system to be solved is
 assumed to be positive definite). As previously observed, the modules
-\fortinline|psb_base_mod|, \fortinline|amg_prec_mod| and \fortinline|psb_krylov_mod|
+\fortinline|psb_base_mod|, \fortinline|amg_prec_mod| and \fortinline|psb_linsolve_mod|
 must be used by the example program.
 
 The part of the code dealing with reading and assembling  the sparse
@@ -148,7 +148,7 @@ the corresponding codes are available in \verb|samples/simple/file|\-\verb|read|
 \begin{minted}[breaklines=true,bgcolor=bg,fontsize=\small]{fortran}
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
 ... ...
 !
 ! sparse matrix
@@ -203,7 +203,7 @@ stop
 \begin{verbatim}
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
 ... ...
 !
 ! sparse matrix
@@ -436,7 +436,7 @@ declare some auxiliary variables:
 program amg_dexample_gpu
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use psb_gpu_mod
   use data_input
@@ -456,7 +456,7 @@ program amg_dexample_gpu
 program amg_dexample_gpu
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use psb_gpu_mod
   use data_input
diff --git a/samples/advanced/pdegen/runs/amg_pde3d.inp b/samples/advanced/pdegen/runs/amg_pde3d.inp
index 68d4fba5..44929bb2 100644
--- a/samples/advanced/pdegen/runs/amg_pde3d.inp
+++ b/samples/advanced/pdegen/runs/amg_pde3d.inp
@@ -58,8 +58,8 @@ VCYCLE                      ! Type of multilevel CYCLE: VCYCLE WCYCLE KCYCLE MUL
 -3                          ! Max Number of levels in a multilevel preconditioner; if <0, lib default
 -3                          ! Target coarse matrix size per process; if <0, lib default
 SMOOTHED                    ! Type of aggregation: SMOOTHED UNSMOOTHED
-COUPLED                     ! Parallel aggregation: DEC, SYMDEC, COUPLED
-MATCHBOXP                   ! aggregation measure SOC1, MATCHBOXP
+DEC    !COUPLED                     ! Parallel aggregation: DEC, SYMDEC, COUPLED
+SOC1   !MATCHBOXP                   ! aggregation measure SOC1, MATCHBOXP
 8                           ! Requested size of the aggregates for MATCHBOXP
 NATURAL                     ! Ordering of aggregation NATURAL DEGREE
 -1.5                        ! Coarsening ratio, if < 0 use library default