5 files changed, 36 insertions, 34 deletions
diff --git a/testsuite/compiler/check/lins/lins.gfs.gold b/testsuite/compiler/check/lins/lins.gfs.gold
index 14b08a591..149912bde 100644
--- a/testsuite/compiler/check/lins/lins.gfs.gold
+++ b/testsuite/compiler/check/lins/lins.gfs.gold
@@ -2,25 +2,26 @@ checking module linsCnc
    Warning: no linearization type for C, inserting default {s : Str}
    Warning: no linearization of test
 abstract lins {
-  cat C Nat
-  cat Float
-  cat Int
-  cat Nat
-  cat String
-  fun test : C zero
-  fun zero : Nat
+  cat C Nat ;
+  cat Float ;
+  cat Int ;
+  cat Nat ;
+  cat String ;
+  fun test : C zero ;
+  fun zero : Nat ;
 }
 concrete linsCnc {
   productions
-    C0 -> F0[CVar]
-    C1 -> F1[CVar]
     C1 -> F2[]
-  functions
-    F0 := (S0) [__gfV]
-    F1 := () [__gfV]
+  lindefs
+    C0 -> F0
+    C1 -> F1
+  lin
+    F0 := (S0) [lindef C]
+    F1 := () [lindef Nat]
     F2 := () [zero]
   sequences
-    S0 := <0,0>
+    S0 := {0,0}
   categories
     C := range  [C0 .. C0]
          labels ["s"]
@@ -33,5 +34,6 @@ concrete linsCnc {
     String := range  [CString .. CString]
               labels ["s"]
     __gfVar := range  [CVar .. CVar]
-               labels ["s"]
+               labels [""]
+  printnames
 }
diff --git a/testsuite/runtime/eval/eval.gfs.gold b/testsuite/runtime/eval/eval.gfs.gold
index 9aaaafd7e..9d4337ff3 100644
--- a/testsuite/runtime/eval/eval.gfs.gold
+++ b/testsuite/runtime/eval/eval.gfs.gold
@@ -1,4 +1,4 @@
-\x -> x 1
+\v0 -> v0 1
 
 ?1 1
 
@@ -6,7 +6,7 @@
 
 f 1 2
 
-\x -> x
+\v0 -> v0
 
 ?1
 
@@ -18,7 +18,7 @@ f 1 2
 
 g 0
 
-\x -> g x
+\v0 -> g v0
 
 g ?1
 
@@ -44,7 +44,7 @@ dec (succF zeroF)
 
 dec zeroF
 
-\x -> dec x
+\v0 -> dec v0
 
 dec ?1
 
@@ -60,5 +60,5 @@ dec2 0 err
 
 succ err
 
-\x -> dec (dec x)
+\v0 -> dec (dec v0)
 
diff --git a/testsuite/runtime/linearize/brackets.gfs.gold b/testsuite/runtime/linearize/brackets.gfs.gold
index c853656fd..e356e6521 100644
--- a/testsuite/runtime/linearize/brackets.gfs.gold
+++ b/testsuite/runtime/linearize/brackets.gfs.gold
@@ -1,28 +1,28 @@
-(S (E (String ?1)) is even)
+(S:2 (E:1 (_:0 ?1)) is even)
 
 
-(S exists (S (String x)) such that (S (S (E (String x)) is even)))
+(S:3 exists x such that (S:2 (E:1 (_:0 x)) is even))
 
 
-(S (E a))
+(S:1 (E:0 a))
 
 
-(S (E aa) a)
+(S:1 (E:0 aa) a)
 
 
-(S (E a) b)
+(S:1 (E:0 a) b)
 
 
-(S (String abcd) is string)
+(S:1 (String:0 abcd) is string)
 
 
-(S (Int 100) is integer)
+(S:1 (Int:0 100) is integer)
 
 
-(S (Float 12.4) is float)
+(S:1 (Float:0 12.4) is float)
 
 
-(S (String xyz) is string)
+(S:1 (String:0 xyz) is string)
 
 
 cannot linearize
diff --git a/testsuite/runtime/paraphrase/lambda.gfs.gold b/testsuite/runtime/paraphrase/lambda.gfs.gold
index 04fb7e166..71ad1fde0 100644
--- a/testsuite/runtime/paraphrase/lambda.gfs.gold
+++ b/testsuite/runtime/paraphrase/lambda.gfs.gold
@@ -1,10 +1,10 @@
-\x -> x
+\v0 -> v0
 
 1
 
-\x -> x
+\v0 -> v0
 
-\x -> 2
+\v0 -> 2
 
 1
 
diff --git a/testsuite/runtime/typecheck/typecheck.gfs.gold b/testsuite/runtime/typecheck/typecheck.gfs.gold
index 634e769a1..436ea2bc0 100644
--- a/testsuite/runtime/typecheck/typecheck.gfs.gold
+++ b/testsuite/runtime/typecheck/typecheck.gfs.gold
@@ -19,13 +19,13 @@ Expression: <\m, n -> vector (plus m n) : (m : Nat) -> (n : Nat) -> Vector (plus
 Type:       (m : Nat) -> (n : Nat) -> Vector (plus m n)
 
 Expression: mkMorph (\x -> succ zero)
-Type:       Morph (\x -> succ zero)
+Type:       Morph (\v0 -> succ zero)
 
 Expression: idMorph (mkMorph (\x -> x))
 Type:       Nat
 
-Couldn't match expected type Morph (\x -> x)
-       against inferred type Morph (\x -> succ zero)
+Couldn't match expected type Morph (\v0 -> v0)
+       against inferred type Morph (\v0 -> succ zero)
 In the expression: mkMorph (\x -> succ zero)
 Expression: <append zero (succ zero) : Vector zero -> Vector (succ zero) -> Vector (succ zero)>
 Type:       Vector zero -> Vector (succ zero) -> Vector (succ zero)