diff --git a/Make_n.inc.in b/Make_n.inc.in
index 8fdc622e..d699579d 100644
--- a/Make_n.inc.in
+++ b/Make_n.inc.in
@@ -49,7 +49,7 @@ PSBLAS_INCLUDES=@PSBLAS_INCLUDES@
 PSBLAS_LIBS=@PSBLAS_LIBS@	
 PSBBASEMODNAME=psb_base_mod
 PSBPRECMODNAME=psb_prec_mod
-PSBMETHDMODNAME=psb_krylov_mod
+PSBMETHDMODNAME=psb_linsolve_mod
 PSBUTILMODNAME=psb_util_mod
 
 
diff --git a/amgprec/impl/level/amg_c_base_onelev_dump.f90 b/amgprec/impl/level/amg_c_base_onelev_dump.f90
index 14b4c9b6..60e43280 100644
--- a/amgprec/impl/level/amg_c_base_onelev_dump.f90
+++ b/amgprec/impl/level/amg_c_base_onelev_dump.f90
@@ -127,8 +127,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
         ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head,ivr=ivr)
+        call lv%tprol%print(fname,head=head,ivr=ivr)
       end if
     end if
   else
@@ -151,8 +150,7 @@ subroutine amg_c_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
       if (tprol_) then 
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head)
+        call lv%tprol%print(fname,head=head)
       end if
     end if
   end if
diff --git a/amgprec/impl/level/amg_d_base_onelev_dump.f90 b/amgprec/impl/level/amg_d_base_onelev_dump.f90
index c1013d41..0b3e15f6 100644
--- a/amgprec/impl/level/amg_d_base_onelev_dump.f90
+++ b/amgprec/impl/level/amg_d_base_onelev_dump.f90
@@ -127,8 +127,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
         ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head,ivr=ivr)
+        call lv%tprol%print(fname,head=head,ivr=ivr)
       end if
     end if
   else
@@ -151,8 +150,7 @@ subroutine amg_d_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
       if (tprol_) then 
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head)
+        call lv%tprol%print(fname,head=head)
       end if
     end if
   end if
diff --git a/amgprec/impl/level/amg_s_base_onelev_dump.f90 b/amgprec/impl/level/amg_s_base_onelev_dump.f90
index d30c0bf7..6fb3454e 100644
--- a/amgprec/impl/level/amg_s_base_onelev_dump.f90
+++ b/amgprec/impl/level/amg_s_base_onelev_dump.f90
@@ -127,8 +127,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
         ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head,ivr=ivr)
+        call lv%tprol%print(fname,head=head,ivr=ivr)
       end if
     end if
   else
@@ -151,8 +150,7 @@ subroutine amg_s_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
       if (tprol_) then 
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head)
+        call lv%tprol%print(fname,head=head)
       end if
     end if
   end if
diff --git a/amgprec/impl/level/amg_z_base_onelev_dump.f90 b/amgprec/impl/level/amg_z_base_onelev_dump.f90
index 5d0b8f27..49e8eb98 100644
--- a/amgprec/impl/level/amg_z_base_onelev_dump.f90
+++ b/amgprec/impl/level/amg_z_base_onelev_dump.f90
@@ -127,8 +127,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
         ivr = lv%linmap%p_desc_U%get_global_indices(owned=.false.)
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head,ivr=ivr)
+        call lv%tprol%print(fname,head=head,ivr=ivr)
       end if
     end if
   else
