diff --git a/contrib/nitcc/tests/sav/empty.alt1.res b/contrib/nitcc/tests/sav/empty.alt1.res
index 28c7c12bc8..983984cb16 100644
--- a/contrib/nitcc/tests/sav/empty.alt1.res
+++ b/contrib/nitcc/tests/sav/empty.alt1.res
@@ -1 +1 @@
-16:1-16:1 Syntax Error: Unexpected Eof; is acceptable instead: grammar
+Error: grammar with no production
diff --git a/contrib/nitcc/tests/sav/parser-groupize.input.res b/contrib/nitcc/tests/sav/parser-groupize.input.res
index 6e21baff68..0cdd482e04 100644
--- a/contrib/nitcc/tests/sav/parser-groupize.input.res
+++ b/contrib/nitcc/tests/sav/parser-groupize.input.res
@@ -10,42 +10,42 @@ Start
                   s_1
                     s_5
                     's'@(1:1-1:2)
-                    _group1_single
+                    _group1
                       'a'@(1:2-1:3)
                   's'@(2:1-2:2)
-                  _group0_single
+                  _group0
                     'a'@(2:2-2:3)
                     'b'@(2:3-2:4)
                 's'@(3:1-3:2)
-                _group2_single
+                _group2
                   'a'@(3:2-3:3)
                   'c'@(3:3-3:4)
               's'@(4:1-4:2)
             's'@(5:1-5:2)
             Nodes[N_group3]
-              _group3_single
+              _group3
                 'a'@(5:2-5:3)
                 'd'@(5:3-5:4)
           's'@(6:1-6:2)
           Nodes[N_group3]
-            _group3_single
+            _group3
               'a'@(6:2-6:3)
               'd'@(6:3-6:4)
-            _group3_single
+            _group3
               'a'@(6:4-6:5)
               'd'@(6:5-6:6)
         't'@(7:1-7:2)
       't'@(8:1-8:2)
       Nodes[N_group4]
-        _group4_single
+        _group4
           'a'@(8:2-8:3)
           'e'@(8:3-8:4)
     't'@(9:1-9:2)
     Nodes[N_group4]
-      _group4_single
+      _group4
         'a'@(9:2-9:3)
         'e'@(9:3-9:4)
-      _group4_single
+      _group4
         'a'@(9:4-9:5)
         'e'@(9:5-9:6)
   Eof@(10:1-10:1)=''
diff --git a/contrib/nitcc/tests/sav/re.input1.res b/contrib/nitcc/tests/sav/re.input1.res
index 2735f59c8e..f4487338fa 100644
--- a/contrib/nitcc/tests/sav/re.input1.res
+++ b/contrib/nitcc/tests/sav/re.input1.res
@@ -1,10 +1,10 @@
 Start
-  re$1_0
-    re$1_0
-      re$0_0
+  re1_0
+    re1_0
+      re0_0
         'a'@(1:1-1:2)
-      re$0_0
+      re0_0
         'a'@(1:2-1:3)
-    re$0_0
+    re0_0
       'a'@(1:3-1:4)
   Eof@(2:1-2:1)=''
diff --git a/contrib/nitcc/tests/sav/re.input2.res b/contrib/nitcc/tests/sav/re.input2.res
index ad6b97794e..6375a6cb65 100644
--- a/contrib/nitcc/tests/sav/re.input2.res
+++ b/contrib/nitcc/tests/sav/re.input2.res
@@ -1,32 +1,32 @@
 Start
   re_0
-    re$0_1
+    re0_1
       '('@(1:1-1:2)
-      re$1_0
-        re$0_0
+      re1_0
+        re0_0
           'a'@(1:2-1:3)
-        re$0_1
+        re0_1
           '('@(1:3-1:4)
-          re$1_0
-            re$0_0
+          re1_0
+            re0_0
               'a'@(1:4-1:5)
-            re$0_0
+            re0_0
               'a'@(1:5-1:6)
           ')'@(1:6-1:7)
       ')'@(1:7-1:8)
     '|'@(1:9-1:10)
