diff --git a/mlprec/mld_daggrmat_raw_asb.F90 b/mlprec/mld_daggrmat_raw_asb.F90
index d7872697..53602ed7 100644
--- a/mlprec/mld_daggrmat_raw_asb.F90
+++ b/mlprec/mld_daggrmat_raw_asb.F90
@@ -178,7 +178,7 @@ subroutine mld_daggrmat_raw_asb(a,desc_a,ac,desc_ac,p,info)
     goto 9999
   end if
   ! Out from sp_clip is always in COO, but just in case..
-  if (tolower(b%fida) /= 'coo') then 
+  if (psb_tolower(b%fida) /= 'coo') then 
     call psb_errpush(4010,name,a_err='spclip NOT COO')
     goto 9999
   end if
diff --git a/mlprec/mld_daggrmat_smth_asb.F90 b/mlprec/mld_daggrmat_smth_asb.F90
index e9f9f83b..2c9b8cd1 100644
--- a/mlprec/mld_daggrmat_smth_asb.F90
+++ b/mlprec/mld_daggrmat_smth_asb.F90
@@ -267,7 +267,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
       ! 
       ! This only works with CSR.
       !
-      if (toupper(am3%fida)=='CSR') then 
+      if (psb_toupper(am3%fida)=='CSR') then 
         anorm = dzero
         dg    = done
         do i=1,am3%m
@@ -308,7 +308,7 @@ subroutine mld_daggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
   end if
 
 
-  if (toupper(am3%fida)=='CSR') then 
+  if (psb_toupper(am3%fida)=='CSR') then 
     do i=1,am3%m
       do j=am3%ia2(i),am3%ia2(i+1)-1
         if (am3%ia1(j) == i) then 
diff --git a/mlprec/mld_das_aply.f90 b/mlprec/mld_das_aply.f90
index b558f568..5263281d 100644
--- a/mlprec/mld_das_aply.f90
+++ b/mlprec/mld_das_aply.f90
@@ -106,7 +106,7 @@ subroutine mld_das_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   call psb_info(ictxt, me, np)
   
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
 
   select case(prec%iprcparm(mld_prec_type_))
 
diff --git a/mlprec/mld_dbaseprec_aply.f90 b/mlprec/mld_dbaseprec_aply.f90
index 097eb5f1..b21ce08c 100644
--- a/mlprec/mld_dbaseprec_aply.f90
+++ b/mlprec/mld_dbaseprec_aply.f90
@@ -110,7 +110,7 @@ subroutine mld_dbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   call psb_info(ictxt, me, np)
 
-  trans_= toupper(trans)
+  trans_= psb_toupper(trans)
   select case(trans_)
   case('N','T','C')
     ! Ok
diff --git a/mlprec/mld_dbaseprec_bld.f90 b/mlprec/mld_dbaseprec_bld.f90
index 3de35a58..2f5ae125 100644
--- a/mlprec/mld_dbaseprec_bld.f90
+++ b/mlprec/mld_dbaseprec_bld.f90
@@ -109,8 +109,8 @@ subroutine mld_dbaseprc_bld(a,desc_a,p,info,upd)
   if (present(upd)) then 
     if (debug_level >= psb_debug_outer_) &
          & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
-    if ((toupper(UPD) ==  'F').or.(toupper(UPD) == 'T')) then
-      IUPD=toupper(UPD)
+    if ((psb_toupper(UPD) ==  'F').or.(psb_toupper(UPD) == 'T')) then
+      IUPD=psb_toupper(UPD)
     else
       IUPD='F'
     endif