@@ -151,8 +150,7 @@ subroutine amg_z_base_onelev_dump(lv,level,info,prefix,head,ac,rp,&
       if (tprol_) then 
         write(fname(lname+1:),'(a,i3.3,a)')'_l',level,'_tprol.mtx'
         !
-        !  This is not implemented yet.
-        !call lv%tprol%print(fname,head=head)
+        call lv%tprol%print(fname,head=head)
       end if
     end if
   end if
diff --git a/amgprec/impl/smoother/amg_c_jac_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_c_jac_smoother_apply_vect.f90
index a4238980..6d32e2e2 100644
--- a/amgprec/impl/smoother/amg_c_jac_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_c_jac_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_c_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_c_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_c_jac_smoother, amg_protect_name => amg_c_jac_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/smoother/amg_d_jac_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_d_jac_smoother_apply_vect.f90
index cafb6c8c..b1148119 100644
--- a/amgprec/impl/smoother/amg_d_jac_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_d_jac_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_d_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_d_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_d_jac_smoother, amg_protect_name => amg_d_jac_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90
index 7cfa7c3d..6ea8444d 100644
--- a/amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_d_poly_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_d_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_d_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_d_poly_smoother, amg_protect_name => amg_d_poly_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/smoother/amg_s_jac_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_s_jac_smoother_apply_vect.f90
index fff7ac1e..1bbb390f 100644
--- a/amgprec/impl/smoother/amg_s_jac_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_s_jac_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_s_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_s_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_s_jac_smoother, amg_protect_name => amg_s_jac_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90
index b5807873..cdf93b7d 100644
--- a/amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_s_poly_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_s_poly_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_s_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_s_poly_smoother, amg_protect_name => amg_s_poly_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/smoother/amg_z_jac_smoother_apply_vect.f90 b/amgprec/impl/smoother/amg_z_jac_smoother_apply_vect.f90
index 16d2a484..03bc6095 100644
--- a/amgprec/impl/smoother/amg_z_jac_smoother_apply_vect.f90
+++ b/amgprec/impl/smoother/amg_z_jac_smoother_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_z_jac_smoother_apply_vect(alpha,sm,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_z_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_z_jac_smoother, amg_protect_name => amg_z_jac_smoother_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_c_jac_solver_apply.f90 b/amgprec/impl/solver/amg_c_jac_solver_apply.f90
index 6eec4e5e..d47a9f6b 100644
--- a/amgprec/impl/solver/amg_c_jac_solver_apply.f90
+++ b/amgprec/impl/solver/amg_c_jac_solver_apply.f90
@@ -40,7 +40,7 @@ subroutine amg_c_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_c_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_c_jac_solver_apply_vect.f90 b/amgprec/impl/solver/amg_c_jac_solver_apply_vect.f90
index 7d48442e..1fccaf63 100644
--- a/amgprec/impl/solver/amg_c_jac_solver_apply_vect.f90
+++ b/amgprec/impl/solver/amg_c_jac_solver_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_c_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_c_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_c_jac_solver, amg_protect_name => amg_c_jac_solver_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_c_krm_solver_impl.f90 b/amgprec/impl/solver/amg_c_krm_solver_impl.f90
index 3c93488f..fe3cb53a 100644
--- a/amgprec/impl/solver/amg_c_krm_solver_impl.f90
+++ b/amgprec/impl/solver/amg_c_krm_solver_impl.f90
@@ -169,7 +169,7 @@ subroutine amg_c_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
      & trans,work,wv,info,init,initu)
 
   use psb_base_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use amg_c_krm_solver, amg_protect_name => amg_c_krm_solver_apply_vect
 
   Implicit None
diff --git a/amgprec/impl/solver/amg_d_jac_solver_apply.f90 b/amgprec/impl/solver/amg_d_jac_solver_apply.f90
index 4e5b9421..9a37a162 100644
--- a/amgprec/impl/solver/amg_d_jac_solver_apply.f90
+++ b/amgprec/impl/solver/amg_d_jac_solver_apply.f90
@@ -40,7 +40,7 @@ subroutine amg_d_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_d_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_d_jac_solver_apply_vect.f90 b/amgprec/impl/solver/amg_d_jac_solver_apply_vect.f90
index bc35f7ea..ab6b943c 100644
--- a/amgprec/impl/solver/amg_d_jac_solver_apply_vect.f90
+++ b/amgprec/impl/solver/amg_d_jac_solver_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_d_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_d_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_d_jac_solver, amg_protect_name => amg_d_jac_solver_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_d_krm_solver_impl.f90 b/amgprec/impl/solver/amg_d_krm_solver_impl.f90
index dd308157..b955a8d6 100644
--- a/amgprec/impl/solver/amg_d_krm_solver_impl.f90
+++ b/amgprec/impl/solver/amg_d_krm_solver_impl.f90
@@ -169,7 +169,7 @@ subroutine amg_d_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
      & trans,work,wv,info,init,initu)
 
   use psb_base_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use amg_d_krm_solver, amg_protect_name => amg_d_krm_solver_apply_vect
 
   Implicit None
