2008-02-01 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mptests/mp01/node1/Makefile.am, mptests/mp01/node2/Makefile.am,
	mptests/mp02/node1/Makefile.am, mptests/mp02/node2/Makefile.am,
	mptests/mp03/node1/Makefile.am, mptests/mp03/node2/Makefile.am,
	mptests/mp04/node1/Makefile.am, mptests/mp04/node2/Makefile.am,
	mptests/mp05/node1/Makefile.am, mptests/mp05/node2/Makefile.am,
	mptests/mp06/node1/Makefile.am, mptests/mp06/node2/Makefile.am,
	mptests/mp07/node1/Makefile.am, mptests/mp07/node2/Makefile.am,
	mptests/mp08/node1/Makefile.am, mptests/mp08/node2/Makefile.am,
	mptests/mp09/node1/Makefile.am, mptests/mp09/node2/Makefile.am,
	mptests/mp10/node1/Makefile.am, mptests/mp10/node2/Makefile.am,
	mptests/mp11/node1/Makefile.am, mptests/mp11/node2/Makefile.am,
	mptests/mp12/node1/Makefile.am, mptests/mp12/node2/Makefile.am,
	mptests/mp13/node1/Makefile.am, mptests/mp13/node2/Makefile.am,
	mptests/mp14/node1/Makefile.am, mptests/mp14/node2/Makefile.am,
	samples/base_mp/node1/Makefile.am, samples/base_mp/node2/Makefile.am,
	samples/base_sp/Makefile.am, samples/hello/Makefile.am,
	samples/nsecs/Makefile.am, samples/ticker/Makefile.am,
	sptests/sp01/Makefile.am, sptests/sp02/Makefile.am,
	sptests/sp03/Makefile.am, sptests/sp04/Makefile.am,
	sptests/sp05/Makefile.am, sptests/sp06/Makefile.am,
	sptests/sp07/Makefile.am, sptests/sp08/Makefile.am,
	sptests/sp09/Makefile.am, sptests/sp11/Makefile.am,
	sptests/sp12/Makefile.am, sptests/sp13/Makefile.am,
	sptests/sp14/Makefile.am, sptests/sp15/Makefile.am,
	sptests/sp16/Makefile.am, sptests/sp17/Makefile.am,
	sptests/sp19/Makefile.am, sptests/sp20/Makefile.am,
	sptests/sp22/Makefile.am, sptests/sp23/Makefile.am,
	sptests/sp24/Makefile.am, sptests/sp25/Makefile.am,
	tmtests/tm01/Makefile.am, tmtests/tm02/Makefile.am,
	tmtests/tm03/Makefile.am, tmtests/tm04/Makefile.am,
	tmtests/tm05/Makefile.am, tmtests/tm06/Makefile.am,
	tmtests/tm07/Makefile.am, tmtests/tm08/Makefile.am,
	tmtests/tm09/Makefile.am, tmtests/tm10/Makefile.am,
	tmtests/tm11/Makefile.am, tmtests/tm12/Makefile.am,
	tmtests/tm13/Makefile.am, tmtests/tm14/Makefile.am,
	tmtests/tm15/Makefile.am, tmtests/tm16/Makefile.am,
	tmtests/tm17/Makefile.am, tmtests/tm18/Makefile.am,
	tmtests/tm19/Makefile.am, tmtests/tm20/Makefile.am,
	tmtests/tm21/Makefile.am, tmtests/tm22/Makefile.am,
	tmtests/tm23/Makefile.am, tmtests/tm24/Makefile.am,
	tmtests/tm25/Makefile.am, tmtests/tm28/Makefile.am,
	tmtests/tm29/Makefile.am, tmtests/tmck/Makefile.am,
	tmtests/tmoverhd/Makefile.am: Make all test names unique. All needed
	ada_ as prefix to distinguish them from the C tests. MP tests should
	produce an executable with test name and node number in it. Screens
	renamed to follow.
	* ada_mvscn, mptests/mp01/node1/ada_mp01-node1.scn,
	mptests/mp01/node2/ada_mp01-node2.scn,
	mptests/mp02/node1/ada_mp02-node1.scn,
	mptests/mp02/node2/ada_mp02-node2.scn,
	mptests/mp03/node1/ada_mp03-node1.scn,
	mptests/mp03/node2/ada_mp03-node2.scn,
	mptests/mp04/node1/ada_mp04-node1.scn,
	mptests/mp04/node2/ada_mp04-node2.scn,
	mptests/mp05/node1/ada_mp05-node1.scn,
	mptests/mp05/node2/ada_mp05-node2.scn,
	mptests/mp06/node1/ada_mp06-node1.scn,
	mptests/mp06/node2/ada_mp06-node2.scn,
	mptests/mp07/node1/ada_mp07-node1.scn,
	mptests/mp07/node2/ada_mp07-node2.scn,
	mptests/mp08/node1/ada_mp08-node1.scn,
	mptests/mp08/node2/ada_mp08-node2.scn,
	mptests/mp09/node1/ada_mp09-node1.scn,
	mptests/mp09/node2/ada_mp09-node2.scn,
	mptests/mp10/node1/ada_mp10-node1.scn,
	mptests/mp10/node2/ada_mp10-node2.scn,
	mptests/mp11/node1/ada_mp11-node1.scn,
	mptests/mp11/node2/ada_mp11-node2.scn,
	mptests/mp12/node1/ada_mp12-node1.scn,
	mptests/mp12/node2/ada_mp12-node2.scn,
	mptests/mp13/node1/ada_mp13-node1.scn,
	mptests/mp13/node2/ada_mp13-node2.scn,
	mptests/mp14/node1/ada_mp14-node1.scn,
	mptests/mp14/node2/ada_mp14-node2.scn,
	samples/base_mp/node1/ada_base_mp-node1.scn,
	samples/base_mp/node2/ada_base_mp-node2.scn,
	samples/base_sp/ada_base_sp.scn, samples/hello/ada_hello.scn,
	samples/nsecs/ada_nsecs.scn, samples/ticker/ada_ticker.scn,
	sptests/sp01/ada_sp01.scn, sptests/sp02/ada_sp02.scn,
	sptests/sp03/ada_sp03.scn, sptests/sp04/ada_sp04.scn,
	sptests/sp05/ada_sp05.scn, sptests/sp06/ada_sp06.scn,
	sptests/sp07/ada_sp07.scn, sptests/sp08/ada_sp08.scn,
	sptests/sp09/ada_sp09.scn, sptests/sp11/ada_sp11.scn,
	sptests/sp12/ada_sp12.scn, sptests/sp13/ada_sp13.scn,
	sptests/sp14/ada_sp14.scn, sptests/sp15/ada_sp15.scn,
	sptests/sp16/ada_sp16.scn, sptests/sp17/ada_sp17.scn,
	sptests/sp19/ada_sp19.scn, sptests/sp20/ada_sp20.scn,
	sptests/sp22/ada_sp22.scn, sptests/sp23/ada_sp23.scn,
	sptests/sp24/ada_sp24.scn, sptests/sp25/ada_sp25.scn: New files.
	* mptests/mp01/node1/mp01-node1.scn, mptests/mp01/node2/mp01-node2.scn,
	mptests/mp02/node1/mp02-node1.scn, mptests/mp02/node2/mp02-node2.scn,
	mptests/mp03/node1/mp03-node1.scn, mptests/mp03/node2/mp03-node2.scn,
	mptests/mp04/node1/mp04-node1.scn, mptests/mp04/node2/mp04-node2.scn,
	mptests/mp05/node1/mp05-node1.scn, mptests/mp05/node2/mp05-node2.scn,
	mptests/mp06/node1/mp06-node1.scn, mptests/mp06/node2/mp06-node2.scn,
	mptests/mp07/node1/mp07-node1.scn, mptests/mp07/node2/mp07-node2.scn,
	mptests/mp08/node1/mp08-node1.scn, mptests/mp08/node2/mp08-node2.scn,
	mptests/mp09/node1/mp09-node1.scn, mptests/mp09/node2/mp09-node2.scn,
	mptests/mp10/node1/mp10-node1.scn, mptests/mp10/node2/mp10-node2.scn,
	mptests/mp11/node1/mp11-node1.scn, mptests/mp11/node2/mp11-node2.scn,
	mptests/mp12/node1/mp12-node1.scn, mptests/mp12/node2/mp12-node2.scn,
	mptests/mp13/node1/mp13-node1.scn, mptests/mp13/node2/mp13-node2.scn,
	mptests/mp14/node1/mp14-node1.scn, mptests/mp14/node2/mp14-node2.scn,
	samples/base_mp/node1/base_mp-node1.scn,
	samples/base_mp/node2/base_mp-node2.scn, samples/base_sp/base_sp.scn,
	samples/hello/hello.scn, samples/nsecs/nsecs.scn,
	samples/ticker/ticker.scn, sptests/sp01/sp01.scn,
	sptests/sp02/sp02.scn, sptests/sp03/sp03.scn, sptests/sp04/sp04.scn,
	sptests/sp05/sp05.scn, sptests/sp06/sp06.scn, sptests/sp07/sp07.scn,
	sptests/sp08/sp08.scn, sptests/sp09/sp09.scn, sptests/sp11/sp11.scn,
	sptests/sp12/sp12.scn, sptests/sp13/sp13.scn, sptests/sp14/sp14.scn,
	sptests/sp15/sp15.scn, sptests/sp16/sp16.scn, sptests/sp17/sp17.scn,
	sptests/sp19/sp19.scn, sptests/sp20/sp20.scn, sptests/sp22/sp22.scn,
	sptests/sp23/sp23.scn, sptests/sp24/sp24.scn, sptests/sp25/sp25.scn:
	Removed.