diff --git a/mlprec/mld_dilu0_fact.f90 b/mlprec/mld_dilu0_fact.f90
index 07f6d865..84c8d5c8 100644
--- a/mlprec/mld_dilu0_fact.f90
+++ b/mlprec/mld_dilu0_fact.f90
@@ -569,7 +569,7 @@ contains
     info=0
     call psb_erractionsave(err_act)
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_diluk_fact.f90 b/mlprec/mld_diluk_fact.f90
index 9793f0ac..993d8772 100644
--- a/mlprec/mld_diluk_fact.f90
+++ b/mlprec/mld_diluk_fact.f90
@@ -507,7 +507,7 @@ contains
     call psb_erractionsave(err_act)
     call psb_init_heap(heap,info) 
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_dilut_fact.f90 b/mlprec/mld_dilut_fact.f90
index 457be4f9..f793ffaa 100644
--- a/mlprec/mld_dilut_fact.f90
+++ b/mlprec/mld_dilut_fact.f90
@@ -519,7 +519,7 @@ contains
     dmaxup = dzero
     nrmi   = dzero
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_dmlprec_aply.f90 b/mlprec/mld_dmlprec_aply.f90
index a376dfd4..5c308852 100644
--- a/mlprec/mld_dmlprec_aply.f90
+++ b/mlprec/mld_dmlprec_aply.f90
@@ -200,7 +200,7 @@ subroutine mld_dmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info)
        & write(debug_unit,*) me,' ',trim(name),&
        & ' Entry  ', size(baseprecv)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
 
   select case(baseprecv(2)%iprcparm(mld_ml_type_)) 
 
diff --git a/mlprec/mld_dprec_aply.f90 b/mlprec/mld_dprec_aply.f90
index ea9f16f7..7be89f8b 100644
--- a/mlprec/mld_dprec_aply.f90
+++ b/mlprec/mld_dprec_aply.f90
@@ -102,7 +102,7 @@ subroutine mld_dprec_aply(prec,x,y,desc_data,info,trans,work)
   call psb_info(ictxt, me, np)
 
   if (present(trans)) then 
-    trans_=toupper(trans)
+    trans_=psb_toupper(trans)
   else
     trans_='N'
   end if
diff --git a/mlprec/mld_dprecbld.f90 b/mlprec/mld_dprecbld.f90
index a0b2b07b..4d411fce 100644
--- a/mlprec/mld_dprecbld.f90
+++ b/mlprec/mld_dprecbld.f90
@@ -108,8 +108,8 @@ subroutine mld_dprecbld(a,desc_a,p,info)
 !!$    if (debug_level >= psb_debug_outer_) &
 !!$         & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
 !!$
-!!$    if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then
-!!$      upd_=toupper(upd)
+!!$    if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then
+!!$      upd_=psb_toupper(upd)
 !!$    else
 !!$      upd_='F'
 !!$    endif
diff --git a/mlprec/mld_dprecinit.f90 b/mlprec/mld_dprecinit.f90
index ff4face2..8e4b5584 100644
--- a/mlprec/mld_dprecinit.f90
+++ b/mlprec/mld_dprecinit.f90
@@ -109,7 +109,7 @@ subroutine mld_dprecinit(p,ptype,info,nlev)
     endif
   endif
 
-  select case(toupper(ptype(1:len_trim(ptype))))
+  select case(psb_toupper(ptype(1:len_trim(ptype))))
   case ('NONE','NOPREC') 
     nlev_ = 1
     ilev_ = 1
diff --git a/mlprec/mld_dprecset.f90 b/mlprec/mld_dprecset.f90
index 68d76e45..44cc1d77 100644
--- a/mlprec/mld_dprecset.f90
+++ b/mlprec/mld_dprecset.f90
@@ -436,7 +436,7 @@ contains
     integer, intent(out) :: val, info
     
     info = 0
-    select case(toupper(trim(string)))
+    select case(psb_toupper(trim(string)))
     case('NONE')
       val = 0
     case('HALO')
