Hard-code node number.

30 files changed, 294 insertions, 324 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index 9bd75ea992..54d1f8afcd 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp01-node$(NODE).exe
+PGM = $(ARCH)/mp01-node1.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
+DOCS = mp01-node1.doc mp01-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp01--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp01-node1.scn: mp01-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp01--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
+$(project_bspdir)/tests/mp01--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp01-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 39acbdf41a..5b463e7a40 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp01-node$(NODE).exe
+PGM = $(ARCH)/mp01-node2.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp01-node$(NODE).doc mp01-node$(NODE).scn
+DOCS = mp01-node2.doc mp01-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp01--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp01-node2.scn: mp01-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp01--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn
+$(project_bspdir)/tests/mp01--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp01-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index f6c4ad0a77..9c444d686f 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp02-node$(NODE).exe
+PGM = $(ARCH)/mp02-node1.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
+DOCS = mp02-node1.doc mp02-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp02--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp02-node1.scn: mp02-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp02--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
+$(project_bspdir)/tests/mp02--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp02-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index 326f27d686..35a6cdec58 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp02-node$(NODE).exe
+PGM = $(ARCH)/mp02-node2.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp02-node$(NODE).doc mp02-node$(NODE).scn
+DOCS = mp02-node2.doc mp02-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp02--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp02-node2.scn: mp02-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp02--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn
+$(project_bspdir)/tests/mp02--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp02-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index df9bd43695..6ce2df05f2 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp03-node$(NODE).exe
+PGM = $(ARCH)/mp03-node1.exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
-DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
+DOCS = mp03-node1.doc mp03-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp03--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp03-node1.scn: mp03-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp03--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
+$(project_bspdir)/tests/mp03--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp03-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index e905a11efa..14c9d85d91 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp03-node$(NODE).exe
+PGM = $(ARCH)/mp03-node2.exe
 
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
-DOCS = mp03-node$(NODE).doc mp03-node$(NODE).scn
+DOCS = mp03-node2.doc mp03-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp03--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp03-node2.scn: mp03-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp03--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn
+$(project_bspdir)/tests/mp03--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp03-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index a331118036..17ae8b7d05 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp04-node$(NODE).exe
+PGM = $(ARCH)/mp04-node1.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
+DOCS = mp04-node1.doc mp04-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp04--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp04-node1.scn: mp04-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp04--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
+$(project_bspdir)/tests/mp04--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp04-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 77a80357a7..f5aa3da525 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp04-node$(NODE).exe
+PGM = $(ARCH)/mp04-node2.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp04-node$(NODE).doc mp04-node$(NODE).scn
+DOCS = mp04-node2.doc mp04-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp04--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp04-node2.scn: mp04-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp04--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn
+$(project_bspdir)/tests/mp04--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp04-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index fe402be79d..e6c48c5e9e 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp05-node$(NODE).exe
+PGM = $(ARCH)/mp05-node1.exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
+DOCS = mp05-node1.doc mp05-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp05--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp05-node1.scn: mp05-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp05--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
+$(project_bspdir)/tests/mp05--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp05-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index cd5c8bc282..9b4e77d32d 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp05-node$(NODE).exe
+PGM = $(ARCH)/mp05-node2.exe
 
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
-DOCS = mp05-node$(NODE).doc mp05-node$(NODE).scn
+DOCS = mp05-node2.doc mp05-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp05--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp05-node2.scn: mp05-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp05--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn
+$(project_bspdir)/tests/mp05--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp05-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index 81462e3c04..8616cff9f5 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp06-node$(NODE).exe
+PGM = $(ARCH)/mp06-node1.exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
+DOCS = mp06-node1.doc mp06-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp06--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp06-node1.scn: mp06-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp06--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
+$(project_bspdir)/tests/mp06--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp06-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index 87996f11be..0959ddd698 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp06-node$(NODE).exe
+PGM = $(ARCH)/mp06-node2.exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp06-node$(NODE).doc mp06-node$(NODE).scn
+DOCS = mp06-node2.doc mp06-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp06--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp06-node2.scn: mp06-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp06--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn
+$(project_bspdir)/tests/mp06--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp06-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index 6325fd7704..f2884b6b71 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp07-node$(NODE).exe
+PGM = $(ARCH)/mp07-node1.exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
+DOCS = mp07-node1.doc mp07-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp07--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp07-node1.scn: mp07-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp07--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
+$(project_bspdir)/tests/mp07--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp07-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index b9f0a2fe2e..19eb694aa1 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp07-node$(NODE).exe
+PGM = $(ARCH)/mp07-node2.exe
 
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp07-node$(NODE).doc mp07-node$(NODE).scn
+DOCS = mp07-node2.doc mp07-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp07--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp07-node2.scn: mp07-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp07--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn
+$(project_bspdir)/tests/mp07--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp07-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index ad255f70f6..df2d6e3828 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp08-node$(NODE).exe
+PGM = $(ARCH)/mp08-node1.exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
+DOCS = mp08-node1.doc mp08-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp08--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp08-node1.scn: mp08-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp08--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
+$(project_bspdir)/tests/mp08--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp08-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 2a5d24228a..e7d96653c6 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp08-node$(NODE).exe
+PGM = $(ARCH)/mp08-node2.exe
 
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
-DOCS = mp08-node$(NODE).doc mp08-node$(NODE).scn
+DOCS = mp08-node2.doc mp08-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp08--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp08-node2.scn: mp08-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp08--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn
+$(project_bspdir)/tests/mp08--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp08-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 5af4700b28..e5fcfcf088 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp09-node$(NODE).exe
+PGM = $(ARCH)/mp09-node1.exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
+DOCS = mp09-node1.doc mp09-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp09-node1.scn: mp09-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
+$(project_bspdir)/tests/mp09--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp09-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 6f5d82ee49..2f9972e32e 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp09-node$(NODE).exe
+PGM = $(ARCH)/mp09-node2.exe
 
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
-DOCS = mp09-node$(NODE).doc mp09-node$(NODE).scn
+DOCS = mp09-node2.doc mp09-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp09-node2.scn: mp09-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn
+$(project_bspdir)/tests/mp09--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp09-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 9f59647dce..2aac2b91f9 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp10-node$(NODE).exe
+PGM = $(ARCH)/mp10-node1.exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
+DOCS = mp10-node1.doc mp10-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp10--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp10-node1.scn: mp10-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp10--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
+$(project_bspdir)/tests/mp10--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp10-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index e29ea93de0..2d42cf0f6d 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp10-node$(NODE).exe
+PGM = $(ARCH)/mp10-node2.exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
-DOCS = mp10-node$(NODE).doc mp10-node$(NODE).scn
+DOCS = mp10-node2.doc mp10-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp10--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp10-node2.scn: mp10-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp10--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn
+$(project_bspdir)/tests/mp10--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp10-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 20d837c46c..af0ebcdd79 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp11-node$(NODE).exe
+PGM = $(ARCH)/mp11-node1.exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
+DOCS = mp11-node1.doc mp11-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp11--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp11-node1.scn: mp11-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp11--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
+$(project_bspdir)/tests/mp11--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp11-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 46e38d72c2..29e51cd1ea 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp11-node$(NODE).exe
+PGM = $(ARCH)/mp11-node2.exe
 
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = mp11-node$(NODE).doc mp11-node$(NODE).scn
+DOCS = mp11-node2.doc mp11-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp11--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp11-node2.scn: mp11-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp11--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn
+$(project_bspdir)/tests/mp11--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp11-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index e576b8e5cb..07b009cd45 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp12-node$(NODE).exe
+PGM = $(ARCH)/mp12-node1.exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
+DOCS = mp12-node1.doc mp12-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp12--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp12-node1.scn: mp12-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp12--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
+$(project_bspdir)/tests/mp12--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp12-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 4b58930229..3d88b0d990 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp12-node$(NODE).exe
+PGM = $(ARCH)/mp12-node2.exe
 
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../system.h
 
