Eliminate TEST.

28 files changed, 168 insertions, 196 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 7c1f4a59a5..cf23e34828 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp01-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp01-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index b2e7c54abc..fa26eabc6d 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp01-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp01-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 485fa7e236..766d461a27 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp02-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp02-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index cc3c54d656..a7f49726c1 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp02-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp02-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 9bd2613069..6ed3a5c7d8 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp03-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp03-node$(NODE).exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 33141a6af9..34d2287a43 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp03-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp03-node$(NODE).exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 3b1ddc1d8f..45869cec51 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp04-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp04-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 7ce315ff7a..6fc6282348 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp04-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp04-node$(NODE).exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 3bfeec110c..cf4a5ce2b1 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp05-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp05-node$(NODE).exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index ee15c0baf6..038949007e 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp05-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp05-node$(NODE).exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index bcd2c0a421..cd9356fc66 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp06-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp06-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 0db9b3e722..07683fc167 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp06-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp06-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index d985ce3212..d7eae32b82 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp07-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp07-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 96d4a6954e..4e52a36414 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp07-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp07-node$(NODE).exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f2f4e91091..a4fd3ecea0 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp08-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp08-node$(NODE).exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 6d90bab965..a245e3d98e 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp08-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp08-node$(NODE).exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 95253efda2..2275870040 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp09-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp09-node$(NODE).exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index a7c5837f85..268e1c6d8b 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp09-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp09-node$(NODE).exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 3e46ccc7a4..44cbbe7ef3 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp10-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp10-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 3bbff1a5bd..614f62af2f 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp10-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp10-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 3b11f573fe..7b36f144b7 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp11-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp11-node$(NODE).exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index e6414d29d5..4f55a883bc 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp11-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp11-node$(NODE).exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index eb98e15b80..7eba1e7915 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp12-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp12-node$(NODE).exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 7cec266f6e..938e069431 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp12-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp12-node$(NODE).exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index fd2a2cb401..a862abb9a0 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 1
-TEST = mp13-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp13-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 8432a12b6c..3b52d53b44 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -3,15 +3,14 @@
 ##
 
 NODE = 2
-TEST = mp13-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp13-node$(NODE).exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,19 +25,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 0da54e7465..7ceb4a3a0b 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -3,8 +3,7 @@
 ##
 
 NODE = 1
-TEST = mp14-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp14-node$(NODE).exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -12,7 +11,7 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -27,19 +26,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index e99a115c5d..fbefb3a6b8 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -3,8 +3,7 @@
 ##
 
 NODE = 2
-TEST = mp14-node$(NODE)
-PGM = $(ARCH)/$(TEST).exe
+PGM = $(ARCH)/mp14-node$(NODE).exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -12,7 +11,7 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = mp14-node$(NODE).doc mp14-node$(NODE).scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -27,19 +26,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node$(NODE)
 	@: > $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST)-node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/$(TEST).scn
+$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)