Name changes in debug output

tests/mono-binds/test01.icry.stdout

@@ -11,7 +11,7 @@ test01::a = \{a, b} (fin a) ->
              where
                /* Not recursive */
                f : {c} [c]b -> [a + c]b
-               f = \{c} (y : [c]b) -> (#) a c b <> x y
+               f = \{c} (y : [c]b) -> Cryptol::# a c b <> x y
                
              ) : [a]b -> [2 * a]b
 
@@ -27,7 +27,7 @@ test01::a = \{a, b} (fin a) ->
              where
                /* Not recursive */
                f : [a]b -> [a + a]b
-               f = \ (y : [a]b) -> (#) a a b <> x y
+               f = \ (y : [a]b) -> Cryptol::# a a b <> x y
                
              ) : [a]b -> [2 * a]b
 

tests/mono-binds/test03.icry.stdout

@@ -10,7 +10,7 @@ test03::test = \{a} (fin a, a >= width a) ->
                where
                  /* Not recursive */
                  foo : {b} (fin b, b >= width a) => [b]
-                 foo = \{b} (fin b, b >= width a) -> demote a b <> <> <>
+                 foo = \{b} (fin b, b >= width a) -> Cryptol::demote a b <> <> <>
                  
                
 
@@ -25,7 +25,7 @@ test03::test = \{a} (fin a, a >= width a) ->
                where
                  /* Not recursive */
                  foo : [a]
-                 foo = demote a a <> <> <>
+                 foo = Cryptol::demote a a <> <> <>
                  
                
 

tests/mono-binds/test04.icry.stdout

@@ -6,7 +6,7 @@ import Cryptol
 /* Not recursive */
 test04::test : {a, b} (fin b, b >= 4) => a -> ((a, ()), (a, [b]))
 test04::test = \{a, b} (fin b, b >= 4) (a : a) ->
-               (f () (), f [b] (demote 10 b <> <> <>))
+               (f () (), f [b] (Cryptol::demote 10 b <> <> <>))
                where
                  /* Not recursive */
                  f : {c} c -> (a, c)
@@ -25,8 +25,8 @@ Loading module test04
 [error] at ./test04.cry:3:19--3:21:
   Type mismatch:
     Expected type: ()
-    Inferred type: [?k3]
+    Inferred type: [?z7]
   where
-  ?k3 is type parameter 'bits'
+  ?z7 is type parameter 'bits'
          of literal or demoted expression
          at ./test04.cry:3:19--3:21

tests/mono-binds/test05.icry.stdout

@@ -11,16 +11,16 @@ module test05
 import Cryptol
 /* Not recursive */
 test05::foo : [10]
-test05::foo = demote 10 10 <> <> <>
+test05::foo = Cryptol::demote 10 10 <> <> <>
 
 /* Not recursive */
 test05::test : {a, b, c} (fin c, c >= 4) => [a]b -> [c]
 test05::test = \{a, b, c} (fin c, c >= 4) (a : [a]b) ->
-               demote 10 c <> <> <>
+               Cryptol::demote 10 c <> <> <>
                where
                  /* Not recursive */
                  foo : [10]
-                 foo = demote 10 10 <> <> <>
+                 foo = Cryptol::demote 10 10 <> <> <>
                  
                  /* Not recursive */
                  f : {d} (fin d) => [a + d]b
@@ -33,7 +33,8 @@ test05::test = \{a, b, c} (fin c, c >= 4) (a : [a]b) ->
                        
                        /* Not recursive */
                        bar : {e} (fin e) => [a + e]b
-                       bar = \{e} (fin e) -> (#) e a b <> (zero ([e]b)) foo : [a + e]b
+                       bar = \{e} (fin e) ->
+                             Cryptol::# e a b <> (Cryptol::zero ([e]b)) foo : [a + e]b
                        
                      
                  
@@ -43,7 +44,7 @@ Loading module Cryptol
 Loading module test05
 [warning] at ./test05.cry:9:3--9:6
     This binding for foo shadows the existing binding from
-    (at ./test05.cry:4:1--4:4, test05::foo)
+    (at ./test05.cry:4:1--4:4, foo)
 [warning] at ./test05.cry:13:5--13:8
     This binding for foo shadows the existing binding from
     (at ./test05.cry:9:3--9:6, foo)
@@ -56,16 +57,16 @@ module test05
 import Cryptol
 /* Not recursive */
 test05::foo : [10]
-test05::foo = demote 10 10 <> <> <>
+test05::foo = Cryptol::demote 10 10 <> <> <>
 
 /* Not recursive */
 test05::test : {a, b, c} (fin c, c >= 4) => [a]b -> [c]
 test05::test = \{a, b, c} (fin c, c >= 4) (a : [a]b) ->
-               demote 10 c <> <> <>
+               Cryptol::demote 10 c <> <> <>
                where
                  /* Not recursive */
                  foo : [10]
-                 foo = demote 10 10 <> <> <>
+                 foo = Cryptol::demote 10 10 <> <> <>
                  
                  /* Not recursive */
                  f : [0 + a]b
@@ -77,7 +78,7 @@ test05::test = \{a, b, c} (fin c, c >= 4) (a : [a]b) ->
                        
                        /* Not recursive */
                        bar : [0 + a]b
-                       bar = (#) 0 a b <> (zero ([0]b)) foo
+                       bar = Cryptol::# 0 a b <> (Cryptol::zero ([0]b)) foo
                        
                      
                  

tests/mono-binds/test06.icry.stdout

@@ -10,7 +10,7 @@ test06::test = \{a} (a : a) ->
                where
                  /* Not recursive */
                  foo : a
-                 foo = zero a
+                 foo = Cryptol::zero a
                  
                  /* Not recursive */
                  bar : a
@@ -29,7 +29,7 @@ test06::test = \{a} (a : a) ->
                where
                  /* Not recursive */
                  foo : a
-                 foo = zero a
+                 foo = Cryptol::zero a
                  
                  /* Not recursive */
                  bar : a