diff --git a/test/fileread/Makefile b/test/fileread/Makefile
index 2511b870..9173754c 100644
--- a/test/fileread/Makefile
+++ b/test/fileread/Makefile
@@ -10,36 +10,36 @@ LDLIBS=$(PSBLDLIBS)
 
 FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
 
-SFOBJS=getp.o  sf_sample.o   
-DFOBJS=getp.o  df_sample.o   
-CFOBJS=getp.o  cf_sample.o   
-ZFOBJS=getp.o  zf_sample.o   
+SFOBJS=getp.o  psb_sf_sample.o   
+DFOBJS=getp.o  psb_df_sample.o   
+CFOBJS=getp.o  psb_cf_sample.o   
+ZFOBJS=getp.o  psb_zf_sample.o   
 
 EXEDIR=./runs
 
-all: sf_sample df_sample cf_sample zf_sample 
+all: psb_sf_sample psb_df_sample psb_cf_sample psb_zf_sample 
 
-sf_sample.o df_sample.o cf_sample.o zf_sample.o: getp.o
+psb_sf_sample.o psb_df_sample.o psb_cf_sample.o psb_zf_sample.o: getp.o
 
-sf_sample: $(SFOBJS)
-	$(F90LINK) $(LOPT) $(SFOBJS) -o sf_sample $(PSBLAS_LIB) $(LDLIBS) 
-	/bin/mv sf_sample $(EXEDIR) 
-df_sample: $(DFOBJS)
-	$(F90LINK) $(LOPT) $(DFOBJS) -o df_sample $(PSBLAS_LIB) $(LDLIBS) 
-	/bin/mv df_sample $(EXEDIR) 
-cf_sample: $(CFOBJS)
-	$(F90LINK) $(LOPT) $(CFOBJS) -o cf_sample $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv cf_sample $(EXEDIR) 
-zf_sample: $(ZFOBJS)
-	$(F90LINK) $(LOPT) $(ZFOBJS) -o zf_sample $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv zf_sample $(EXEDIR) 
+psb_sf_sample: $(SFOBJS)
+	$(F90LINK) $(LOPT) $(SFOBJS) -o psb_sf_sample $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv psb_sf_sample $(EXEDIR) 
+psb_df_sample: $(DFOBJS)
+	$(F90LINK) $(LOPT) $(DFOBJS) -o psb_df_sample $(PSBLAS_LIB) $(LDLIBS) 
+	/bin/mv psb_df_sample $(EXEDIR) 
+psb_cf_sample: $(CFOBJS)
+	$(F90LINK) $(LOPT) $(CFOBJS) -o psb_cf_sample $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_cf_sample $(EXEDIR) 
+psb_zf_sample: $(ZFOBJS)
+	$(F90LINK) $(LOPT) $(ZFOBJS) -o psb_zf_sample $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_zf_sample $(EXEDIR) 
 
 .f90.o:
 	$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 
 clean: 
 	/bin/rm -f $(DFOBJS) $(ZFOBJS) $(SFOBJS) $(CFOBJS)\
-        *$(.mod) $(EXEDIR)/df_sample $(EXEDIR)/zf_sample  
+        *$(.mod) $(EXEDIR)/psb_*f_sample 
 
 lib:
 	(cd ../../; make library)
diff --git a/test/fileread/cf_sample.f90 b/test/fileread/psb_cf_sample.f90
similarity index 99%
rename from test/fileread/cf_sample.f90
rename to test/fileread/psb_cf_sample.f90
index 3694a763..e16b5c1e 100644
--- a/test/fileread/cf_sample.f90
+++ b/test/fileread/psb_cf_sample.f90
@@ -29,7 +29,7 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-program cf_sample
+program psb_cf_sample
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
@@ -90,7 +90,7 @@ program cf_sample
   endif
 
 