diff --git a/mlprec/mld_dslu_bld.f90 b/mlprec/mld_dslu_bld.f90
index a7954038..81eedb3f 100644
--- a/mlprec/mld_dslu_bld.f90
+++ b/mlprec/mld_dslu_bld.f90
@@ -95,7 +95,7 @@ subroutine mld_dslu_bld(a,desc_a,p,info)
 
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSR') then 
+  if (psb_toupper(a%fida) /= 'CSR') then 
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/mlprec/mld_dslud_bld.f90 b/mlprec/mld_dslud_bld.f90
index 7b5a39c0..d1de861c 100644
--- a/mlprec/mld_dslud_bld.f90
+++ b/mlprec/mld_dslud_bld.f90
@@ -93,7 +93,7 @@ subroutine mld_dsludist_bld(a,desc_a,p,info)
 
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSR') then 
+  if (psb_toupper(a%fida) /= 'CSR') then 
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/mlprec/mld_dsub_aply.f90 b/mlprec/mld_dsub_aply.f90
index 5f7422ec..f9e08fb1 100644
--- a/mlprec/mld_dsub_aply.f90
+++ b/mlprec/mld_dsub_aply.f90
@@ -163,7 +163,7 @@ subroutine mld_dsub_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
   ictxt=psb_cd_get_context(desc_data)
   call psb_info(ictxt, me, np)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
   select case(trans_)
   case('N')
   case('T','C')
diff --git a/mlprec/mld_dsub_solve.f90 b/mlprec/mld_dsub_solve.f90
index 283347b4..8c86df58 100644
--- a/mlprec/mld_dsub_solve.f90
+++ b/mlprec/mld_dsub_solve.f90
@@ -151,7 +151,7 @@ subroutine mld_dsub_solve(alpha,prec,x,beta,y,desc_data,trans,work,info)
   ictxt=psb_cd_get_context(desc_data)
   call psb_info(ictxt, me, np)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
   select case(trans_)
   case('N')
   case('T','C')
diff --git a/mlprec/mld_dumf_bld.f90 b/mlprec/mld_dumf_bld.f90
index 3dd1e42f..49995d5a 100644
--- a/mlprec/mld_dumf_bld.f90
+++ b/mlprec/mld_dumf_bld.f90
@@ -99,7 +99,7 @@ subroutine mld_dumf_bld(a,desc_a,p,info)
   ictxt = psb_cd_get_context(desc_a)
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSC') then
+  if (psb_toupper(a%fida) /= 'CSC') then
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/mlprec/mld_zaggrmat_raw_asb.F90 b/mlprec/mld_zaggrmat_raw_asb.F90
index 8f24de7c..fcb99318 100644
--- a/mlprec/mld_zaggrmat_raw_asb.F90
+++ b/mlprec/mld_zaggrmat_raw_asb.F90
@@ -178,7 +178,7 @@ subroutine mld_zaggrmat_raw_asb(a,desc_a,ac,desc_ac,p,info)
     goto 9999
   end if
   ! Out from sp_clip is always in COO, but just in case..
-  if (tolower(b%fida) /= 'coo') then 
+  if (psb_tolower(b%fida) /= 'coo') then 
     call psb_errpush(4010,name,a_err='spclip NOT COO')
     goto 9999
   end if
diff --git a/mlprec/mld_zaggrmat_smth_asb.F90 b/mlprec/mld_zaggrmat_smth_asb.F90
index 0fe7f92a..7f6db71e 100644
--- a/mlprec/mld_zaggrmat_smth_asb.F90
+++ b/mlprec/mld_zaggrmat_smth_asb.F90
@@ -267,7 +267,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
       ! 
       ! This only works with CSR.
       !
-      if (toupper(am3%fida)=='CSR') then 
+      if (psb_toupper(am3%fida)=='CSR') then 
         anorm = dzero
         dg    = done
         do i=1,am3%m
@@ -308,7 +308,7 @@ subroutine mld_zaggrmat_smth_asb(a,desc_a,ac,desc_ac,p,info)
   end if
 
 
