diff --git a/.gitignore b/.gitignore
index 3297d5bad697e0e25b0a39ea3379dcce8dc52a6e..fb2b46df00004c1d168cbeaf4953960721fa212b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,10 +45,10 @@ Makefile.in
 /tests/pio_cksum_nc4.test
 /tests/pio_cksum_writer.test
 /tests/pio_write_deco2d_run
-/tests/pio_write_deco2d_run_parallel.test
+/tests/pio_write_deco2d_run.parallel.test
 /tests/pio_write_dist_array.test
 /tests/pio_write_run
-/tests/pio_write_run_parallel.test
+/tests/pio_write_run.parallel.test
 /tests/test_byteswap_run
 /tests/test_cdf_const
 /tests/test_cdf_transformation
@@ -89,11 +89,11 @@ Makefile
 /examples/pio/*.parallel.F90
 /examples/pio/*.parallel.c
 /examples/pio/collectData
+/examples/pio/collectData.parallel
 /examples/pio/collectData2003
-/examples/pio/collectData2003_parallel
+/examples/pio/collectData2003.parallel
 /examples/pio/collectDataNStreams
-/examples/pio/collectDataNStreams_parallel
-/examples/pio/collectData_parallel
+/examples/pio/collectDataNStreams.parallel
 /examples/pio/compareResourcesArray
 /interfaces/CdiInfo
 /interfaces/python/*.pyc
@@ -142,9 +142,9 @@ Makefile
 /tests/cksum_write
 /tests/cksum_write_chunk
 /tests/pio_write
+/tests/pio_write.parallel
 /tests/pio_write_deco2d
-/tests/pio_write_deco2d_parallel
-/tests/pio_write_parallel
+/tests/pio_write_deco2d.parallel
 /tests/test_byteswap
 /tests/test_cdf_read
 /tests/test_cdf_write
diff --git a/configure.ac b/configure.ac
index dc83d74ec1bc5b5b5f9adf80cf2906efd17afcd1..cf3b3c6d4ed1cbe5bacbbc5a838cdb4a6dda267a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -682,10 +682,10 @@ AC_CONFIG_FILES([
   tests/pio_cksum_nc4.test
   tests/pio_cksum_writer.test
   tests/pio_write_deco2d_run
-  tests/pio_write_deco2d_run_parallel.test
+  tests/pio_write_deco2d_run.parallel.test
   tests/pio_write_dist_array.test
   tests/pio_write_run
-  tests/pio_write_run_parallel.test
+  tests/pio_write_run.parallel.test
   tests/test_byteswap_run
   tests/test_cdf_const
   tests/test_cdf_transformation
diff --git a/examples/pio/Makefile.am b/examples/pio/Makefile.am
index 05cf8ee6ef61354e92638d565043fb64214ca46e..6a6749e4af7b87c4af3c88d9cb8055f6a686370f 100644
--- a/examples/pio/Makefile.am
+++ b/examples/pio/Makefile.am
@@ -7,8 +7,8 @@ EXTRA_PROGRAMS = \
 
 if ENABLE_MPI
 EXTRA_PROGRAMS += \
-  collectDataNStreams_parallel \
-  collectData_parallel \
+  collectData.parallel \
+  collectDataNStreams.parallel \
   compareResourcesArray
 endif ENABLE_MPI
 
@@ -17,7 +17,7 @@ if BUILD_FC_PROGRAMS
 EXTRA_PROGRAMS += collectData2003
 endif BUILD_FC_PROGRAMS
 if BUILD_PIO_FC_PROGRAMS
-EXTRA_PROGRAMS += collectData2003_parallel
+EXTRA_PROGRAMS += collectData2003.parallel
 endif BUILD_PIO_FC_PROGRAMS
 endif ENABLE_CF_INTERFACE
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c5474bca7975af9abae58a33ecdbc772b8f66131..a7713cc1ad8faca8288929d17a4067adf59e86ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,9 +34,9 @@ TESTS += \
   pio_cksum_nc2.test \
   pio_cksum_nc4.test \
   pio_cksum_writer.test \
-  pio_write_deco2d_run_parallel.test \
+  pio_write_deco2d_run.parallel.test \
   pio_write_dist_array.test \
-  pio_write_run_parallel.test \
+  pio_write_run.parallel.test \
   test_resource_copy_mpi_run.test
 
 if !with_concurrent_mpi_checks
@@ -50,10 +50,10 @@ pio_cksum_nc.log: pio_cksum_mpinonb.log
 pio_cksum_nc2.log: pio_cksum_nc.log
 pio_cksum_nc4.log: pio_cksum_nc2.log
 pio_cksum_writer.log: pio_cksum_nc4.log
-pio_write_deco2d_run_parallel.log: pio_cksum_writer.log
-pio_write_dist_array.log: pio_write_deco2d_run_parallel.log
-pio_write_run_parallel.log: pio_write_dist_array.log
-test_resource_copy_mpi_run.log: pio_write_run_parallel.log
+pio_write_deco2d_run.parallel.log: pio_cksum_writer.log
+pio_write_dist_array.log: pio_write_deco2d_run.parallel.log
+pio_write_run.parallel.log: pio_write_dist_array.log
+test_resource_copy_mpi_run.log: pio_write_run.parallel.log
 endif !with_concurrent_mpi_checks
 
 test_PROGRAMS_ = \
@@ -78,8 +78,8 @@ endif
 
 if ENABLE_MPI
 test_PROGRAMS_ += \
-  pio_write_deco2d_parallel \
-  pio_write_parallel \
+  pio_write.parallel \
+  pio_write_deco2d.parallel \
   test_resource_copy_mpi
 endif ENABLE_MPI
 
diff --git a/tests/pio_write_deco2d_run_parallel.test.in b/tests/pio_write_deco2d_run.parallel.test.in
similarity index 71%
rename from tests/pio_write_deco2d_run_parallel.test.in
rename to tests/pio_write_deco2d_run.parallel.test.in
index cd7fd333664700bd5002f9213413e4835a8ab3aa..e82ed9a2c23348ed85ff74bb0d12b056c4374f4a 100644
--- a/tests/pio_write_deco2d_run_parallel.test.in
+++ b/tests/pio_write_deco2d_run.parallel.test.in
@@ -2,7 +2,7 @@
 
 suffix=grb
 mpi_task_num=6
-pio_write=./pio_write_deco2d_parallel
+pio_write=./pio_write_deco2d.parallel
 
 . ./pio_write_run
 #
diff --git a/tests/pio_write_run.in b/tests/pio_write_run.in
index 0a17fcbbbec92d87ecdb9478d495c4431a07201e..4f15cd8e3b19549c46b95edc6dd42e8f8130436b 100644
--- a/tests/pio_write_run.in
+++ b/tests/pio_write_run.in
@@ -6,7 +6,7 @@ suffix=${suffix-grb}
 if ${mpi_task_num+:} false; then
   @ENABLE_MPI_FALSE@exit 77
   test 'x@MPI_LAUNCH@' != xtrue || exit 77
-  pio_write=${pio_write-'./pio_write_parallel'}
+  pio_write=${pio_write-'./pio_write.parallel'}
   variations=${variations-"'' -qno-batch-rma -qcache-redists -qcreate-curvilinear-grid -qpreset-decomposition=true"}
   launch="@MPI_LAUNCH@ -n ${mpi_task_num} ${tool_wrap_mpi}"
 else
diff --git a/tests/pio_write_run_parallel.test.in b/tests/pio_write_run.parallel.test.in
similarity index 100%
rename from tests/pio_write_run_parallel.test.in
rename to tests/pio_write_run.parallel.test.in