diff --git a/prec/impl/psb_c_ilu0_fact.f90 b/prec/impl/psb_c_ilu0_fact.f90
index 9e039b19..c016359f 100644
--- a/prec/impl/psb_c_ilu0_fact.f90
+++ b/prec/impl/psb_c_ilu0_fact.f90
@@ -390,14 +390,14 @@ contains
           ! into lval/d(i)/uval
           !
           call ilu_copyin(i,ma,a,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         else
           !
           ! Copy the i-th local row of the matrix, stored in b
           ! (as (i-ma)-th row), into lval/d(i)/uval
           !
           call ilu_copyin(i-ma,mb,b,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         endif
 
         lirp(i+1) = l1 + 1
diff --git a/prec/impl/psb_c_iluk_fact.f90 b/prec/impl/psb_c_iluk_fact.f90
index 4e6d7a5c..6c6d8a5f 100644
--- a/prec/impl/psb_c_iluk_fact.f90
+++ b/prec/impl/psb_c_iluk_fact.f90
@@ -191,7 +191,7 @@ subroutine psb_ciluk_fact(fill_in,ialg,a,l,u,d,info,blck,shft)
   ! Compute the ILU(k) or the MILU(k) factorization, depending on ialg
   !
   call psb_ciluk_factint(fill_in,ialg,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_ciluk_factint'
diff --git a/prec/impl/psb_c_ilut_fact.f90 b/prec/impl/psb_c_ilut_fact.f90
index 6aecb53b..8421ee1c 100644
--- a/prec/impl/psb_c_ilut_fact.f90
+++ b/prec/impl/psb_c_ilut_fact.f90
@@ -213,7 +213,7 @@ subroutine psb_cilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale,shft)
   ! Compute the ILU(k,t) factorization
   !
   call psb_cilut_factint(fill_in,thres,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_cilut_factint'
diff --git a/prec/impl/psb_d_ilu0_fact.f90 b/prec/impl/psb_d_ilu0_fact.f90
index 29968e0c..dde22249 100644
--- a/prec/impl/psb_d_ilu0_fact.f90
+++ b/prec/impl/psb_d_ilu0_fact.f90
@@ -390,14 +390,14 @@ contains
           ! into lval/d(i)/uval
           !
           call ilu_copyin(i,ma,a,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         else
           !
           ! Copy the i-th local row of the matrix, stored in b
           ! (as (i-ma)-th row), into lval/d(i)/uval
           !
           call ilu_copyin(i-ma,mb,b,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         endif
 
         lirp(i+1) = l1 + 1
diff --git a/prec/impl/psb_d_iluk_fact.f90 b/prec/impl/psb_d_iluk_fact.f90
index 94c34fec..dc837ba9 100644
--- a/prec/impl/psb_d_iluk_fact.f90
+++ b/prec/impl/psb_d_iluk_fact.f90
@@ -191,7 +191,7 @@ subroutine psb_diluk_fact(fill_in,ialg,a,l,u,d,info,blck,shft)
   ! Compute the ILU(k) or the MILU(k) factorization, depending on ialg
   !
   call psb_diluk_factint(fill_in,ialg,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_diluk_factint'
diff --git a/prec/impl/psb_d_ilut_fact.f90 b/prec/impl/psb_d_ilut_fact.f90
index c4f05df6..cd185e80 100644
--- a/prec/impl/psb_d_ilut_fact.f90
+++ b/prec/impl/psb_d_ilut_fact.f90
@@ -213,7 +213,7 @@ subroutine psb_dilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale,shft)
   ! Compute the ILU(k,t) factorization
   !
   call psb_dilut_factint(fill_in,thres,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_dilut_factint'
diff --git a/prec/impl/psb_s_ilu0_fact.f90 b/prec/impl/psb_s_ilu0_fact.f90
index faa21fda..d9ce1298 100644
--- a/prec/impl/psb_s_ilu0_fact.f90
+++ b/prec/impl/psb_s_ilu0_fact.f90
@@ -390,14 +390,14 @@ contains
           ! into lval/d(i)/uval
           !
           call ilu_copyin(i,ma,a,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         else
           !
           ! Copy the i-th local row of the matrix, stored in b
           ! (as (i-ma)-th row), into lval/d(i)/uval
           !
           call ilu_copyin(i-ma,mb,b,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         endif
 
         lirp(i+1) = l1 + 1
diff --git a/prec/impl/psb_s_iluk_fact.f90 b/prec/impl/psb_s_iluk_fact.f90
index 99d48880..67fb8ada 100644
--- a/prec/impl/psb_s_iluk_fact.f90
+++ b/prec/impl/psb_s_iluk_fact.f90
@@ -191,7 +191,7 @@ subroutine psb_siluk_fact(fill_in,ialg,a,l,u,d,info,blck,shft)
   ! Compute the ILU(k) or the MILU(k) factorization, depending on ialg
   !
   call psb_siluk_factint(fill_in,ialg,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_siluk_factint'
diff --git a/prec/impl/psb_s_ilut_fact.f90 b/prec/impl/psb_s_ilut_fact.f90
index d63c5fb8..3d111103 100644
--- a/prec/impl/psb_s_ilut_fact.f90
+++ b/prec/impl/psb_s_ilut_fact.f90
@@ -213,7 +213,7 @@ subroutine psb_silut_fact(fill_in,thres,a,l,u,d,info,blck,iscale,shft)
   ! Compute the ILU(k,t) factorization
   !
   call psb_silut_factint(fill_in,thres,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_silut_factint'
diff --git a/prec/impl/psb_z_ilu0_fact.f90 b/prec/impl/psb_z_ilu0_fact.f90
index c6c0fc55..997a5e05 100644
--- a/prec/impl/psb_z_ilu0_fact.f90
+++ b/prec/impl/psb_z_ilu0_fact.f90
@@ -390,14 +390,14 @@ contains
           ! into lval/d(i)/uval
           !
           call ilu_copyin(i,ma,a,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         else
           !
           ! Copy the i-th local row of the matrix, stored in b
           ! (as (i-ma)-th row), into lval/d(i)/uval
           !
           call ilu_copyin(i-ma,mb,b,i,ione,m,l1,lja,lval,&
-               & d(i),l2,uja,uval,ktrw,trw,upd,shft)
+               & d(i),l2,uja,uval,ktrw,trw,upd,shft_)
         endif
 
         lirp(i+1) = l1 + 1
diff --git a/prec/impl/psb_z_iluk_fact.f90 b/prec/impl/psb_z_iluk_fact.f90
index dbd9430c..a5540880 100644
--- a/prec/impl/psb_z_iluk_fact.f90
+++ b/prec/impl/psb_z_iluk_fact.f90
@@ -191,7 +191,7 @@ subroutine psb_ziluk_fact(fill_in,ialg,a,l,u,d,info,blck,shft)
   ! Compute the ILU(k) or the MILU(k) factorization, depending on ialg
   !
   call psb_ziluk_factint(fill_in,ialg,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_ziluk_factint'
diff --git a/prec/impl/psb_z_ilut_fact.f90 b/prec/impl/psb_z_ilut_fact.f90
index 5e44f14a..0c278515 100644
--- a/prec/impl/psb_z_ilut_fact.f90
+++ b/prec/impl/psb_z_ilut_fact.f90
@@ -213,7 +213,7 @@ subroutine psb_zilut_fact(fill_in,thres,a,l,u,d,info,blck,iscale,shft)
   ! Compute the ILU(k,t) factorization
   !
   call psb_zilut_factint(fill_in,thres,a,blck_,&
-       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft)
+       & d,ll%val,ll%ja,ll%irp,uu%val,uu%ja,uu%irp,l1,l2,info,scale,shft_)
   if (info /= psb_success_) then
      info=psb_err_from_subroutine_
      ch_err='psb_zilut_factint'