diff --git a/build-aux/check-mescc.sh b/build-aux/check-mescc.sh
index 99008fdb..9495e2de 100755
--- a/build-aux/check-mescc.sh
+++ b/build-aux/check-mescc.sh
@@ -33,8 +33,8 @@ scaffold/tests/02-return-1
 scaffold/tests/03-call
 scaffold/tests/04-call-0
 scaffold/tests/05-call-1
-scaffold/tests/06-call-!1
-scaffold/tests/06-!call-1
+scaffold/tests/06-call-not-1
+scaffold/tests/06-not-call-1
 scaffold/tests/06-call-2
 scaffold/tests/06-call-string
 scaffold/tests/06-call-variable
@@ -45,10 +45,10 @@ scaffold/tests/08-assign-negative
 scaffold/tests/08-assign-global
 scaffold/tests/10-if-0
 scaffold/tests/11-if-1
-scaffold/tests/12-if-==
-scaffold/tests/13-if-!=
+scaffold/tests/12-if-eq
+scaffold/tests/13-if-neq
 scaffold/tests/14-if-goto
-scaffold/tests/15-if-!f
+scaffold/tests/15-if-not-f
 scaffold/tests/16-if-t
 scaffold/tests/17-compare-char
 scaffold/tests/17-compare-ge
@@ -69,9 +69,9 @@ scaffold/tests/17-compare-assign
 scaffold/tests/17-compare-call
 scaffold/tests/18-assign-shadow
 scaffold/tests/20-while
-scaffold/tests/21-char[]-simple
-scaffold/tests/21-char[]
-scaffold/tests/22-while-char[]
+scaffold/tests/21-char-array-simple
+scaffold/tests/21-char-array
+scaffold/tests/22-while-char-array
 scaffold/tests/23-global-pointer-init-null
 scaffold/tests/23-global-pointer-init
 scaffold/tests/23-global-pointer-ref
@@ -91,7 +91,7 @@ scaffold/tests/38-compare-call-2
 scaffold/tests/38-compare-call-3
 scaffold/tests/38-compare-call
 scaffold/tests/40-if-else
-scaffold/tests/41-?
+scaffold/tests/41-ternary
 scaffold/tests/42-goto-label
 scaffold/tests/43-for-do-while
 scaffold/tests/44-switch
@@ -174,8 +174,8 @@ scaffold/tests/7s-unsigned-compare
 scaffold/tests/7t-function-destruct
 scaffold/tests/7u-double
 scaffold/tests/7u-long-long
-scaffold/tests/7u-?-expression
-scaffold/tests/7u-call-?
+scaffold/tests/7u-ternary-expression
+scaffold/tests/7u-call-ternary
 scaffold/tests/7u-inc-byte-word
 scaffold/tests/7u-struct-func
 scaffold/tests/7u-struct-size10
@@ -220,8 +220,8 @@ scaffold/tests/a0-math-divide-signed-negative
 
 if [ "$mes_arch" = "x86_64-gcc" ]; then
     broken="$broken
-scaffold/tests/21-char[]
-scaffold/tests/41-?
+scaffold/tests/21-char-array
+scaffold/tests/41-ternary
 scaffold/tests/stdio/70-printf-stdarg
 scaffold/tests/stdio/70-printf-simple
 scaffold/tests/stdio/70-printf
diff --git a/scaffold/tests/06-call-!1.c b/scaffold/tests/06-call-not-1.c
similarity index 100%
rename from scaffold/tests/06-call-!1.c
rename to scaffold/tests/06-call-not-1.c
diff --git a/scaffold/tests/06-!call-1.c b/scaffold/tests/06-not-call-1.c
similarity index 100%
rename from scaffold/tests/06-!call-1.c
rename to scaffold/tests/06-not-call-1.c
diff --git a/scaffold/tests/12-if-==.c b/scaffold/tests/12-if-eq.c
similarity index 100%
rename from scaffold/tests/12-if-==.c
rename to scaffold/tests/12-if-eq.c
diff --git a/scaffold/tests/13-if-!=.c b/scaffold/tests/13-if-neq.c
similarity index 100%
rename from scaffold/tests/13-if-!=.c
rename to scaffold/tests/13-if-neq.c
diff --git a/scaffold/tests/15-if-!f.c b/scaffold/tests/15-if-not-f.c
similarity index 100%
rename from scaffold/tests/15-if-!f.c
rename to scaffold/tests/15-if-not-f.c
diff --git a/scaffold/tests/21-char[]-simple.c b/scaffold/tests/21-char-array-simple.c
similarity index 100%
rename from scaffold/tests/21-char[]-simple.c
rename to scaffold/tests/21-char-array-simple.c
diff --git a/scaffold/tests/21-char[].c b/scaffold/tests/21-char-array.c
similarity index 100%
rename from scaffold/tests/21-char[].c
rename to scaffold/tests/21-char-array.c
diff --git a/scaffold/tests/22-while-char[].c b/scaffold/tests/22-while-char-array.c
similarity index 100%
rename from scaffold/tests/22-while-char[].c
rename to scaffold/tests/22-while-char-array.c
diff --git a/scaffold/tests/41-?.c b/scaffold/tests/41-ternary.c
similarity index 100%
rename from scaffold/tests/41-?.c
rename to scaffold/tests/41-ternary.c
diff --git a/scaffold/tests/7u-call-?.c b/scaffold/tests/7u-call-ternary.c
similarity index 100%
rename from scaffold/tests/7u-call-?.c
rename to scaffold/tests/7u-call-ternary.c
diff --git a/scaffold/tests/7u-?-expression.c b/scaffold/tests/7u-ternary-expression.c
similarity index 100%
rename from scaffold/tests/7u-?-expression.c
rename to scaffold/tests/7u-ternary-expression.c
diff --git a/scaffold/tests/t.c b/scaffold/tests/t.c
index 22b2e3c4..acb462ff 100644
--- a/scaffold/tests/t.c
+++ b/scaffold/tests/t.c
@@ -136,7 +136,7 @@ main (int argc, char* argv[])
   char *strings[] = { "one\n", "two\n", "three\n", 0 };
   char **p = strings;
   while (*p)
-    oputs (*p++);
+    eputs (*p++);
   if (strcmp (strings[1], "two\n"))
     return 21;
   p = list;
@@ -181,11 +181,11 @@ main (int argc, char* argv[])
   int lst[6] = {-1, 1 - 1, i, 2, 3};
   for (int i = 0; i < 4; i++)
     {
-      oputs ("i: "); oputs (itoa (lst[i])); oputs ("\n");
+      eputs ("i: "); eputs (itoa (lst[i])); eputs ("\n");
       if (lst[i+1] != i)
         return 30 + i;
     }
-  oputs ("foo"
+  eputs ("foo"
          "bar");
 
   return 0;