56 files changed, 140 insertions, 140 deletions

diff --git a/c/src/ada-tests/mptests/mp01/node1/Makefile.am b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
index 9a0baf526c..b82a3679e9 100644
--- a/c/src/ada-tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_node1.exe
-mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
-mp01_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node1.exe
+mp01_ada_mp01_node1_exe_SOURCES = mp01_node1.adb ../mptest.adb config.h ../mptest.ads
+mp01_ada_mp01_node1_exe_SOURCES += ../../../support/init.c
 
-mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node1.exe: mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp01-node1.scn
+dist_scn_DATA = ada_mp01-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node1/mp01-node1.scn b/c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn
index d7495bfa0d..d7495bfa0d 100644
--- a/c/src/ada-tests/mptests/mp01/node1/mp01-node1.scn
+++ b/c/src/ada-tests/mptests/mp01/node1/ada_mp01-node1.scn
diff --git a/c/src/ada-tests/mptests/mp01/node2/Makefile.am b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
index 94a28d69c2..f22ecd0563 100644
--- a/c/src/ada-tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp01/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp01_node2.exe
-mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
-mp01_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp01_ada_mp01_node2.exe
+mp01_ada_mp01_node2_exe_SOURCES = mp01_node2.adb ../mptest.adb config.h ../mptest.ads
+mp01_ada_mp01_node2_exe_SOURCES += ../../../support/init.c
 
-mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
+mp01_ada_mp01_node2.exe: mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp01-node2.scn
+dist_scn_DATA = ada_mp01-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp01/node2/mp01-node2.scn b/c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn
index 98047240f3..98047240f3 100644
--- a/c/src/ada-tests/mptests/mp01/node2/mp01-node2.scn
+++ b/c/src/ada-tests/mptests/mp01/node2/ada_mp01-node2.scn
diff --git a/c/src/ada-tests/mptests/mp02/node1/Makefile.am b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
index d789a7302b..bbe41e8839 100644
--- a/c/src/ada-tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_node1.exe
-mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
-mp02_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node1.exe
+mp02_ada_mp02_node1_exe_SOURCES = mp02_node1.adb ../mptest.adb config.h ../mptest.ads
+mp02_ada_mp02_node1_exe_SOURCES += ../../../support/init.c
 
-mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node1.exe: mp02_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp02-node1.scn
+dist_scn_DATA = ada_mp02-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp02/node1/mp02-node1.scn b/c/src/ada-tests/mptests/mp02/node1/ada_mp02-node1.scn
index 91b57321f7..91b57321f7 100644
--- a/c/src/ada-tests/mptests/mp02/node1/mp02-node1.scn
+++ b/c/src/ada-tests/mptests/mp02/node1/ada_mp02-node1.scn
diff --git a/c/src/ada-tests/mptests/mp02/node2/Makefile.am b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
index 2bb1fcc2ac..9cc3e697c1 100644
--- a/c/src/ada-tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp02/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp02_node2.exe
-mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
-mp02_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp02_ada_mp02_node2.exe
+mp02_ada_mp02_node2_exe_SOURCES = mp02_node2.adb ../mptest.adb config.h ../mptest.ads
+mp02_ada_mp02_node2_exe_SOURCES += ../../../support/init.c
 
-mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
+mp02_ada_mp02_node2.exe: mp02_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp02-node2.scn
+dist_scn_DATA = ada_mp02-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp02/node2/mp02-node2.scn b/c/src/ada-tests/mptests/mp02/node2/ada_mp02-node2.scn
index 14239a546d..14239a546d 100644
--- a/c/src/ada-tests/mptests/mp02/node2/mp02-node2.scn
+++ b/c/src/ada-tests/mptests/mp02/node2/ada_mp02-node2.scn
diff --git a/c/src/ada-tests/mptests/mp03/node1/Makefile.am b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
index 55a2f5ba56..d967338e20 100644
--- a/c/src/ada-tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_node1.exe
-mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
-mp03_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node1.exe
+mp03_ada_mp03_node1_exe_SOURCES = mp03_node1.adb ../mptest.adb config.h ../mptest.ads
+mp03_ada_mp03_node1_exe_SOURCES += ../../../support/init.c
 
-mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node1.exe: mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp03-node1.scn
+dist_scn_DATA = ada_mp03-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node1/mp03-node1.scn b/c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn
index d749db49e2..d749db49e2 100644
--- a/c/src/ada-tests/mptests/mp03/node1/mp03-node1.scn
+++ b/c/src/ada-tests/mptests/mp03/node1/ada_mp03-node1.scn
diff --git a/c/src/ada-tests/mptests/mp03/node2/Makefile.am b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
index bd7f0bb454..7120df7424 100644
--- a/c/src/ada-tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp03/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp03_node2.exe
-mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
-mp03_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp03_ada_mp03_node2.exe
+mp03_ada_mp03_node2_exe_SOURCES = mp03_node2.adb ../mptest.adb config.h ../mptest.ads
+mp03_ada_mp03_node2_exe_SOURCES += ../../../support/init.c
 
-mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
+mp03_ada_mp03_node2.exe: mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp03-node2.scn
+dist_scn_DATA = ada_mp03-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp03/node2/mp03-node2.scn b/c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn
index 56298f5b8d..56298f5b8d 100644
--- a/c/src/ada-tests/mptests/mp03/node2/mp03-node2.scn
+++ b/c/src/ada-tests/mptests/mp03/node2/ada_mp03-node2.scn
diff --git a/c/src/ada-tests/mptests/mp04/node1/Makefile.am b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
index 1b6ce682a9..1ab75e16e3 100644
--- a/c/src/ada-tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_node1.exe
-mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
-mp04_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node1.exe
+mp04_ada_mp04_node1_exe_SOURCES = mp04_node1.adb ../mptest.adb config.h ../mptest.ads
+mp04_ada_mp04_node1_exe_SOURCES += ../../../support/init.c
 
-mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node1.exe: mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp04-node1.scn
+dist_scn_DATA = ada_mp04-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node1/mp04-node1.scn b/c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn
index e9518f3ac2..e9518f3ac2 100644
--- a/c/src/ada-tests/mptests/mp04/node1/mp04-node1.scn
+++ b/c/src/ada-tests/mptests/mp04/node1/ada_mp04-node1.scn
diff --git a/c/src/ada-tests/mptests/mp04/node2/Makefile.am b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
index 77c1464fab..4a0a745645 100644
--- a/c/src/ada-tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp04/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp04_node2.exe
-mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
-mp04_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp04_ada_mp04_node2.exe
+mp04_ada_mp04_node2_exe_SOURCES = mp04_node2.adb ../mptest.adb config.h ../mptest.ads
+mp04_ada_mp04_node2_exe_SOURCES += ../../../support/init.c
 
-mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
+mp04_ada_mp04_node2.exe: mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp04-node2.scn
+dist_scn_DATA = ada_mp04-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp04/node2/mp04-node2.scn b/c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn
index 8ccfcfef79..8ccfcfef79 100644
--- a/c/src/ada-tests/mptests/mp04/node2/mp04-node2.scn
+++ b/c/src/ada-tests/mptests/mp04/node2/ada_mp04-node2.scn
diff --git a/c/src/ada-tests/mptests/mp05/node1/Makefile.am b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
index fcf501ae0a..bd9a3e7d0d 100644
--- a/c/src/ada-tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_node1.exe
-mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
-mp05_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node1.exe
+mp05_ada_mp05_node1_exe_SOURCES = mp05_node1.adb ../mptest.adb config.h ../mptest.ads
+mp05_ada_mp05_node1_exe_SOURCES += ../../../support/init.c
 
-mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node1.exe: mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp05-node1.scn
+dist_scn_DATA = ada_mp05-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node1/mp05-node1.scn b/c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn
index 6f0ea4b639..6f0ea4b639 100644
--- a/c/src/ada-tests/mptests/mp05/node1/mp05-node1.scn
+++ b/c/src/ada-tests/mptests/mp05/node1/ada_mp05-node1.scn
diff --git a/c/src/ada-tests/mptests/mp05/node2/Makefile.am b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
index a01750c7b4..9c19c7a969 100644
--- a/c/src/ada-tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp05/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp05_node2.exe
-mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
-mp05_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp05_ada_mp05_node2.exe
+mp05_ada_mp05_node2_exe_SOURCES = mp05_node2.adb ../mptest.adb config.h ../mptest.ads
+mp05_ada_mp05_node2_exe_SOURCES += ../../../support/init.c
 
-mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
+mp05_ada_mp05_node2.exe: mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp05-node2.scn
+dist_scn_DATA = ada_mp05-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp05/node2/mp05-node2.scn b/c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn
index 1fb18c132b..1fb18c132b 100644
--- a/c/src/ada-tests/mptests/mp05/node2/mp05-node2.scn
+++ b/c/src/ada-tests/mptests/mp05/node2/ada_mp05-node2.scn
diff --git a/c/src/ada-tests/mptests/mp06/node1/Makefile.am b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
index 01272824b0..48b3e68717 100644
--- a/c/src/ada-tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_node1.exe
-mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
-mp06_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node1.exe
+mp06_ada_mp06_node1_exe_SOURCES = mp06_node1.adb ../mptest.adb config.h ../mptest.ads
+mp06_ada_mp06_node1_exe_SOURCES += ../../../support/init.c
 
-mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node1.exe: mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp06-node1.scn
+dist_scn_DATA = ada_mp06-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node1/mp06-node1.scn b/c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn
index 71da651eca..71da651eca 100644
--- a/c/src/ada-tests/mptests/mp06/node1/mp06-node1.scn
+++ b/c/src/ada-tests/mptests/mp06/node1/ada_mp06-node1.scn
diff --git a/c/src/ada-tests/mptests/mp06/node2/Makefile.am b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
index 70f52d27b5..e435d02de0 100644
--- a/c/src/ada-tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp06/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp06_node2.exe
-mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
-mp06_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp06_ada_mp06_node2.exe
+mp06_ada_mp06_node2_exe_SOURCES = mp06_node2.adb ../mptest.adb config.h ../mptest.ads
+mp06_ada_mp06_node2_exe_SOURCES += ../../../support/init.c
 
-mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
+mp06_ada_mp06_node2.exe: mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp06-node2.scn
+dist_scn_DATA = ada_mp06-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp06/node2/mp06-node2.scn b/c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn
index da449041b4..da449041b4 100644
--- a/c/src/ada-tests/mptests/mp06/node2/mp06-node2.scn
+++ b/c/src/ada-tests/mptests/mp06/node2/ada_mp06-node2.scn
diff --git a/c/src/ada-tests/mptests/mp07/node1/Makefile.am b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
index b666a47704..e89099c58e 100644
--- a/c/src/ada-tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_node1.exe
-mp07_node1_exe_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
-mp07_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node1.exe
+mp07_ada_mp07_node1_exe_SOURCES = mp07_node1.adb ../mptest.adb config.h ../mptest.ads
+mp07_ada_mp07_node1_exe_SOURCES += ../../../support/init.c
 
-mp07_node1.exe: mp07_node1.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node1.exe: mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp07-node1.scn
+dist_scn_DATA = ada_mp07-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node1/mp07-node1.scn b/c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn
index 71e0956329..71e0956329 100644
--- a/c/src/ada-tests/mptests/mp07/node1/mp07-node1.scn
+++ b/c/src/ada-tests/mptests/mp07/node1/ada_mp07-node1.scn
diff --git a/c/src/ada-tests/mptests/mp07/node2/Makefile.am b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
index 5c7e0d6355..52f75305ae 100644
--- a/c/src/ada-tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp07/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp07_node2.exe
-mp07_node2_exe_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
-mp07_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp07_ada_mp07_node2.exe
+mp07_ada_mp07_node2_exe_SOURCES = mp07_node2.adb ../mptest.adb config.h ../mptest.ads
+mp07_ada_mp07_node2_exe_SOURCES += ../../../support/init.c
 
-mp07_node2.exe: mp07_node2.adb ../mptest.adb init.$(OBJEXT)
+mp07_ada_mp07_node2.exe: mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp07-node2.scn
+dist_scn_DATA = ada_mp07-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp07/node2/mp07-node2.scn b/c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn
index c31011e85c..c31011e85c 100644
--- a/c/src/ada-tests/mptests/mp07/node2/mp07-node2.scn
+++ b/c/src/ada-tests/mptests/mp07/node2/ada_mp07-node2.scn
diff --git a/c/src/ada-tests/mptests/mp08/node1/Makefile.am b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
index adb615c478..67113b0beb 100644
--- a/c/src/ada-tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_node1.exe
-mp08_node1_exe_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
-mp08_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node1.exe
+mp08_ada_mp08_node1_exe_SOURCES = mp08_node1.adb ../mptest.adb config.h ../mptest.ads
+mp08_ada_mp08_node1_exe_SOURCES += ../../../support/init.c
 