-DOCS = mp12-node$(NODE).doc mp12-node$(NODE).scn
+DOCS = mp12-node2.doc mp12-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp12--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp12-node2.scn: mp12-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp12--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn
+$(project_bspdir)/tests/mp12--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp12-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index eaccce1adc..249fa25cd2 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp13-node$(NODE).exe
+PGM = $(ARCH)/mp13-node1.exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
+DOCS = mp13-node1.doc mp13-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp13--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp13-node1.scn: mp13-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp13--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
+$(project_bspdir)/tests/mp13--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp13-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 716f076658..0e9513bd73 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp13-node$(NODE).exe
+PGM = $(ARCH)/mp13-node2.exe
 
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
-DOCS = mp13-node$(NODE).doc mp13-node$(NODE).scn
+DOCS = mp13-node2.doc mp13-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,23 +24,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp13--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp13-node2.scn: mp13-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp13--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn
+$(project_bspdir)/tests/mp13--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp13-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 
 if HAS_MP
 
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index eb6904bc66..55cff477e9 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -2,8 +2,7 @@
 ## $Id$
 ##
 
-NODE = 1
-PGM = $(ARCH)/mp14-node$(NODE).exe
+PGM = $(ARCH)/mp14-node1.exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -11,7 +10,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 = mp14-node$(NODE).doc mp14-node$(NODE).scn
+DOCS = mp14-node1.doc mp14-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,23 +25,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14--node1.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/node1/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node1
+	@: > $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn: mp14-node1.scn $(project_bspdir)/tests/screens/mptests/node1/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp14--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
+$(project_bspdir)/tests/mp14--node1.exe \
+$(project_bspdir)/tests/screens/mptests/node1/mp14-node1.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
 if HAS_MP
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 3fcabfb276..af933fad29 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -2,8 +2,7 @@
 ## $Id$
 ##
 
