Fix typo in previous patch.

28 files changed, 56 insertions, 56 deletions

diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index cf23e34828..9bd75ea992 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp01--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 fa26eabc6d..39acbdf41a 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp01--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp01-node$(NODE).scn: mp01-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp01-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp01--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 766d461a27..f6c4ad0a77 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp02--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 a7f49726c1..326f27d686 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp02--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp02-node$(NODE).scn: mp02-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp02-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp02--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 6ed3a5c7d8..df9bd43695 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp03--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 34d2287a43..e905a11efa 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp03--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp03-node$(NODE).scn: mp03-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp03-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp03--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 45869cec51..a331118036 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp04--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 6fc6282348..77a80357a7 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp04--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp04-node$(NODE).scn: mp04-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp04-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp04--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 cf4a5ce2b1..fe402be79d 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp05--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 038949007e..cd5c8bc282 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp05--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp05-node$(NODE).scn: mp05-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp05-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp05--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 cd9356fc66..81462e3c04 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp06--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 07683fc167..87996f11be 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp06--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp06-node$(NODE).scn: mp06-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp06-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp06--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 d7eae32b82..6325fd7704 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp07--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 4e52a36414..b9f0a2fe2e 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp07--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp07-node$(NODE).scn: mp07-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp07-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp07--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 a4fd3ecea0..ad255f70f6 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp08--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 a245e3d98e..2a5d24228a 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp08--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp08-node$(NODE).scn: mp08-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp08-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp08--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 2275870040..5af4700b28 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp09--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 268e1c6d8b..6f5d82ee49 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp09--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp09-node$(NODE).scn: mp09-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp09-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp09--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 44cbbe7ef3..9f59647dce 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp10--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 614f62af2f..e29ea93de0 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp10--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp10-node$(NODE).scn: mp10-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp10-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp10--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 7b36f144b7..20d837c46c 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp11--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 4f55a883bc..46e38d72c2 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp11--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp11-node$(NODE).scn: mp11-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp11-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp11--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 7eba1e7915..e576b8e5cb 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp12--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 938e069431..4b58930229 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp12--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp12-node$(NODE).scn: mp12-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp12-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp12--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 a862abb9a0..eaccce1adc 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp13--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 3b52d53b44..716f076658 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -25,7 +25,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp13--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -36,7 +36,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp13-node$(NODE).scn: mp13-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp13-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp13--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 7ceb4a3a0b..eb6904bc66 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -26,7 +26,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -37,7 +37,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp14--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 fbefb3a6b8..3fcabfb276 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -26,7 +26,7 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/mp14--node$(NODE).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/$(dirstamp):
@@ -37,7 +37,7 @@ $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn: mp14-n
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/mp14-node$(NODE)-node$(NODE).exe \
+$(project_bspdir)/tests/mp14--node$(NODE).exe \
 $(project_bspdir)/tests/screens/mptests/node$(NODE)/mp14-node$(NODE).scn
 
 $(PGM): ${ARCH}/$(dirstamp)