-  name='cf_sample'
+  name='psb_cf_sample'
   if(psb_get_errstatus() /= 0) goto 9999
   info=psb_success_
   call psb_set_errverbosity(itwo)
@@ -320,7 +320,7 @@ program cf_sample
 9999 call psb_error(ictxt)
 
   stop
-end program cf_sample
+end program psb_cf_sample
   
 
 
diff --git a/test/fileread/df_sample.f90 b/test/fileread/psb_df_sample.f90
similarity index 99%
rename from test/fileread/df_sample.f90
rename to test/fileread/psb_df_sample.f90
index 39ed1b88..4b5df505 100644
--- a/test/fileread/df_sample.f90
+++ b/test/fileread/psb_df_sample.f90
@@ -29,7 +29,7 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-program df_sample
+program psb_df_sample
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
@@ -91,7 +91,7 @@ program df_sample
   endif
 
 
-  name='df_sample'
+  name='psb_df_sample'
   if(psb_get_errstatus() /= 0) goto 9999
   info=psb_success_
   call psb_set_errverbosity(itwo)
@@ -332,7 +332,7 @@ program df_sample
 9999 call psb_error(ictxt)
 
   stop
-end program df_sample
+end program psb_df_sample
   
 
 
diff --git a/test/fileread/sf_sample.f90 b/test/fileread/psb_sf_sample.f90
similarity index 99%
rename from test/fileread/sf_sample.f90
rename to test/fileread/psb_sf_sample.f90
index e35fba3b..7c2da41d 100644
--- a/test/fileread/sf_sample.f90
+++ b/test/fileread/psb_sf_sample.f90
@@ -29,7 +29,7 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-program sf_sample
+program psb_sf_sample
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
@@ -91,7 +91,7 @@ program sf_sample
   endif
 
 
-  name='sf_sample'
+  name='psb_sf_sample'
   if(psb_get_errstatus() /= 0) goto 9999
   info=psb_success_
   call psb_set_errverbosity(itwo)
@@ -325,7 +325,7 @@ program sf_sample
 9999 call psb_error(ictxt)
 
   stop
-end program sf_sample
+end program psb_sf_sample
   
 
 
diff --git a/test/fileread/zf_sample.f90 b/test/fileread/psb_zf_sample.f90
similarity index 99%
rename from test/fileread/zf_sample.f90
rename to test/fileread/psb_zf_sample.f90
index a1e39e44..6b6aebb4 100644
--- a/test/fileread/zf_sample.f90
+++ b/test/fileread/psb_zf_sample.f90
@@ -29,7 +29,7 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-program zf_sample
+program psb_zf_sample
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
@@ -90,7 +90,7 @@ program zf_sample
   endif
 
 
-  name='zf_sample'
+  name='psb_zf_sample'
   if(psb_get_errstatus() /= 0) goto 9999
   info=psb_success_
   call psb_set_errverbosity(itwo)
@@ -321,7 +321,7 @@ program zf_sample
 
   stop
   
-end program zf_sample
+end program psb_zf_sample
   
 
 
diff --git a/test/pargen/Makefile b/test/pargen/Makefile
index fe66768b..bd1af001 100644
--- a/test/pargen/Makefile
+++ b/test/pargen/Makefile
@@ -15,31 +15,31 @@ FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
 
 EXEDIR=./runs
 
-all: ppde3d spde3d ppde2d spde2d
+all: psb_d_pde3d psb_s_pde3d psb_d_pde2d psb_s_pde2d
 
 
-ppde3d: ppde3d.o 
-	$(F90LINK)  ppde3d.o -o ppde3d $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv ppde3d $(EXEDIR)
+psb_d_pde3d: psb_d_pde3d.o 
+	$(F90LINK)  psb_d_pde3d.o -o psb_d_pde3d $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_d_pde3d $(EXEDIR)
 
 
-spde3d: spde3d.o 
-	$(F90LINK) spde3d.o  -o spde3d $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv spde3d $(EXEDIR)
+psb_s_pde3d: psb_s_pde3d.o 
+	$(F90LINK) psb_s_pde3d.o  -o psb_s_pde3d $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_s_pde3d $(EXEDIR)
 