-  if (toupper(am3%fida)=='CSR') then 
+  if (psb_toupper(am3%fida)=='CSR') then 
     do i=1,am3%m
       do j=am3%ia2(i),am3%ia2(i+1)-1
         if (am3%ia1(j) == i) then 
diff --git a/mlprec/mld_zas_aply.f90 b/mlprec/mld_zas_aply.f90
index a01caab2..02f2e542 100644
--- a/mlprec/mld_zas_aply.f90
+++ b/mlprec/mld_zas_aply.f90
@@ -106,7 +106,7 @@ subroutine mld_zas_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   call psb_info(ictxt, me, np)
   
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
 
   select case(prec%iprcparm(mld_prec_type_))
 
diff --git a/mlprec/mld_zbaseprec_aply.f90 b/mlprec/mld_zbaseprec_aply.f90
index 1098cc34..8143532a 100644
--- a/mlprec/mld_zbaseprec_aply.f90
+++ b/mlprec/mld_zbaseprec_aply.f90
@@ -110,7 +110,7 @@ subroutine mld_zbaseprec_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
 
   call psb_info(ictxt, me, np)
 
-  trans_= toupper(trans)
+  trans_= psb_toupper(trans)
   select case(trans_)
   case('N','T','C')
     ! Ok
diff --git a/mlprec/mld_zbaseprec_bld.f90 b/mlprec/mld_zbaseprec_bld.f90
index 27cf57aa..a5e4c41d 100644
--- a/mlprec/mld_zbaseprec_bld.f90
+++ b/mlprec/mld_zbaseprec_bld.f90
@@ -109,8 +109,8 @@ subroutine mld_zbaseprc_bld(a,desc_a,p,info,upd)
   if (present(upd)) then 
     if (debug_level >= psb_debug_outer_) &
          & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
-    if ((toupper(UPD) ==  'F').or.(toupper(UPD) == 'T')) then
-      IUPD=toupper(UPD)
+    if ((psb_toupper(UPD) ==  'F').or.(psb_toupper(UPD) == 'T')) then
+      IUPD=psb_toupper(UPD)
     else
       IUPD='F'
     endif
diff --git a/mlprec/mld_zilu0_fact.f90 b/mlprec/mld_zilu0_fact.f90
index c2448f26..68e7cd46 100644
--- a/mlprec/mld_zilu0_fact.f90
+++ b/mlprec/mld_zilu0_fact.f90
@@ -569,7 +569,7 @@ contains
     info=0
     call psb_erractionsave(err_act)
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_ziluk_fact.f90 b/mlprec/mld_ziluk_fact.f90
index fed35a50..26499979 100644
--- a/mlprec/mld_ziluk_fact.f90
+++ b/mlprec/mld_ziluk_fact.f90
@@ -508,7 +508,7 @@ contains
     call psb_erractionsave(err_act)
     call psb_init_heap(heap,info) 
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_zilut_fact.f90 b/mlprec/mld_zilut_fact.f90
index 3be8f960..4cfdbd13 100644
--- a/mlprec/mld_zilut_fact.f90
+++ b/mlprec/mld_zilut_fact.f90
@@ -520,7 +520,7 @@ contains
     dmaxup = dzero
     nrmi   = dzero
 
-    if (toupper(a%fida)=='CSR') then
+    if (psb_toupper(a%fida)=='CSR') then
 
       !
       ! Take a fast shortcut if the matrix is stored in CSR format
diff --git a/mlprec/mld_zmlprec_aply.f90 b/mlprec/mld_zmlprec_aply.f90
index 9296a6de..0d77ab22 100644
--- a/mlprec/mld_zmlprec_aply.f90
+++ b/mlprec/mld_zmlprec_aply.f90
@@ -200,7 +200,7 @@ subroutine mld_zmlprec_aply(alpha,baseprecv,x,beta,y,desc_data,trans,work,info)
        & write(debug_unit,*) me,' ',trim(name),&
        & ' Entry  ', size(baseprecv)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
 
   select case(baseprecv(2)%iprcparm(mld_ml_type_)) 
 
