diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90
index 349874e3..2455d58b 100644
--- a/base/tools/psb_csphalo.F90
+++ b/base/tools/psb_csphalo.F90
@@ -188,7 +188,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
     counter   = counter+n_el_send+3
   Enddo
 
-  call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
+  call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoall'
@@ -273,10 +273,10 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
 
   call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_complex,&
        & acoo%val,rvsz,brvindx,mpi_complex,icomm,info)
-  call mpi_alltoallv(iasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ia,rvsz,brvindx,mpi_integer,icomm,info)
-  call mpi_alltoallv(jasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ja,rvsz,brvindx,mpi_integer,icomm,info)
+  call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ia,rvsz,brvindx,psb_mpi_integer,icomm,info)
+  call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ja,rvsz,brvindx,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoallv'
diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90
index 2dd3ced6..25321a75 100644
--- a/base/tools/psb_dsphalo.F90
+++ b/base/tools/psb_dsphalo.F90
@@ -188,7 +188,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
     counter   = counter+n_el_send+3
   Enddo
 
-  call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
+  call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoall'
@@ -273,10 +273,10 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
 
   call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_double_precision,&
        & acoo%val,rvsz,brvindx,mpi_double_precision,icomm,info)
-  call mpi_alltoallv(iasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ia,rvsz,brvindx,mpi_integer,icomm,info)
-  call mpi_alltoallv(jasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ja,rvsz,brvindx,mpi_integer,icomm,info)
+  call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ia,rvsz,brvindx,psb_mpi_integer,icomm,info)
+  call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ja,rvsz,brvindx,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoallv'
diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90
index 5e508b0a..6e138d82 100644
--- a/base/tools/psb_ssphalo.F90
+++ b/base/tools/psb_ssphalo.F90
@@ -188,7 +188,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
     counter   = counter+n_el_send+3
   Enddo
 
-  call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
+  call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoall'
@@ -273,10 +273,10 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
 
   call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_real,&
        & acoo%val,rvsz,brvindx,mpi_real,icomm,info)
-  call mpi_alltoallv(iasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ia,rvsz,brvindx,mpi_integer,icomm,info)
-  call mpi_alltoallv(jasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ja,rvsz,brvindx,mpi_integer,icomm,info)
+  call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ia,rvsz,brvindx,psb_mpi_integer,icomm,info)
+  call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ja,rvsz,brvindx,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoallv'
diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90
index a42d9435..1b1491ec 100644
--- a/base/tools/psb_zsphalo.F90
+++ b/base/tools/psb_zsphalo.F90
@@ -188,7 +188,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
     counter   = counter+n_el_send+3
   Enddo
 
-  call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,info)
+  call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoall'
@@ -273,10 +273,10 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
 
   call mpi_alltoallv(valsnd,sdsz,bsdindx,mpi_double_complex,&
        & acoo%val,rvsz,brvindx,mpi_double_complex,icomm,info)
-  call mpi_alltoallv(iasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ia,rvsz,brvindx,mpi_integer,icomm,info)
-  call mpi_alltoallv(jasnd,sdsz,bsdindx,mpi_integer,&
-       & acoo%ja,rvsz,brvindx,mpi_integer,icomm,info)
+  call mpi_alltoallv(iasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ia,rvsz,brvindx,psb_mpi_integer,icomm,info)
+  call mpi_alltoallv(jasnd,sdsz,bsdindx,psb_mpi_integer,&
+       & acoo%ja,rvsz,brvindx,psb_mpi_integer,icomm,info)
   if (info /= psb_success_) then
     info=psb_err_from_subroutine_
     ch_err='mpi_alltoallv'