-ppde2d: ppde2d.o 
-	$(F90LINK)  ppde2d.o -o ppde2d $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv ppde2d $(EXEDIR)
+psb_d_pde2d: psb_d_pde2d.o 
+	$(F90LINK)  psb_d_pde2d.o -o psb_d_pde2d $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_d_pde2d $(EXEDIR)
 
 
-spde2d: spde2d.o 
-	$(F90LINK) spde2d.o  -o spde2d $(PSBLAS_LIB) $(LDLIBS)
-	/bin/mv spde2d $(EXEDIR)
+psb_s_pde2d: psb_s_pde2d.o 
+	$(F90LINK) psb_s_pde2d.o  -o psb_s_pde2d $(PSBLAS_LIB) $(LDLIBS)
+	/bin/mv psb_s_pde2d $(EXEDIR)
 
 
 clean: 
-	/bin/rm -f ppde3d.o spde3d.o  ppde2d.o spde2d.o *$(.mod) \
-	$(EXEDIR)/ppde3d $(EXEDIR)/spde3d $(EXEDIR)/ppde2d $(EXEDIR)/spde2d 
+	/bin/rm -f psb_d_pde3d.o psb_s_pde3d.o  psb_d_pde2d.o psb_s_pde2d.o *$(.mod) \
+	$(EXEDIR)/psb_d_pde3d $(EXEDIR)/psb_s_pde3d $(EXEDIR)/psb_d_pde2d $(EXEDIR)/psb_s_pde2d 
 verycleanlib: 
 	(cd ../..; make veryclean)
 lib:
diff --git a/test/pargen/ppde2d.f90 b/test/pargen/psb_d_pde2d.f90
similarity index 98%
rename from test/pargen/ppde2d.f90
rename to test/pargen/psb_d_pde2d.f90
index 5f072f3c..7511bf89 100644
--- a/test/pargen/ppde2d.f90
+++ b/test/pargen/psb_d_pde2d.f90
@@ -29,9 +29,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-! File: ppde2d.f90
+! File: psb_d_pde2d.f90
 !
-! Program: ppde2d
+! Program: psb_d_pde2d
 ! This sample program solves a linear system obtained by discretizing a
 ! PDE with Dirichlet BCs. 
 ! 
@@ -55,7 +55,7 @@
 ! then the corresponding vector is distributed according to a BLOCK
 ! data distribution.
 !
-module ppde2d_mod
+module psb_d_pde2d_mod
 contains
 
   !
@@ -103,14 +103,14 @@ contains
     end if
   end function g
 
-end module ppde2d_mod
+end module psb_d_pde2d_mod
 
-program ppde2d
+program psb_d_pde2d
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
   use psb_util_mod
-  use ppde2d_mod
+  use psb_d_pde2d_mod
   implicit none
 
   ! input parameters
@@ -360,6 +360,6 @@ contains
     write(iout,*)'               >= 1 do tracing every itrace'
     write(iout,*)'               iterations ' 
   end subroutine pr_usage
-end program ppde2d
+end program psb_d_pde2d
 
 
diff --git a/test/pargen/ppde3d.f90 b/test/pargen/psb_d_pde3d.f90
similarity index 98%
rename from test/pargen/ppde3d.f90
rename to test/pargen/psb_d_pde3d.f90
index b2cf7fb0..01bf641a 100644
--- a/test/pargen/ppde3d.f90
+++ b/test/pargen/psb_d_pde3d.f90
@@ -29,9 +29,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-! File: ppde3d.f90
+! File: psb_d_pde3d.f90
 !
-! Program: ppde3d
+! Program: psb_d_pde3d
 ! This sample program solves a linear system obtained by discretizing a
 ! PDE with Dirichlet BCs. 
 ! 