-    re$0_1
+    re0_1
       '('@(2:1-2:2)
-      re$1_0
-        re$0_1
+      re1_0
+        re0_1
           '('@(2:2-2:3)
-          re$1_0
-            re$0_0
+          re1_0
+            re0_0
               'a'@(2:3-2:4)
-            re$0_0
+            re0_0
               'a'@(2:4-2:5)
           ')'@(2:5-2:6)
-        re$0_0
+        re0_0
           'a'@(2:6-2:7)
       ')'@(2:7-2:8)
   Eof@(3:1-3:1)=''
diff --git a/contrib/nitcc/tests/sav/re.input3.res b/contrib/nitcc/tests/sav/re.input3.res
index 83ed0105d9..72cf73be81 100644
--- a/contrib/nitcc/tests/sav/re.input3.res
+++ b/contrib/nitcc/tests/sav/re.input3.res
@@ -1,20 +1,20 @@
 Start
   re_0
-    re$1_0
-      re$0_0
+    re1_0
+      re0_0
         'a'@(1:1-1:2)
-      re$2_1
-        re$0_0
+      re2_1
+        re0_0
           'a'@(1:2-1:3)
         '*'@(1:3-1:4)
     '|'@(1:5-1:6)
-    re$2_1
-      re$0_1
+    re2_1
+      re0_1
         '('@(2:1-2:2)
-        re$1_0
-          re$0_0
+        re1_0
+          re0_0
             'a'@(2:2-2:3)
-          re$0_0
+          re0_0
             'a'@(2:3-2:4)
         ')'@(2:4-2:5)
       '*'@(2:5-2:6)
diff --git a/contrib/nitcc/tests/sav/re.input4.res b/contrib/nitcc/tests/sav/re.input4.res
index 4c1c369c7f..f37293d50a 100644
--- a/contrib/nitcc/tests/sav/re.input4.res
+++ b/contrib/nitcc/tests/sav/re.input4.res
@@ -1,31 +1,31 @@
 Start
   re_0
     re_0
-      re$1_0
-        re$0_0
+      re1_0
+        re0_0
           'a'@(1:1-1:2)
-        re$0_0
+        re0_0
           'a'@(1:2-1:3)
       '|'@(1:3-1:4)
-      re$1_0
-        re$0_0
+      re1_0
+        re0_0
           'a'@(1:4-1:5)
-        re$0_0
+        re0_0
           'a'@(1:5-1:6)
     '|'@(1:6-1:7)
-    re$1_0
-      re$1_0
-        re$0_0
+    re1_0
+      re1_0
+        re0_0
           'a'@(2:1-2:2)
-        re$0_1
+        re0_1
           '('@(2:2-2:3)
           re_0
-            re$0_0
+            re0_0
               'a'@(2:3-2:4)
             '|'@(2:4-2:5)
-            re$0_0
+            re0_0
               'a'@(2:5-2:6)
           ')'@(2:6-2:7)
-      re$0_0
+      re0_0
         'a'@(2:7-2:8)
   Eof@(3:1-3:1)=''
diff --git a/contrib/nitcc/tests/sav/regex1.input.res b/contrib/nitcc/tests/sav/regex1.input.res
index b6f6996368..b379bc0399 100644
--- a/contrib/nitcc/tests/sav/regex1.input.res
+++ b/contrib/nitcc/tests/sav/regex1.input.res
@@ -1,19 +1,19 @@
 Start
   e_0
-    e$1_0
-      e$0_0
+    e1_0
+      e0_0
         a
           'a'@(1:1-1:2)
-      e$0_0
+      e0_0
         a
           'a'@(1:2-1:3)
     '|'@(1:3-1:4)
-    e$1_0
-      e$0_0
+    e1_0
+      e0_0
         a
           'a'@(1:4-1:5)
-      e$2_0
-        e$0_0
+      e2_0
+        e0_0
           a
             'a'@(1:5-1:6)
         '*'@(1:6-1:7)