-NODE = 2
-PGM = $(ARCH)/mp14-node$(NODE).exe
+PGM = $(ARCH)/mp14-node2.exe
 
 MANAGERS = io mp event partition semaphore timer message
 
@@ -11,7 +10,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 = mp14-node$(NODE).doc mp14-node$(NODE).scn
+DOCS = mp14-node2.doc mp14-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -26,23 +25,23 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14--node2.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/node2/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/mptests/node2
+	@: > $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-node$(NODE).scn $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp)
+$(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn: mp14-node2.scn $(project_bspdir)/tests/screens/mptests/node2/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp14--node$(NODE).exe \
-$(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
+$(project_bspdir)/tests/mp14--node2.exe \
+$(project_bspdir)/tests/screens/mptests/node2/mp14-node2.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
 if HAS_MP
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 06525c5154..8d5b51920c 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-NODE = 1
-PGM = ${ARCH}/base_mp-node$(NODE).exe
+PGM = ${ARCH}/base_mp-node1.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../apptask.c ../system.h
 
-DOCS = base_mp-node$(NODE).doc base_mp-node$(NODE).scn
+DOCS = base_mp-node1.doc base_mp-node1.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,18 +27,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/base_mp-node1.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/base_mp-node1.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node$(NODE).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node$(NODE).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node1.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node1.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 2e027a4b5a..ce6d5981b6 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -2,15 +2,14 @@
 ##  $Id$
 ##
 
-NODE = 2
-PGM = ${ARCH}/base_mp-node$(NODE).exe
+PGM = ${ARCH}/base_mp-node2.exe
 
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../init.c ../apptask.c ../system.h
 
-DOCS = base_mp-node$(NODE).doc base_mp-node$(NODE).scn
+DOCS = base_mp-node2.doc base_mp-node2.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -28,18 +27,18 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/samples/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+$(project_bspdir)/samples/base_mp-node2.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-$(project_bspdir)/tests/base_mp-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/base_mp-node2.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
-TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node$(NODE).exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node$(NODE).exe
+TMPINSTALL_FILES = $(project_bspdir)/tests/base_mp-node2.exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/base_mp-node2.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
 
 #
 # (OPTIONAL) Add local stuff here using +=