@@ -55,7 +55,7 @@
 ! then the corresponding vector is distributed according to a BLOCK
 ! data distribution.
 !
-module ppde3d_mod
+module psb_d_pde3d_mod
 contains
   !
   ! functions parametrizing the differential equation 
@@ -114,14 +114,14 @@ contains
     end if
   end function g
 
-end module ppde3d_mod
+end module psb_d_pde3d_mod
 
-program ppde3d
+program psb_d_pde3d
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
   use psb_util_mod
-  use ppde3d_mod
+  use psb_d_pde3d_mod
   implicit none
 
   ! input parameters
@@ -377,6 +377,6 @@ contains
     write(iout,*)'               iterations ' 
   end subroutine pr_usage
 
-end program ppde3d
+end program psb_d_pde3d
 
 
diff --git a/test/pargen/spde2d.f90 b/test/pargen/psb_s_pde2d.f90
similarity index 98%
rename from test/pargen/spde2d.f90
rename to test/pargen/psb_s_pde2d.f90
index 7f637219..9709634e 100644
--- a/test/pargen/spde2d.f90
+++ b/test/pargen/psb_s_pde2d.f90
@@ -29,9 +29,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-! File: spde2d.f90
+! File: psb_s_pde2d.f90
 !
-! Program: spde2d
+! Program: psb_s_pde2d
 ! This sample program solves a linear system obtained by discretizing a
 ! PDE with Dirichlet BCs. 
 ! 
@@ -55,7 +55,7 @@
 ! then the corresponding vector is distributed according to a BLOCK
 ! data distribution.
 !
-module spde2d_mod
+module psb_s_pde2d_mod
 contains
   !
   ! functions parametrizing the differential equation 
@@ -102,14 +102,14 @@ contains
     end if
   end function g
 
-end module spde2d_mod
+end module psb_s_pde2d_mod
 
-program spde2d
+program psb_s_pde2d
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
   use psb_util_mod
-  use spde2d_mod
+  use psb_s_pde2d_mod
   implicit none
 
   ! input parameters
@@ -359,6 +359,6 @@ contains
     write(iout,*)'               iterations ' 
   end subroutine pr_usage
 
-end program spde2d
+end program psb_s_pde2d
 
 
diff --git a/test/pargen/spde3d.f90 b/test/pargen/psb_s_pde3d.f90
similarity index 98%
rename from test/pargen/spde3d.f90
rename to test/pargen/psb_s_pde3d.f90
index d840e7e8..e9c52d69 100644
--- a/test/pargen/spde3d.f90
+++ b/test/pargen/psb_s_pde3d.f90
@@ -29,9 +29,9 @@
 !!$  POSSIBILITY OF SUCH DAMAGE.
 !!$ 
 !!$  
-! File: spde3d.f90
+! File: psb_s_pde3d.f90
 !
-! Program: spde3d
+! Program: psb_s_pde3d
 ! This sample program solves a linear system obtained by discretizing a
 ! PDE with Dirichlet BCs. 
 ! 
@@ -56,7 +56,7 @@
 ! data distribution.
 !
 !
-module spde3d_mod
+module psb_s_pde3d_mod
 contains
   
   !
@@ -115,14 +115,14 @@ contains
       g = exp(y**2-z**2)
     end if
   end function g
-end module spde3d_mod
+end module psb_s_pde3d_mod
 
-program spde3d
+program psb_s_pde3d
   use psb_base_mod
   use psb_prec_mod
   use psb_krylov_mod
   use psb_util_mod
-  use spde3d_mod
+  use psb_s_pde3d_mod
   implicit none
 
   ! input parameters
@@ -374,6 +374,6 @@ contains
     write(iout,*)'               iterations ' 
   end subroutine pr_usage
 
-end program spde3d
+end program psb_s_pde3d