diff --git a/base/tools/psb_c_glob_transpose.F90 b/base/tools/psb_c_glob_transpose.F90
index e7a8ec0a..1afb155f 100644
--- a/base/tools/psb_c_glob_transpose.F90
+++ b/base/tools/psb_c_glob_transpose.F90
@@ -81,7 +81,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 subroutine psb_lc_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
 #ifdef MPI_MOD
   use mpi
@@ -290,7 +290,7 @@ subroutine psb_lc_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
        & acoo%ia(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val(nzl+1:nzl+iszr),acoo%ia(nzl+1:nzl+iszr),&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90
index b149ee61..9df69be5 100644
--- a/base/tools/psb_csphalo.F90
+++ b/base/tools/psb_csphalo.F90
@@ -57,7 +57,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
      &  rowscale,colscale,outfmt,data)
   use psb_base_mod, psb_protect_name => psb_csphalo
@@ -331,7 +331,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & iarcv,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & jarcv,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,iarcv,jarcv,rvsz,brvindx,ictxt,info)
 #else
@@ -423,7 +423,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -766,7 +766,7 @@ Subroutine psb_lcsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -1117,7 +1117,7 @@ Subroutine psb_lc_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
diff --git a/base/tools/psb_d_glob_transpose.F90 b/base/tools/psb_d_glob_transpose.F90
index 909f635e..e7fd5c21 100644
--- a/base/tools/psb_d_glob_transpose.F90
+++ b/base/tools/psb_d_glob_transpose.F90
@@ -81,7 +81,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 subroutine psb_ld_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
 #ifdef MPI_MOD
   use mpi
@@ -290,7 +290,7 @@ subroutine psb_ld_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
        & acoo%ia(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val(nzl+1:nzl+iszr),acoo%ia(nzl+1:nzl+iszr),&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90
index 2d490d8a..55d99fc4 100644
--- a/base/tools/psb_dsphalo.F90
+++ b/base/tools/psb_dsphalo.F90
@@ -57,7 +57,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
      &  rowscale,colscale,outfmt,data)
   use psb_base_mod, psb_protect_name => psb_dsphalo
@@ -331,7 +331,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & iarcv,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & jarcv,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,iarcv,jarcv,rvsz,brvindx,ictxt,info)
 #else
@@ -423,7 +423,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -766,7 +766,7 @@ Subroutine psb_ldsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -1117,7 +1117,7 @@ Subroutine psb_ld_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
diff --git a/base/tools/psb_s_glob_transpose.F90 b/base/tools/psb_s_glob_transpose.F90
index a75b4272..be1f2c20 100644
--- a/base/tools/psb_s_glob_transpose.F90
+++ b/base/tools/psb_s_glob_transpose.F90
@@ -81,7 +81,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 subroutine psb_ls_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
 #ifdef MPI_MOD
   use mpi
@@ -290,7 +290,7 @@ subroutine psb_ls_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
        & acoo%ia(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val(nzl+1:nzl+iszr),acoo%ia(nzl+1:nzl+iszr),&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90
index a66ee0db..67677922 100644
--- a/base/tools/psb_ssphalo.F90
+++ b/base/tools/psb_ssphalo.F90
@@ -57,7 +57,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
      &  rowscale,colscale,outfmt,data)
   use psb_base_mod, psb_protect_name => psb_ssphalo
@@ -331,7 +331,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & iarcv,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & jarcv,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,iarcv,jarcv,rvsz,brvindx,ictxt,info)
 #else
@@ -423,7 +423,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -766,7 +766,7 @@ Subroutine psb_lssphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -1117,7 +1117,7 @@ Subroutine psb_ls_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
diff --git a/base/tools/psb_z_glob_transpose.F90 b/base/tools/psb_z_glob_transpose.F90
index 79f4e408..18e30234 100644
--- a/base/tools/psb_z_glob_transpose.F90
+++ b/base/tools/psb_z_glob_transpose.F90
@@ -81,7 +81,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 subroutine psb_lz_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
 #ifdef MPI_MOD
   use mpi
@@ -290,7 +290,7 @@ subroutine psb_lz_coo_glob_transpose(ain,desc_r,info,atrans,desc_c,desc_rx)
        & acoo%ia(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val(nzl+1:nzl+iszr),acoo%ia(nzl+1:nzl+iszr),&
        & acoo%ja(nzl+1:nzl+iszr),rvsz,brvindx,ictxt,info)
diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90
index a1dd8d82..60e066c1 100644
--- a/base/tools/psb_zsphalo.F90
+++ b/base/tools/psb_zsphalo.F90
@@ -57,7 +57,7 @@
 !
 #undef  SP_A2AV_MPI
 #undef  SP_A2AV_XI
-#define SP_A2AV_MAT
+#define SP_A2AV_TRIAD
 Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
      &  rowscale,colscale,outfmt,data)
   use psb_base_mod, psb_protect_name => psb_zsphalo
@@ -331,7 +331,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & iarcv,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & jarcv,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,iarcv,jarcv,rvsz,brvindx,ictxt,info)
 #else
@@ -423,7 +423,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -766,7 +766,7 @@ Subroutine psb_lzsphalo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else
@@ -1117,7 +1117,7 @@ Subroutine psb_lz_csr_halo(a,desc_a,blk,info,rowcnv,colcnv,&
        & acoo%ia,rvsz,brvindx,ictxt,info)
   if (info == psb_success_) call psb_simple_a2av(jasnd,sdsz,bsdindx,&
        & acoo%ja,rvsz,brvindx,ictxt,info)
-#elif defined(SP_A2AV_MAT)
+#elif defined(SP_A2AV_TRIAD)
   call psb_simple_triad_a2av(valsnd,iasnd,jasnd,sdsz,bsdindx,&
        & acoo%val,acoo%ia,acoo%ja,rvsz,brvindx,ictxt,info)
 #else