-mp08_node1.exe: mp08_node1.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node1.exe: mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp08-node1.scn
+dist_scn_DATA = ada_mp08-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node1/mp08-node1.scn b/c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn
index ba9f089e96..ba9f089e96 100644
--- a/c/src/ada-tests/mptests/mp08/node1/mp08-node1.scn
+++ b/c/src/ada-tests/mptests/mp08/node1/ada_mp08-node1.scn
diff --git a/c/src/ada-tests/mptests/mp08/node2/Makefile.am b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
index 716950cd56..9bf3b8fcc6 100644
--- a/c/src/ada-tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp08/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp08_node2.exe
-mp08_node2_exe_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
-mp08_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp08_ada_mp08_node2.exe
+mp08_ada_mp08_node2_exe_SOURCES = mp08_node2.adb ../mptest.adb config.h ../mptest.ads
+mp08_ada_mp08_node2_exe_SOURCES += ../../../support/init.c
 
-mp08_node2.exe: mp08_node2.adb ../mptest.adb init.$(OBJEXT)
+mp08_ada_mp08_node2.exe: mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp08-node2.scn
+dist_scn_DATA = ada_mp08-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp08/node2/mp08-node2.scn b/c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn
index 8ac712ae93..8ac712ae93 100644
--- a/c/src/ada-tests/mptests/mp08/node2/mp08-node2.scn
+++ b/c/src/ada-tests/mptests/mp08/node2/ada_mp08-node2.scn
diff --git a/c/src/ada-tests/mptests/mp09/node1/Makefile.am b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
index 20e85a89d7..eac91690a0 100644
--- a/c/src/ada-tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_node1.exe
-mp09_node1_exe_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
-mp09_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node1.exe
+mp09_ada_mp09_node1_exe_SOURCES = mp09_node1.adb ../mptest.adb config.h ../mptest.ads
+mp09_ada_mp09_node1_exe_SOURCES += ../../../support/init.c
 
-mp09_node1.exe: mp09_node1.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node1.exe: mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp09-node1.scn
+dist_scn_DATA = ada_mp09-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node1/mp09-node1.scn b/c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn
index 167d6e18a5..167d6e18a5 100644
--- a/c/src/ada-tests/mptests/mp09/node1/mp09-node1.scn
+++ b/c/src/ada-tests/mptests/mp09/node1/ada_mp09-node1.scn
diff --git a/c/src/ada-tests/mptests/mp09/node2/Makefile.am b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
index b1066a082b..09eaf4f384 100644
--- a/c/src/ada-tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp09/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp09_node2.exe
-mp09_node2_exe_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
-mp09_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp09_ada_mp09_node2.exe
+mp09_ada_mp09_node2_exe_SOURCES = mp09_node2.adb ../mptest.adb config.h ../mptest.ads
+mp09_ada_mp09_node2_exe_SOURCES += ../../../support/init.c
 
-mp09_node2.exe: mp09_node2.adb ../mptest.adb init.$(OBJEXT)
+mp09_ada_mp09_node2.exe: mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp09-node2.scn
+dist_scn_DATA = ada_mp09-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp09/node2/mp09-node2.scn b/c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn
index 4cd8a7bff7..4cd8a7bff7 100644
--- a/c/src/ada-tests/mptests/mp09/node2/mp09-node2.scn
+++ b/c/src/ada-tests/mptests/mp09/node2/ada_mp09-node2.scn
diff --git a/c/src/ada-tests/mptests/mp10/node1/Makefile.am b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
index ed89c9a1d8..040d4c469d 100644
--- a/c/src/ada-tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_node1.exe
-mp10_node1_exe_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
-mp10_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node1.exe
+mp10_ada_mp10_node1_exe_SOURCES = mp10_node1.adb ../mptest.adb config.h ../mptest.ads
+mp10_ada_mp10_node1_exe_SOURCES += ../../../support/init.c
 
-mp10_node1.exe: mp10_node1.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node1.exe: mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp10-node1.scn
+dist_scn_DATA = ada_mp10-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node1/mp10-node1.scn b/c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn
index deeafc0a9a..deeafc0a9a 100644
--- a/c/src/ada-tests/mptests/mp10/node1/mp10-node1.scn
+++ b/c/src/ada-tests/mptests/mp10/node1/ada_mp10-node1.scn
diff --git a/c/src/ada-tests/mptests/mp10/node2/Makefile.am b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
index 91f8f166b9..ec6045ef37 100644
--- a/c/src/ada-tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp10/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp10_node2.exe
-mp10_node2_exe_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
-mp10_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp10_ada_mp10_node2.exe
+mp10_ada_mp10_node2_exe_SOURCES = mp10_node2.adb ../mptest.adb config.h ../mptest.ads
+mp10_ada_mp10_node2_exe_SOURCES += ../../../support/init.c
 