diff --git a/amgprec/impl/solver/amg_s_jac_solver_apply.f90 b/amgprec/impl/solver/amg_s_jac_solver_apply.f90
index 500391c8..217f8027 100644
--- a/amgprec/impl/solver/amg_s_jac_solver_apply.f90
+++ b/amgprec/impl/solver/amg_s_jac_solver_apply.f90
@@ -40,7 +40,7 @@ subroutine amg_s_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_s_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_s_jac_solver_apply_vect.f90 b/amgprec/impl/solver/amg_s_jac_solver_apply_vect.f90
index da84ffea..7dc5b9ad 100644
--- a/amgprec/impl/solver/amg_s_jac_solver_apply_vect.f90
+++ b/amgprec/impl/solver/amg_s_jac_solver_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_s_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_s_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_s_jac_solver, amg_protect_name => amg_s_jac_solver_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_s_krm_solver_impl.f90 b/amgprec/impl/solver/amg_s_krm_solver_impl.f90
index 1b0efd1b..b2d3d0e5 100644
--- a/amgprec/impl/solver/amg_s_krm_solver_impl.f90
+++ b/amgprec/impl/solver/amg_s_krm_solver_impl.f90
@@ -169,7 +169,7 @@ subroutine amg_s_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
      & trans,work,wv,info,init,initu)
 
   use psb_base_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use amg_s_krm_solver, amg_protect_name => amg_s_krm_solver_apply_vect
 
   Implicit None