diff --git a/mlprec/mld_zprec_aply.f90 b/mlprec/mld_zprec_aply.f90
index 9a1bffcc..8c62a8df 100644
--- a/mlprec/mld_zprec_aply.f90
+++ b/mlprec/mld_zprec_aply.f90
@@ -102,7 +102,7 @@ subroutine mld_zprec_aply(prec,x,y,desc_data,info,trans,work)
   call psb_info(ictxt, me, np)
 
   if (present(trans)) then 
-    trans_=toupper(trans)
+    trans_=psb_toupper(trans)
   else
     trans_='N'
   end if
diff --git a/mlprec/mld_zprecbld.f90 b/mlprec/mld_zprecbld.f90
index 29fbbe2c..e6dc0dca 100644
--- a/mlprec/mld_zprecbld.f90
+++ b/mlprec/mld_zprecbld.f90
@@ -108,8 +108,8 @@ subroutine mld_zprecbld(a,desc_a,p,info)
 !!$    if (debug_level >= psb_debug_outer_) &
 !!$         & write(debug_unit,*) me,' ',trim(name),'UPD ', upd
 !!$
-!!$    if ((toupper(upd).eq.'F').or.(toupper(upd).eq.'T')) then
-!!$      upd_=toupper(upd)
+!!$    if ((psb_toupper(upd).eq.'F').or.(psb_toupper(upd).eq.'T')) then
+!!$      upd_=psb_toupper(upd)
 !!$    else
 !!$      upd_='F'
 !!$    endif
diff --git a/mlprec/mld_zprecinit.f90 b/mlprec/mld_zprecinit.f90
index b004a121..ace8b928 100644
--- a/mlprec/mld_zprecinit.f90
+++ b/mlprec/mld_zprecinit.f90
@@ -109,7 +109,7 @@ subroutine mld_zprecinit(p,ptype,info,nlev)
     endif
   endif
 
-  select case(toupper(ptype(1:len_trim(ptype))))
+  select case(psb_toupper(ptype(1:len_trim(ptype))))
   case ('NONE','NOPREC') 
     nlev_ = 1
     ilev_ = 1
diff --git a/mlprec/mld_zprecset.f90 b/mlprec/mld_zprecset.f90
index 3a9a0c0d..266651ee 100644
--- a/mlprec/mld_zprecset.f90
+++ b/mlprec/mld_zprecset.f90
@@ -436,7 +436,7 @@ contains
     integer, intent(out) :: val, info
     
     info = 0
-    select case(toupper(trim(string)))
+    select case(psb_toupper(trim(string)))
     case('NONE')
       val = 0
     case('HALO')
diff --git a/mlprec/mld_zslu_bld.f90 b/mlprec/mld_zslu_bld.f90
index baeba7e1..d6b00ab0 100644
--- a/mlprec/mld_zslu_bld.f90
+++ b/mlprec/mld_zslu_bld.f90
@@ -95,7 +95,7 @@ subroutine mld_zslu_bld(a,desc_a,p,info)
 
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSR') then 
+  if (psb_toupper(a%fida) /= 'CSR') then 
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/mlprec/mld_zslud_bld.f90 b/mlprec/mld_zslud_bld.f90
index 9da84a00..b464a167 100644
--- a/mlprec/mld_zslud_bld.f90
+++ b/mlprec/mld_zslud_bld.f90
@@ -93,7 +93,7 @@ subroutine mld_zsludist_bld(a,desc_a,p,info)
 
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSR') then 
+  if (psb_toupper(a%fida) /= 'CSR') then 
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/mlprec/mld_zsub_aply.f90 b/mlprec/mld_zsub_aply.f90
index 9040a568..0677b6d8 100644
--- a/mlprec/mld_zsub_aply.f90
+++ b/mlprec/mld_zsub_aply.f90
@@ -164,7 +164,7 @@ subroutine mld_zsub_aply(alpha,prec,x,beta,y,desc_data,trans,work,info)
   ictxt=psb_cd_get_context(desc_data)
   call psb_info(ictxt, me, np)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
   select case(trans_)
   case('N')
   case('T','C')