-mp10_node2.exe: mp10_node2.adb ../mptest.adb init.$(OBJEXT)
+mp10_ada_mp10_node2.exe: mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp10-node2.scn
+dist_scn_DATA = ada_mp10-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp10/node2/mp10-node2.scn b/c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn
index c0337fdacf..c0337fdacf 100644
--- a/c/src/ada-tests/mptests/mp10/node2/mp10-node2.scn
+++ b/c/src/ada-tests/mptests/mp10/node2/ada_mp10-node2.scn
diff --git a/c/src/ada-tests/mptests/mp11/node1/Makefile.am b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
index 3ed4d91d55..c6303458a4 100644
--- a/c/src/ada-tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_node1.exe
-mp11_node1_exe_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
-mp11_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node1.exe
+mp11_ada_mp11_node1_exe_SOURCES = mp11_node1.adb ../mptest.adb config.h ../mptest.ads
+mp11_ada_mp11_node1_exe_SOURCES += ../../../support/init.c
 
-mp11_node1.exe: mp11_node1.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node1.exe: mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp11-node1.scn
+dist_scn_DATA = ada_mp11-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node1/mp11-node1.scn b/c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn
index 013426bf91..013426bf91 100644
--- a/c/src/ada-tests/mptests/mp11/node1/mp11-node1.scn
+++ b/c/src/ada-tests/mptests/mp11/node1/ada_mp11-node1.scn
diff --git a/c/src/ada-tests/mptests/mp11/node2/Makefile.am b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
index 44bbd7dc58..04a18553d2 100644
--- a/c/src/ada-tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp11/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp11_node2.exe
-mp11_node2_exe_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
-mp11_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp11_ada_mp11_node2.exe
+mp11_ada_mp11_node2_exe_SOURCES = mp11_node2.adb ../mptest.adb config.h ../mptest.ads
+mp11_ada_mp11_node2_exe_SOURCES += ../../../support/init.c
 
-mp11_node2.exe: mp11_node2.adb ../mptest.adb init.$(OBJEXT)
+mp11_ada_mp11_node2.exe: mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp11-node2.scn
+dist_scn_DATA = ada_mp11-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp11/node2/mp11-node2.scn b/c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn
index 49bd8a3219..49bd8a3219 100644
--- a/c/src/ada-tests/mptests/mp11/node2/mp11-node2.scn
+++ b/c/src/ada-tests/mptests/mp11/node2/ada_mp11-node2.scn
diff --git a/c/src/ada-tests/mptests/mp12/node1/Makefile.am b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
index 0411f007e5..bdc4297386 100644
--- a/c/src/ada-tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_node1.exe
-mp12_node1_exe_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
-mp12_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node1.exe
+mp12_ada_mp12_node1_exe_SOURCES = mp12_node1.adb ../mptest.adb config.h ../mptest.ads
+mp12_ada_mp12_node1_exe_SOURCES += ../../../support/init.c
 
-mp12_node1.exe: mp12_node1.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node1.exe: mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp12-node1.scn
+dist_scn_DATA = ada_mp12-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node1/mp12-node1.scn b/c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn
index 40646722eb..40646722eb 100644
--- a/c/src/ada-tests/mptests/mp12/node1/mp12-node1.scn
+++ b/c/src/ada-tests/mptests/mp12/node1/ada_mp12-node1.scn
diff --git a/c/src/ada-tests/mptests/mp12/node2/Makefile.am b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
index 2c526e02ad..8e12c7dfe8 100644
--- a/c/src/ada-tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp12/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp12_node2.exe
-mp12_node2_exe_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
-mp12_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp12_ada_mp12_node2.exe
+mp12_ada_mp12_node2_exe_SOURCES = mp12_node2.adb ../mptest.adb config.h ../mptest.ads
+mp12_ada_mp12_node2_exe_SOURCES += ../../../support/init.c
 