diff --git a/amgprec/impl/solver/amg_z_jac_solver_apply.f90 b/amgprec/impl/solver/amg_z_jac_solver_apply.f90
index 12288551..f55745bb 100644
--- a/amgprec/impl/solver/amg_z_jac_solver_apply.f90
+++ b/amgprec/impl/solver/amg_z_jac_solver_apply.f90
@@ -40,7 +40,7 @@ subroutine amg_z_jac_solver_apply(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_z_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_z_jac_solver_apply_vect.f90 b/amgprec/impl/solver/amg_z_jac_solver_apply_vect.f90
index 241797e8..a97a21a0 100644
--- a/amgprec/impl/solver/amg_z_jac_solver_apply_vect.f90
+++ b/amgprec/impl/solver/amg_z_jac_solver_apply_vect.f90
@@ -40,7 +40,7 @@ subroutine amg_z_jac_solver_apply_vect(alpha,sv,x,beta,y,desc_data,trans,&
 
   use psb_base_mod
   use amg_z_diag_solver
-  use psb_base_krylov_conv_mod, only : log_conv
+  use psb_base_linsolve_conv_mod, only : log_conv
   use amg_z_jac_solver, amg_protect_name => amg_z_jac_solver_apply_vect
   implicit none
   type(psb_desc_type), intent(in)                 :: desc_data
diff --git a/amgprec/impl/solver/amg_z_krm_solver_impl.f90 b/amgprec/impl/solver/amg_z_krm_solver_impl.f90
index 33972c4b..ca5d7125 100644
--- a/amgprec/impl/solver/amg_z_krm_solver_impl.f90
+++ b/amgprec/impl/solver/amg_z_krm_solver_impl.f90
@@ -169,7 +169,7 @@ subroutine amg_z_krm_solver_apply_vect(alpha,sv,x,beta,y,desc_data,&
      & trans,work,wv,info,init,initu)
 
   use psb_base_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use amg_z_krm_solver, amg_protect_name => amg_z_krm_solver_apply_vect
 
   Implicit None
diff --git a/config/pac.m4 b/config/pac.m4
index c0ad6f45..099c5a41 100644
--- a/config/pac.m4
+++ b/config/pac.m4
@@ -409,7 +409,7 @@ save_LDFLAGS=$LDFLAGS;
 ## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
 ##  PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib"
 ## fi
-PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
+PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
 LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
 
 dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext  1>&5'
@@ -484,7 +484,7 @@ dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
  PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES"
 fi
 FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS"
-PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
+PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
 LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
 
 dnl ac_compile='${MPIFC-$FC} -c -o conftest${ac_objext} $FMFLAG$PSBLAS_DIR/include $FMFLAG$PSBLAS_DIR/lib conftest.$ac_ext  1>&5'
diff --git a/configure b/configure
index 8f1485a7..5ce85c96 100755
--- a/configure
+++ b/configure
@@ -7417,7 +7417,7 @@ then
    FIFLAG="-I"
    BASEMODNAME=PSB_BASE_MOD
    PRECMODNAME=PSB_PREC_MOD
-   METHDMODNAME=PSB_KRYLOV_MOD
+   METHDMODNAME=PSB_LINSOLVE_MOD
    UTILMODNAME=PSB_UTIL_MOD
 
 else
@@ -7550,7 +7550,7 @@ printf "%s\n" "$ax_cv_f90_modflag" >&6; }
    FIFLAG=-I
    BASEMODNAME=psb_base_mod
    PRECMODNAME=psb_prec_mod
-   METHDMODNAME=psb_krylov_mod
+   METHDMODNAME=psb_linsolve_mod
    UTILMODNAME=psb_util_mod
 fi
 
@@ -7683,7 +7683,7 @@ save_LDFLAGS=$LDFLAGS;
 ## dnl AC_MSG_NOTICE([psblas dir $pac_cv_psblas_dir])
 ##  PSBLAS_LIBS="-L$pac_cv_psblas_dir/lib"
 ## fi
-PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
+PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base -L$PSBLAS_LIBDIR"
 LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
 
 ac_link='${MPIFC-$FC} -o conftest${ac_exeext} $FCFLAGS conftest.$ac_ext $LDFLAGS $LIBS  1>&5'
@@ -7787,7 +7787,7 @@ elif test "x$pac_cv_psblas_dir" != "x"; then
  PSBLAS_INCLUDES="$FMFLAG$pac_cv_psblas_dir/modules $PSBLAS_INCLUDES"
 fi
 FCFLAGS=" $PSBLAS_INCLUDES $save_FCFLAGS"
-PSBLAS_LIBS="-lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
+PSBLAS_LIBS="-lpsb_linsolve -lpsb_prec -lpsb_util -lpsb_base $PSBLAS_LIBS"
 LDFLAGS=" $PSBLAS_LIBS $save_LDFLAGS"
 
 
diff --git a/configure.ac b/configure.ac
index 7f13fa95..39380cce 100755
--- a/configure.ac
+++ b/configure.ac
@@ -525,7 +525,7 @@ then
    FIFLAG="-I"
    BASEMODNAME=PSB_BASE_MOD
    PRECMODNAME=PSB_PREC_MOD
-   METHDMODNAME=PSB_KRYLOV_MOD
+   METHDMODNAME=PSB_LINSOLVE_MOD
    UTILMODNAME=PSB_UTIL_MOD
 
 else 
@@ -536,7 +536,7 @@ else
    FIFLAG=-I
    BASEMODNAME=psb_base_mod
    PRECMODNAME=psb_prec_mod
-   METHDMODNAME=psb_krylov_mod
+   METHDMODNAME=psb_linsolve_mod
    UTILMODNAME=psb_util_mod
 fi
 
diff --git a/samples/advanced/fileread/Makefile b/samples/advanced/fileread/Makefile
index d012036a..87b74cdc 100644
--- a/samples/advanced/fileread/Makefile
+++ b/samples/advanced/fileread/Makefile
@@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
 AMGLIBDIR=$(AMGDIR)/lib
-AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec
+AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 
 DFSOBJS=amg_df_sample.o data_input.o
diff --git a/samples/advanced/fileread/amg_cf_sample.f90 b/samples/advanced/fileread/amg_cf_sample.f90
index 3fc9f195..10e5753d 100644
--- a/samples/advanced/fileread/amg_cf_sample.f90
+++ b/samples/advanced/fileread/amg_cf_sample.f90
@@ -38,7 +38,7 @@
 program amg_cf_sample
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/advanced/fileread/amg_df_sample.f90 b/samples/advanced/fileread/amg_df_sample.f90
index 381b0a4d..3b590dec 100644
--- a/samples/advanced/fileread/amg_df_sample.f90
+++ b/samples/advanced/fileread/amg_df_sample.f90
@@ -38,7 +38,7 @@
 program amg_df_sample
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/advanced/fileread/amg_sf_sample.f90 b/samples/advanced/fileread/amg_sf_sample.f90
index 15988b4d..2dab82a8 100644
--- a/samples/advanced/fileread/amg_sf_sample.f90
+++ b/samples/advanced/fileread/amg_sf_sample.f90
@@ -38,7 +38,7 @@
 program amg_sf_sample
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/advanced/fileread/amg_zf_sample.f90 b/samples/advanced/fileread/amg_zf_sample.f90
index edb6e51f..4836fb59 100644
--- a/samples/advanced/fileread/amg_zf_sample.f90
+++ b/samples/advanced/fileread/amg_zf_sample.f90
@@ -38,7 +38,7 @@
 program amg_zf_sample
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/advanced/pdegen/Makefile b/samples/advanced/pdegen/Makefile
index 4154aaef..31890a98 100644
--- a/samples/advanced/pdegen/Makefile
+++ b/samples/advanced/pdegen/Makefile
@@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
 AMGLIBDIR=$(AMGDIR)/lib
-AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec 
+AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec 
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 
 LINKOPT=
diff --git a/samples/advanced/pdegen/amg_d_pde2d.F90 b/samples/advanced/pdegen/amg_d_pde2d.F90
index 52debd1e..33b9b7f0 100644
--- a/samples/advanced/pdegen/amg_d_pde2d.F90
+++ b/samples/advanced/pdegen/amg_d_pde2d.F90
@@ -66,7 +66,7 @@
 program amg_d_pde2d
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_d_pde2d_poisson_mod
diff --git a/samples/advanced/pdegen/amg_d_pde3d.F90 b/samples/advanced/pdegen/amg_d_pde3d.F90
index eb8b4344..1b064b24 100644
--- a/samples/advanced/pdegen/amg_d_pde3d.F90
+++ b/samples/advanced/pdegen/amg_d_pde3d.F90
@@ -67,7 +67,7 @@
 program amg_d_pde3d
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_d_pde3d_poisson_mod
diff --git a/samples/advanced/pdegen/amg_s_pde2d.F90 b/samples/advanced/pdegen/amg_s_pde2d.F90
index 7732bdbb..53ff650d 100644
--- a/samples/advanced/pdegen/amg_s_pde2d.F90
+++ b/samples/advanced/pdegen/amg_s_pde2d.F90
@@ -66,7 +66,7 @@
 program amg_s_pde2d
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_s_pde2d_poisson_mod
diff --git a/samples/advanced/pdegen/amg_s_pde3d.F90 b/samples/advanced/pdegen/amg_s_pde3d.F90
index f6571bdb..91df58a3 100644
--- a/samples/advanced/pdegen/amg_s_pde3d.F90
+++ b/samples/advanced/pdegen/amg_s_pde3d.F90
@@ -67,7 +67,7 @@
 program amg_s_pde3d
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_s_pde3d_poisson_mod
diff --git a/samples/simple/fileread/Makefile b/samples/simple/fileread/Makefile
index 6f36ed04..ed53ddc9 100644
--- a/samples/simple/fileread/Makefile
+++ b/samples/simple/fileread/Makefile
@@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
 AMGLIBDIR=$(AMGDIR)/lib
-AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec
+AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 LINKOPT=
 
diff --git a/samples/simple/fileread/amg_cexample_1lev.f90 b/samples/simple/fileread/amg_cexample_1lev.f90
index fa89c3a9..30dcd46c 100644
--- a/samples/simple/fileread/amg_cexample_1lev.f90
+++ b/samples/simple/fileread/amg_cexample_1lev.f90
@@ -47,7 +47,7 @@
 program amg_cexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/simple/fileread/amg_cexample_ml.f90 b/samples/simple/fileread/amg_cexample_ml.f90
index 7a05c4b3..f5f3d927 100644
--- a/samples/simple/fileread/amg_cexample_ml.f90
+++ b/samples/simple/fileread/amg_cexample_ml.f90
@@ -62,7 +62,7 @@
 program amg_cexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
 
diff --git a/samples/simple/fileread/amg_dexample_1lev.f90 b/samples/simple/fileread/amg_dexample_1lev.f90
index abef315e..86831925 100644
--- a/samples/simple/fileread/amg_dexample_1lev.f90
+++ b/samples/simple/fileread/amg_dexample_1lev.f90
@@ -47,7 +47,7 @@
 program amg_dexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/simple/fileread/amg_dexample_ml.f90 b/samples/simple/fileread/amg_dexample_ml.f90
index ddc1c021..5a97f590 100644
--- a/samples/simple/fileread/amg_dexample_ml.f90
+++ b/samples/simple/fileread/amg_dexample_ml.f90
@@ -62,7 +62,7 @@
 program amg_dexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
 
diff --git a/samples/simple/fileread/amg_sexample_1lev.f90 b/samples/simple/fileread/amg_sexample_1lev.f90
index b30c0e81..03015c8d 100644
--- a/samples/simple/fileread/amg_sexample_1lev.f90
+++ b/samples/simple/fileread/amg_sexample_1lev.f90
@@ -47,7 +47,7 @@
 program amg_sexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/simple/fileread/amg_sexample_ml.f90 b/samples/simple/fileread/amg_sexample_ml.f90
index 3f3e3071..f0f0e77f 100644
--- a/samples/simple/fileread/amg_sexample_ml.f90
+++ b/samples/simple/fileread/amg_sexample_ml.f90
@@ -62,7 +62,7 @@
 program amg_sexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
 
diff --git a/samples/simple/fileread/amg_zexample_1lev.f90 b/samples/simple/fileread/amg_zexample_1lev.f90
index cea1a1c5..86cf8caf 100644
--- a/samples/simple/fileread/amg_zexample_1lev.f90
+++ b/samples/simple/fileread/amg_zexample_1lev.f90
@@ -47,7 +47,7 @@
 program amg_zexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   implicit none
diff --git a/samples/simple/fileread/amg_zexample_ml.f90 b/samples/simple/fileread/amg_zexample_ml.f90
index e6c48d79..369e2a33 100644
--- a/samples/simple/fileread/amg_zexample_ml.f90
+++ b/samples/simple/fileread/amg_zexample_ml.f90
@@ -62,7 +62,7 @@
 program amg_zexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
 
diff --git a/samples/simple/pdegen/Makefile b/samples/simple/pdegen/Makefile
index 198654d5..cc93e7d3 100644
--- a/samples/simple/pdegen/Makefile
+++ b/samples/simple/pdegen/Makefile
@@ -3,7 +3,7 @@ AMGINCDIR=$(AMGDIR)/include
 include $(AMGINCDIR)/Make.inc.amg4psblas
 AMGMODDIR=$(AMGDIR)/modules
 AMGLIBDIR=$(AMGDIR)/lib
-AMG_LIBS=-L$(AMGLIBDIR) -lpsb_krylov -lamg_prec -lpsb_prec
+AMG_LIBS=-L$(AMGLIBDIR) -lpsb_linsolve -lamg_prec -lpsb_prec
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(AMGMODDIR) $(FMFLAG)$(AMGINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 LINKOPT=
 
diff --git a/samples/simple/pdegen/amg_dexample_1lev.f90 b/samples/simple/pdegen/amg_dexample_1lev.f90
index 51aa64b2..05158ab1 100644
--- a/samples/simple/pdegen/amg_dexample_1lev.f90
+++ b/samples/simple/pdegen/amg_dexample_1lev.f90
@@ -60,7 +60,7 @@
 program amg_dexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_d_pde_mod
diff --git a/samples/simple/pdegen/amg_dexample_ml.f90 b/samples/simple/pdegen/amg_dexample_ml.f90
index 757d19ec..36ada4f5 100644
--- a/samples/simple/pdegen/amg_dexample_ml.f90
+++ b/samples/simple/pdegen/amg_dexample_ml.f90
@@ -83,7 +83,7 @@
 program amg_dexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_d_pde_mod
diff --git a/samples/simple/pdegen/amg_sexample_1lev.f90 b/samples/simple/pdegen/amg_sexample_1lev.f90
index c47cf9e2..cbfe691b 100644
--- a/samples/simple/pdegen/amg_sexample_1lev.f90
+++ b/samples/simple/pdegen/amg_sexample_1lev.f90
@@ -60,7 +60,7 @@
 program amg_sexample_1lev
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_s_pde_mod
diff --git a/samples/simple/pdegen/amg_sexample_ml.f90 b/samples/simple/pdegen/amg_sexample_ml.f90
index 8a00af88..9ae25e6b 100644
--- a/samples/simple/pdegen/amg_sexample_ml.f90
+++ b/samples/simple/pdegen/amg_sexample_ml.f90
@@ -83,7 +83,7 @@
 program amg_sexample_ml
   use psb_base_mod
   use amg_prec_mod
-  use psb_krylov_mod
+  use psb_linsolve_mod
   use psb_util_mod
   use data_input
   use amg_s_pde_mod
diff --git a/tests/newslv/Makefile b/tests/newslv/Makefile
index 3b9cc19f..76fd30c0 100644
--- a/tests/newslv/Makefile
+++ b/tests/newslv/Makefile
@@ -3,7 +3,7 @@ MLDINCDIR=$(MLDDIR)/include
 include $(MLDINCDIR)/Make.inc.amg4psblas
 MLDMODDIR=$(MLDDIR)/modules
 MLDLIBDIR=$(MLDDIR)/lib
-MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
+MLD_LIBS=-L$(MLDLIBDIR) -lpsb_linsolve -lmld_prec -lpsb_prec
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDMODDIR) $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
 
 PD3DOBJS=mld_pde3d_newslv.o  data_input.o mld_d_tlu_solver.o mld_d_tlu_solver_impl.o