diff --git a/mlprec/mld_zsub_solve.f90 b/mlprec/mld_zsub_solve.f90
index 58f5758a..86f375ca 100644
--- a/mlprec/mld_zsub_solve.f90
+++ b/mlprec/mld_zsub_solve.f90
@@ -152,7 +152,7 @@ subroutine mld_zsub_solve(alpha,prec,x,beta,y,desc_data,trans,work,info)
   ictxt=psb_cd_get_context(desc_data)
   call psb_info(ictxt, me, np)
 
-  trans_ = toupper(trans)
+  trans_ = psb_toupper(trans)
   select case(trans_)
   case('N')
   case('T','C')
diff --git a/mlprec/mld_zumf_bld.f90 b/mlprec/mld_zumf_bld.f90
index 2f6adec6..16caf3d6 100644
--- a/mlprec/mld_zumf_bld.f90
+++ b/mlprec/mld_zumf_bld.f90
@@ -99,7 +99,7 @@ subroutine mld_zumf_bld(a,desc_a,p,info)
   ictxt = psb_cd_get_context(desc_a)
   call psb_info(ictxt, me, np)
 
-  if (toupper(a%fida) /= 'CSC') then
+  if (psb_toupper(a%fida) /= 'CSC') then
     info=135
     call psb_errpush(info,name,a_err=a%fida)
     goto 9999
diff --git a/test/fileread/df_bench.f90 b/test/fileread/df_bench.f90
index 62e92a87..b22d4e17 100644
--- a/test/fileread/df_bench.f90
+++ b/test/fileread/df_bench.f90
@@ -377,7 +377,7 @@ program df_bench
             write(0,'(" ")')
             write(0,'("Saving x on file")')
             write(outf3,'(a,a,a)')trim(mtrx(nm)),'.psb_sol.',&
-                 & tolower(trim(precs(pp)%descr))
+                 & psb_tolower(trim(precs(pp)%descr))
             open(20,file=outf3)
             write(20,*) 'matrix: ',mtrx(nm)
             write(20,*) 'computed solution on ',np,' processors.'
diff --git a/test/fileread/df_sample.f90 b/test/fileread/df_sample.f90
index 3854d3cc..e1e0d6eb 100644
--- a/test/fileread/df_sample.f90
+++ b/test/fileread/df_sample.f90
@@ -266,7 +266,7 @@ program df_sample
 
   ! 
 
-  if (toupper(prec_choice%prec) =='ML') then 
+  if (psb_toupper(prec_choice%prec) =='ML') then 
     nlv = prec_choice%nlev
   else
     nlv = 1
@@ -278,7 +278,7 @@ program df_sample
   call mld_precset(prec,mld_sub_solve_,prec_choice%solve,info)
   call mld_precset(prec,mld_sub_fill_in_,prec_choice%fill1,info)
   call mld_precset(prec,mld_fact_thrs_,prec_choice%thr1,info)
-  if (toupper(prec_choice%prec) =='ML') then 
+  if (psb_toupper(prec_choice%prec) =='ML') then 
     call mld_precset(prec,mld_aggr_kind_,prec_choice%aggrkind,info)
     call mld_precset(prec,mld_aggr_alg_,prec_choice%aggr_alg,info)
     call mld_precset(prec,mld_ml_type_,prec_choice%mltype,info)
@@ -426,7 +426,7 @@ contains
       call read_data(prec%solve,5)       ! Factorization type: ILU, SuperLU, UMFPACK. 
       call read_data(prec%fill1,5)       ! Fill-in for factorization 1
       call read_data(prec%thr1,5)        ! Threshold for fact. 1 ILU(T)