-mp12_node2.exe: mp12_node2.adb ../mptest.adb init.$(OBJEXT)
+mp12_ada_mp12_node2.exe: mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp12-node2.scn
+dist_scn_DATA = ada_mp12-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp12/node2/mp12-node2.scn b/c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn
index 2189ae9959..2189ae9959 100644
--- a/c/src/ada-tests/mptests/mp12/node2/mp12-node2.scn
+++ b/c/src/ada-tests/mptests/mp12/node2/ada_mp12-node2.scn
diff --git a/c/src/ada-tests/mptests/mp13/node1/Makefile.am b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
index 646cd9a4ec..deeffff181 100644
--- a/c/src/ada-tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_node1.exe
-mp13_node1_exe_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
-mp13_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node1.exe
+mp13_ada_mp13_node1_exe_SOURCES = mp13_node1.adb ../mptest.adb config.h ../mptest.ads
+mp13_ada_mp13_node1_exe_SOURCES += ../../../support/init.c
 
-mp13_node1.exe: mp13_node1.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node1.exe: mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp13-node1.scn
+dist_scn_DATA = ada_mp13-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node1/mp13-node1.scn b/c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn
index d3bd11f65e..d3bd11f65e 100644
--- a/c/src/ada-tests/mptests/mp13/node1/mp13-node1.scn
+++ b/c/src/ada-tests/mptests/mp13/node1/ada_mp13-node1.scn
diff --git a/c/src/ada-tests/mptests/mp13/node2/Makefile.am b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
index 76d2b62cb4..0af059bf62 100644
--- a/c/src/ada-tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp13/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp13_node2.exe
-mp13_node2_exe_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
-mp13_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp13_ada_mp13_node2.exe
+mp13_ada_mp13_node2_exe_SOURCES = mp13_node2.adb ../mptest.adb config.h ../mptest.ads
+mp13_ada_mp13_node2_exe_SOURCES += ../../../support/init.c
 
-mp13_node2.exe: mp13_node2.adb ../mptest.adb init.$(OBJEXT)
+mp13_ada_mp13_node2.exe: mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp13-node2.scn
+dist_scn_DATA = ada_mp13-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp13/node2/mp13-node2.scn b/c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn
index 3254046292..3254046292 100644
--- a/c/src/ada-tests/mptests/mp13/node2/mp13-node2.scn
+++ b/c/src/ada-tests/mptests/mp13/node2/ada_mp13-node2.scn
diff --git a/c/src/ada-tests/mptests/mp14/node1/Makefile.am b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
index 8f08dcc234..487c63a159 100644
--- a/c/src/ada-tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node1/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_node1.exe
-mp14_node1_exe_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
-mp14_node1_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node1.exe
+mp14_ada_mp14_node1_exe_SOURCES = mp14_node1.adb ../mptest.adb config.h ../mptest.ads
+mp14_ada_mp14_node1_exe_SOURCES += ../../../support/init.c
 
-mp14_node1.exe: mp14_node1.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node1.exe: mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp14-node1.scn
+dist_scn_DATA = ada_mp14-node1.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node1/mp14-node1.scn b/c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn
index d1b6feefe9..d1b6feefe9 100644
--- a/c/src/ada-tests/mptests/mp14/node1/mp14-node1.scn
+++ b/c/src/ada-tests/mptests/mp14/node1/ada_mp14-node1.scn
diff --git a/c/src/ada-tests/mptests/mp14/node2/Makefile.am b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
index b8d0efee4d..3814206f9d 100644
--- a/c/src/ada-tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/ada-tests/mptests/mp14/node2/Makefile.am
@@ -7,14 +7,14 @@ include $(top_srcdir)/ada.am
 
 AM_ADAFLAGS += -I$(srcdir)/..
 
-noinst_PROGRAMS = mp14_node2.exe
-mp14_node2_exe_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
-mp14_node2_exe_SOURCES += ../../../support/init.c
+noinst_PROGRAMS = mp14_ada_mp14_node2.exe
+mp14_ada_mp14_node2_exe_SOURCES = mp14_node2.adb ../mptest.adb config.h ../mptest.ads
+mp14_ada_mp14_node2_exe_SOURCES += ../../../support/init.c
 
-mp14_node2.exe: mp14_node2.adb ../mptest.adb init.$(OBJEXT)
+mp14_ada_mp14_node2.exe: mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
 scndir = $(rtems_ada_testsdir)
-dist_scn_DATA = mp14-node2.scn
+dist_scn_DATA = ada_mp14-node2.scn
 
 include $(top_srcdir)/../../../testsuites/automake/local.am
diff --git a/c/src/ada-tests/mptests/mp14/node2/mp14-node2.scn b/c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn
index a245b11faa..a245b11faa 100644
--- a/c/src/ada-tests/mptests/mp14/node2/mp14-node2.scn
+++ b/c/src/ada-tests/mptests/mp14/node2/ada_mp14-node2.scn