-      if (toupper(prec%prec) == 'ML') then 
+      if (psb_toupper(prec%prec) == 'ML') then 
         call read_data(prec%nlev,5)        ! Number of levels in multilevel prec. 
         call read_data(prec%aggrkind,5)    ! smoothed/raw aggregatin
         call read_data(prec%aggr_alg,5)    ! local or global aggregation
@@ -460,7 +460,7 @@ contains
     call psb_bcast(icontxt,prec%solve)       ! Factorization type: ILU, SuperLU, UMFPACK. 
     call psb_bcast(icontxt,prec%fill1)       ! Fill-in for factorization 1
     call psb_bcast(icontxt,prec%thr1)        ! Threshold for fact. 1 ILU(T)
-    if (toupper(prec%prec) == 'ML') then 
+    if (psb_toupper(prec%prec) == 'ML') then 
       call psb_bcast(icontxt,prec%nlev)        ! Number of levels in multilevel prec. 
       call psb_bcast(icontxt,prec%aggrkind)    ! smoothed/raw aggregatin
       call psb_bcast(icontxt,prec%aggr_alg)    ! local or global aggregation
diff --git a/test/pargen/ppde.f90 b/test/pargen/ppde.f90
index 762743bf..f5712d37 100644
--- a/test/pargen/ppde.f90
+++ b/test/pargen/ppde.f90
@@ -221,7 +221,7 @@ program ppde
   !  prepare the preconditioner.
   !  
 
-  if (toupper(prectype%prec) =='ML') then 
+  if (psb_toupper(prectype%prec) =='ML') then 
     nlv = prectype%nlev
   else
     nlv = 1
@@ -233,7 +233,7 @@ program ppde
   call mld_precset(prec,mld_sub_solve_,prectype%solve,info)
   call mld_precset(prec,mld_sub_fill_in_,prectype%fill1,info)
   call mld_precset(prec,mld_fact_thrs_,prectype%thr1,info)
-  if (toupper(prectype%prec) =='ML') then 
+  if (psb_toupper(prectype%prec) =='ML') then 
     call mld_precset(prec,mld_aggr_kind_,prectype%aggrkind,info)
     call mld_precset(prec,mld_aggr_alg_,prectype%aggr_alg,info)
     call mld_precset(prec,mld_ml_type_,prectype%mltype,info)
@@ -352,7 +352,7 @@ contains
       call read_data(prectype%solve,5)       ! Factorization type: ILU, SuperLU, UMFPACK. 
       call read_data(prectype%fill1,5)       ! Fill-in for factorization 1
       call read_data(prectype%thr1,5)        ! Threshold for fact. 1 ILU(T)
-      if (toupper(prectype%prec) == 'ML') then 
+      if (psb_toupper(prectype%prec) == 'ML') then 
         call read_data(prectype%nlev,5)        ! Number of levels in multilevel prec. 
         call read_data(prectype%aggrkind,5)    ! smoothed/raw aggregatin
         call read_data(prectype%aggr_alg,5)    ! local or global aggregation
@@ -385,7 +385,7 @@ contains
     call psb_bcast(ictxt,prectype%solve)       ! Factorization type: ILU, SuperLU, UMFPACK. 
     call psb_bcast(ictxt,prectype%fill1)       ! Fill-in for factorization 1
     call psb_bcast(ictxt,prectype%thr1)        ! Threshold for fact. 1 ILU(T)
-    if (toupper(prectype%prec) == 'ML') then 
+    if (psb_toupper(prectype%prec) == 'ML') then 
       call psb_bcast(ictxt,prectype%nlev)        ! Number of levels in multilevel prec. 
       call psb_bcast(ictxt,prectype%aggrkind)    ! smoothed/raw aggregatin
       call psb_bcast(ictxt,prectype%aggr_alg)    ! local or global aggregation