80 files changed, 176 insertions, 176 deletions
diff --git a/testdata/language-features/adt/adt02.reject.out b/testdata/language-features/adt/adt02.reject.out
index 6be18ea8..29f62600 100644
--- a/testdata/language-features/adt/adt02.reject.out
+++ b/testdata/language-features/adt/adt02.reject.out
@@ -6,10 +6,10 @@ with
 in proj
 ------------ trace
 'Data3 :: [32mType[0m
-Data3 :: [32m'Bool -> 'Char -> 'Bool -> 'Data3[0m
+Data3 :: [32mBool -> Char -> Bool -> Data3[0m
-Data31 :: [32m'Int -> 'String -> 'Int -> 'Data3[0m
+Data31 :: [32mInt -> String -> Int -> Data3[0m
-'Data3Case :: [32mforall (a :: 'Data3 -> Type) -> (forall (b :: 'Bool) (c :: 'Char) (d :: 'Bool) -> [32m[32ma[0;32m [32m(Data3 [32mb[0;32m [32mc[0;32m [32md[0;32m)[0;32m[0;32m) -> (forall (e :: 'Int) (f :: 'String) (g :: 'Int) -> [32m[32ma[0;32m [32m(Data31 [32me[0;32m [32mf[0;32m [32mg[0;32m)[0;32m[0;32m) -> forall (h :: 'Data3) -> [32m[32ma[0;32m [32m[32mh[0;32m[0;32m[0;32m[0m
+'Data3Case :: [32mforall (a :: Data3 -> Type) -> (forall (b :: Bool) (c :: Char) (d :: Bool) -> [32m[32ma[0;32m [32m('Data3 [32mb[0;32m [32mc[0;32m [32md[0;32m)[0;32m[0;32m) -> (forall (e :: Int) (f :: String) (g :: Int) -> [32m[32ma[0;32m [32m('Data31 [32me[0;32m [32mf[0;32m [32mg[0;32m)[0;32m[0;32m) -> forall (h :: Data3) -> [32m[32ma[0;32m [32m[32mh[0;32m[0;32m[0;32m[0m
-match'Data3 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32m'Data3[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'Data3 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mData3[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
 !type error: can not unify
 [32m'Bool[0m
 with
diff --git a/testdata/language-features/adt/gadt01.reject.out b/testdata/language-features/adt/gadt01.reject.out
index 5d7c98fd..48732b7d 100644
--- a/testdata/language-features/adt/gadt01.reject.out
+++ b/testdata/language-features/adt/gadt01.reject.out
@@ -1,6 +1,6 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M3 :: [32mType -> 'String -> Type[0m
+'M3 :: [32mType -> String -> Type[0m
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
 testdata/language-features/adt/gadt01.reject.lc 5:6-5:8  Type -> String -> Type
diff --git a/testdata/language-features/adt/gadt03.reject.out b/testdata/language-features/adt/gadt03.reject.out
index 8aad9b35..39016938 100644
--- a/testdata/language-features/adt/gadt03.reject.out
+++ b/testdata/language-features/adt/gadt03.reject.out
@@ -1,10 +1,10 @@
 illegal data definition (parameters are not uniform)
 ------------ trace
-'M2 :: [32mType -> 'String -> Type[0m
+'M2 :: [32mType -> String -> Type[0m
-Value2 :: [32mforall a . [32ma[0;32m -> forall (b :: 'String) . 'M2 [32ma[0;32m [32mb[0;32m[0m
+Value2 :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m
-'M2Case :: [32mforall a . forall (b :: forall (c :: 'String) -> 'M2 [32ma[0;32m [32mc[0;32m -> Type) -> (forall (d :: [32ma[0;32m) -> forall (e :: 'String) . [32m[32m[32mb[0;32m [32m[32me[0;32m[0;32m[0;32m [32m(Value2 [32md[0;32m [32me[0;32m)[0;32m[0;32m) -> forall (f :: 'String) . forall (g :: 'M2 [32ma[0;32m [32mf[0;32m) -> [32m[32m[32mb[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m
+'M2Case :: [32mforall a . forall (b :: forall (c :: String) -> M2 [32ma[0;32m [32mc[0;32m -> Type) -> (forall (d :: [32ma[0;32m) -> forall (e :: String) . [32m[32m[32mb[0;32m [32m[32me[0;32m[0;32m[0;32m [32m('Value2 [32md[0;32m [32me[0;32m)[0;32m[0;32m) -> forall (f :: String) . forall (g :: M2 [32ma[0;32m [32mf[0;32m) -> [32m[32m[32mb[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m
-match'M2 :: [32mforall (a :: Type -> Type) -> (forall b (c :: 'String) -> [32m[32ma[0;32m [32m('M2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
+match'M2 :: [32mforall (a :: Type -> Type) -> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
-'M3 :: [32mType -> 'String -> Type[0m
+'M3 :: [32mType -> String -> Type[0m
 !illegal data definition (parameters are not uniform)
 ------------ tooltips
 testdata/language-features/adt/gadt03.reject.lc 2:6-2:8  Type | Type -> String -> Type
diff --git a/testdata/language-features/adt/gadt04.reject.out b/testdata/language-features/adt/gadt04.reject.out
index 4efb2a15..70903666 100644
--- a/testdata/language-features/adt/gadt04.reject.out
+++ b/testdata/language-features/adt/gadt04.reject.out
@@ -5,12 +5,12 @@ and at testdata/language-features/adt/gadt04.reject.lc:3:3:
  Value :: a -> forall m . M a m
  ^^^^^
 ------------ trace
-'M :: [32mType -> 'String -> Type[0m
+'M :: [32mType -> String -> Type[0m
-Value :: [32mforall a . [32ma[0;32m -> forall (b :: 'String) . 'M [32ma[0;32m [32mb[0;32m[0m
+Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M [32ma[0;32m [32mb[0;32m[0m
-'MCase :: [32mforall (a :: forall b (c :: 'String) -> 'M [32mb[0;32m [32mc[0;32m -> Type) -> (forall d . forall (e :: [32md[0;32m) -> forall (f :: 'String) . [32m[32m[32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m(Value [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m) -> forall g (h :: 'String) . forall (i :: 'M [32mg[0;32m [32mh[0;32m) -> [32m[32m[32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m [32m[32mh[0;32m[0;32m[0;32m [32m[32mi[0;32m[0;32m[0;32m[0m
+'MCase :: [32mforall (a :: forall b (c :: String) -> M [32mb[0;32m [32mc[0;32m -> Type) -> (forall d . forall (e :: [32md[0;32m) -> forall (f :: String) . [32m[32m[32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m [32m[32mf[0;32m[0;32m[0;32m [32m('Value [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m) -> forall g (h :: String) . forall (i :: M [32mg[0;32m [32mh[0;32m) -> [32m[32m[32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m [32m[32mh[0;32m[0;32m[0;32m [32m[32mi[0;32m[0;32m[0;32m[0m
-match'M :: [32mforall (a :: Type -> Type) -> (forall b (c :: 'String) -> [32m[32ma[0;32m [32m('M [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
+match'M :: [32mforall (a :: Type -> Type) -> (forall b (c :: String) -> [32m[32ma[0;32m [32m(M [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> forall d -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32md[0;32m[0;32m[0;32m[0m
-'M2 :: [32mType -> 'String -> Type[0m
+'M2 :: [32mType -> String -> Type[0m
-Value :: [32mforall a . [32ma[0;32m -> forall (b :: 'String) . 'M2 [32ma[0;32m [32mb[0;32m[0m
+Value :: [32mforall a . [32ma[0;32m -> forall (b :: String) . M2 [32ma[0;32m [32mb[0;32m[0m
 !already defined Value at testdata/language-features/adt/gadt04.reject.lc:6:3:
  Value :: a -> forall m . M2 a m
  ^^^^^
diff --git a/testdata/language-features/basic-list/list01.out b/testdata/language-features/basic-list/list01.out
index 3f0fb720..25208099 100644
--- a/testdata/language-features/basic-list/list01.out
+++ b/testdata/language-features/basic-list/list01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: [32mforall a . 'List [32ma[0;32m[0m
+value1 :: [32mforall a . List [32ma[0;32m[0m
-value2 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => 'List [32ma[0;32m[0m
+value2 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => List [32ma[0;32m[0m
-value3 :: [32m'List 'Char[0m
+value3 :: [32mList Char[0m
 ------------ tooltips
 testdata/language-features/basic-list/list01.lc 1:1-1:7  forall a . List a
 testdata/language-features/basic-list/list01.lc 1:10-1:12  forall a . List a
diff --git a/testdata/language-features/basic-list/list02.out b/testdata/language-features/basic-list/list02.out
index ff742fb8..b95d51c9 100644
--- a/testdata/language-features/basic-list/list02.out
+++ b/testdata/language-features/basic-list/list02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: [32mforall a . 'List [32ma[0;32m[0m
+value1 :: [32mforall a . List [32ma[0;32m[0m
-value2 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => 'List [32ma[0;32m[0m
+value2 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => List [32ma[0;32m[0m
-value3 :: [32m'List 'Char[0m
+value3 :: [32mList Char[0m
 ------------ tooltips
 testdata/language-features/basic-list/list02.lc 1:1-1:7  forall a . List a
 testdata/language-features/basic-list/list02.lc 1:10-2:4  forall a . List a
diff --git a/testdata/language-features/basic-list/list08.out b/testdata/language-features/basic-list/list08.out
index 1ac19568..724faf89 100644
--- a/testdata/language-features/basic-list/list08.out
+++ b/testdata/language-features/basic-list/list08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List 'Float[0m
+value :: [32mList Float[0m
 ------------ tooltips
 testdata/language-features/basic-list/list08.lc 1:1-1:6  List Float
 testdata/language-features/basic-list/list08.lc 1:9-1:16  List Float
diff --git a/testdata/language-features/basic-list/list09.out b/testdata/language-features/basic-list/list09.out
index 492d3138..d25415c0 100644
--- a/testdata/language-features/basic-list/list09.out
+++ b/testdata/language-features/basic-list/list09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List 'Float[0m
+value :: [32mList Float[0m
 ------------ tooltips
 testdata/language-features/basic-list/list09.lc 1:1-1:6  List Float
 testdata/language-features/basic-list/list09.lc 1:9-1:16  List Float
diff --git a/testdata/language-features/basic-list/list11.out b/testdata/language-features/basic-list/list11.out
index cb6df6d3..b3285136 100644
--- a/testdata/language-features/basic-list/list11.out
+++ b/testdata/language-features/basic-list/list11.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => 'List [32ma[0;32m[0m
+value :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => List [32ma[0;32m[0m
 ------------ tooltips
 testdata/language-features/basic-list/list11.lc 1:1-1:6  forall a . Num a => List a
 testdata/language-features/basic-list/list11.lc 1:9-1:10  _b
diff --git a/testdata/language-features/basic-list/list12.out b/testdata/language-features/basic-list/list12.out
index 44f3d7fb..59378f6a 100644
--- a/testdata/language-features/basic-list/list12.out
+++ b/testdata/language-features/basic-list/list12.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => 'List [32ma[0;32m[0m
+value :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => List [32ma[0;32m[0m
 ------------ tooltips
 testdata/language-features/basic-list/list12.lc 1:1-1:6  forall a . Num a => List a
 testdata/language-features/basic-list/list12.lc 1:9-1:10  _b
diff --git a/testdata/language-features/basic-list/list13.out b/testdata/language-features/basic-list/list13.out
index 65791b40..59395fa3 100644
--- a/testdata/language-features/basic-list/list13.out
+++ b/testdata/language-features/basic-list/list13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List 'Char[0m
+value :: [32mList Char[0m
 ------------ tooltips
 testdata/language-features/basic-list/list13.lc 1:1-1:6  List Char
 testdata/language-features/basic-list/list13.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-list/listcomp01.out b/testdata/language-features/basic-list/listcomp01.out
index 432c6b31..2e52e998 100644
--- a/testdata/language-features/basic-list/listcomp01.out
+++ b/testdata/language-features/basic-list/listcomp01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List ()[0m
+value :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp01.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp01.lc 1:9-1:34  List ()
diff --git a/testdata/language-features/basic-list/listcomp02.out b/testdata/language-features/basic-list/listcomp02.out
index febc25b8..3421166e 100644
--- a/testdata/language-features/basic-list/listcomp02.out
+++ b/testdata/language-features/basic-list/listcomp02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-l :: [32m'List ()[0m
+l :: [32mList ()[0m
-value :: [32m'List ()[0m
+value :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp02.lc 1:1-1:2  List ()
 testdata/language-features/basic-list/listcomp02.lc 1:5-1:18  List ()
diff --git a/testdata/language-features/basic-list/listcomp03.out b/testdata/language-features/basic-list/listcomp03.out
index 44bfd033..d8cb4fbb 100644
--- a/testdata/language-features/basic-list/listcomp03.out
+++ b/testdata/language-features/basic-list/listcomp03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List ()[0m
+value :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp03.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp03.lc 1:9-1:41  List ()
diff --git a/testdata/language-features/basic-list/listcomp04.out b/testdata/language-features/basic-list/listcomp04.out
index d126e288..3ad41bba 100644
--- a/testdata/language-features/basic-list/listcomp04.out
+++ b/testdata/language-features/basic-list/listcomp04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-l :: [32m'List ()[0m
+l :: [32mList ()[0m
-value :: [32m'List ()[0m
+value :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp04.lc 1:1-1:2  List ()
 testdata/language-features/basic-list/listcomp04.lc 1:5-1:18  List ()
diff --git a/testdata/language-features/basic-list/listcomp05.out b/testdata/language-features/basic-list/listcomp05.out
index 54650e0b..562bf9ca 100644
--- a/testdata/language-features/basic-list/listcomp05.out
+++ b/testdata/language-features/basic-list/listcomp05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'List ()[0m
+value :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp05.lc 1:1-1:6  List ()
 testdata/language-features/basic-list/listcomp05.lc 1:9-1:39  List ()
diff --git a/testdata/language-features/basic-list/listcomp06.out b/testdata/language-features/basic-list/listcomp06.out
index aef51c74..45071292 100644
--- a/testdata/language-features/basic-list/listcomp06.out
+++ b/testdata/language-features/basic-list/listcomp06.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: [32m'List ()[0m
+value1 :: [32mList ()[0m
-value2 :: [32m'List ()[0m
+value2 :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp06.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp06.lc 1:10-1:46  List ()
diff --git a/testdata/language-features/basic-list/listcomp07.out b/testdata/language-features/basic-list/listcomp07.out
index 4b7b54ef..3fc2fb5c 100644
--- a/testdata/language-features/basic-list/listcomp07.out
+++ b/testdata/language-features/basic-list/listcomp07.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: [32m'List ()[0m
+value1 :: [32mList ()[0m
-value2 :: [32m'List ()[0m
+value2 :: [32mList ()[0m
-value3 :: [32m'List ()[0m
+value3 :: [32mList ()[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp07.lc 1:1-1:7  List ()
 testdata/language-features/basic-list/listcomp07.lc 1:10-6:11  List ()
diff --git a/testdata/language-features/basic-list/listcomp09.out b/testdata/language-features/basic-list/listcomp09.out
index bebcfae6..2e6ce09f 100644
--- a/testdata/language-features/basic-list/listcomp09.out
+++ b/testdata/language-features/basic-list/listcomp09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value1 :: [32mType => 'List (() -> 'String)[0m
+value1 :: [32mType => List (() -> String)[0m
 ------------ tooltips
 testdata/language-features/basic-list/listcomp09.lc 1:1-1:7  Type => List (() -> String)
 testdata/language-features/basic-list/listcomp09.lc 1:10-1:36  List (() -> String)
diff --git a/testdata/language-features/basic-values/bool01.out b/testdata/language-features/basic-values/bool01.out
index a78cfe8f..3fd03cdf 100644
--- a/testdata/language-features/basic-values/bool01.out
+++ b/testdata/language-features/basic-values/bool01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: [32m'Bool[0m
+value1 :: [32mBool[0m
-value2 :: [32m'Bool[0m
+value2 :: [32mBool[0m
 ------------ tooltips
 testdata/language-features/basic-values/bool01.lc 1:1-1:7  Bool
 testdata/language-features/basic-values/bool01.lc 1:10-1:14  Bool
diff --git a/testdata/language-features/basic-values/case02.out b/testdata/language-features/basic-values/case02.out
index e1b5a2e5..974b56da 100644
--- a/testdata/language-features/basic-values/case02.out
+++ b/testdata/language-features/basic-values/case02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value1 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
-value2 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => 'String[0m
+value2 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => String[0m
 ------------ tooltips
 testdata/language-features/basic-values/case02.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/case02.lc 1:10-3:10  ()
diff --git a/testdata/language-features/basic-values/case05.out b/testdata/language-features/basic-values/case05.out
index 717b0920..e77a1024 100644
--- a/testdata/language-features/basic-values/case05.out
+++ b/testdata/language-features/basic-values/case05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+value :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/basic-values/case05.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case05.lc 1:11-2:11  Char
diff --git a/testdata/language-features/basic-values/case06.out b/testdata/language-features/basic-values/case06.out
index 40e7db3b..d2524007 100644
--- a/testdata/language-features/basic-values/case06.out
+++ b/testdata/language-features/basic-values/case06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+value :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/basic-values/case06.lc 1:1-1:6  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/case06.lc 1:11-3:11  Char
diff --git a/testdata/language-features/basic-values/data01.out b/testdata/language-features/basic-values/data01.out
index b429a33b..294c3b86 100644
--- a/testdata/language-features/basic-values/data01.out
+++ b/testdata/language-features/basic-values/data01.out
@@ -1,23 +1,23 @@
 main is not found
 ------------ trace
 'A :: [32mType[0m
-B :: [32m'A[0m
+B :: [32mA[0m
-C :: [32m'A[0m
+C :: [32mA[0m
-D :: [32m'A[0m
+D :: [32mA[0m
-'ACase :: [32mforall (a :: 'A -> Type) -> [32m[32ma[0;32m [32mB[0;32m[0;32m -> [32m[32ma[0;32m [32mC[0;32m[0;32m -> [32m[32ma[0;32m [32mD[0;32m[0;32m -> forall (b :: 'A) -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+'ACase :: [32mforall (a :: A -> Type) -> [32m[32ma[0;32m [32m'B[0;32m[0;32m -> [32m[32ma[0;32m [32m'C[0;32m[0;32m -> [32m[32ma[0;32m [32m'D[0;32m[0;32m -> forall (b :: A) -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
-match'A :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32m'A[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'A :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mA[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
 'E :: [32mType[0m
-F :: [32m'E[0m
+F :: [32mE[0m
-G :: [32m() -> 'E[0m
+G :: [32m() -> E[0m
-H :: [32m'E[0m
+H :: [32mE[0m
-'ECase :: [32mforall (a :: 'E -> Type) -> [32m[32ma[0;32m [32mF[0;32m[0;32m -> (forall (b :: ()) -> [32m[32ma[0;32m [32m(G [32mb[0;32m)[0;32m[0;32m) -> [32m[32ma[0;32m [32mH[0;32m[0;32m -> forall (c :: 'E) -> [32m[32ma[0;32m [32m[32mc[0;32m[0;32m[0;32m[0m
+'ECase :: [32mforall (a :: E -> Type) -> [32m[32ma[0;32m [32m'F[0;32m[0;32m -> (forall (b :: ()) -> [32m[32ma[0;32m [32m('G [32mb[0;32m)[0;32m[0;32m) -> [32m[32ma[0;32m [32m'H[0;32m[0;32m -> forall (c :: E) -> [32m[32ma[0;32m [32m[32mc[0;32m[0;32m[0;32m[0m
-match'E :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32m'E[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'E :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mE[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
 'D1 :: [32mType[0m
-C1 :: [32m'D1[0m
+C1 :: [32mD1[0m
-C2 :: [32m() -> 'D1[0m
+C2 :: [32m() -> D1[0m
-C3 :: [32m'D1[0m
+C3 :: [32mD1[0m
-'D1Case :: [32mforall (a :: 'D1 -> Type) -> [32m[32ma[0;32m [32mC1[0;32m[0;32m -> (forall (b :: ()) -> [32m[32ma[0;32m [32m(C2 [32mb[0;32m)[0;32m[0;32m) -> [32m[32ma[0;32m [32mC3[0;32m[0;32m -> forall (c :: 'D1) -> [32m[32ma[0;32m [32m[32mc[0;32m[0;32m[0;32m[0m
+'D1Case :: [32mforall (a :: D1 -> Type) -> [32m[32ma[0;32m [32m'C1[0;32m[0;32m -> (forall (b :: ()) -> [32m[32ma[0;32m [32m('C2 [32mb[0;32m)[0;32m[0;32m) -> [32m[32ma[0;32m [32m'C3[0;32m[0;32m -> forall (c :: D1) -> [32m[32ma[0;32m [32m[32mc[0;32m[0;32m[0;32m[0m
-match'D1 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32m'D1[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'D1 :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mD1[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
 ------------ tooltips
 testdata/language-features/basic-values/data01.lc 1:6-1:7  Type
 testdata/language-features/basic-values/data01.lc 1:6-1:13  Type
diff --git a/testdata/language-features/basic-values/def01.out b/testdata/language-features/basic-values/def01.out
index 6c174057..712cd657 100644
--- a/testdata/language-features/basic-values/def01.out
+++ b/testdata/language-features/basic-values/def01.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
 unit :: [32m()[0m
-fun1 :: [32mforall a b . [32m'Num [32m[32mb[0;32m[0;32m[0;32m => [32ma[0;32m -> [32mb[0;32m[0m
+fun1 :: [32mforall a b . [32mNum [32m[32mb[0;32m[0;32m[0;32m => [32ma[0;32m -> [32mb[0;32m[0m
-fun2 :: [32mforall a b c d e . [32ma[0;32m -> [32mb[0;32m -> [32mc[0;32m -> [32md[0;32m -> [32me[0;32m -> 'Char[0m
+fun2 :: [32mforall a b c d e . [32ma[0;32m -> [32mb[0;32m -> [32mc[0;32m -> [32md[0;32m -> [32me[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/basic-values/def01.lc 1:1-1:5  ()
 testdata/language-features/basic-values/def01.lc 1:8-1:10  ()
diff --git a/testdata/language-features/basic-values/def03.out b/testdata/language-features/basic-values/def03.out
index bd9e7133..38bae81f 100644
--- a/testdata/language-features/basic-values/def03.out
+++ b/testdata/language-features/basic-values/def03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+fun :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/basic-values/def03.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def03.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def04.out b/testdata/language-features/basic-values/def04.out
index 1f3fbeb7..977601b2 100644
--- a/testdata/language-features/basic-values/def04.out
+++ b/testdata/language-features/basic-values/def04.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-fun :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+fun :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
-fun2 :: [32mforall a b . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> [32mb[0;32m -> 'Char[0m
+fun2 :: [32mforall a b . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> [32mb[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/basic-values/def04.lc 1:1-1:4  forall a . (Eq a, Num a, Eq a, Num a) => a -> Char
 testdata/language-features/basic-values/def04.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/def07.reject.out b/testdata/language-features/basic-values/def07.reject.out
index c52ecc70..8cb5a1a4 100644
--- a/testdata/language-features/basic-values/def07.reject.out
+++ b/testdata/language-features/basic-values/def07.reject.out
@@ -5,9 +5,9 @@ and at testdata/language-features/basic-values/def07.reject.lc:1:1:
 fun 1 = '1'
 ^^^
 ------------ trace
-fun :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+fun :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
-fun2 :: [32mforall a b . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> [32mb[0;32m -> 'Char[0m
+fun2 :: [32mforall a b . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> [32mb[0;32m -> Char[0m
-fun :: [32mforall a . [32ma[0;32m -> 'Char[0m
+fun :: [32mforall a . [32ma[0;32m -> Char[0m
 !already defined fun at testdata/language-features/basic-values/def07.reject.lc:4:1:
 fun _ = '_'
 ^^^
diff --git a/testdata/language-features/basic-values/deforder01.out b/testdata/language-features/basic-values/deforder01.out
index 5dd94137..325f4361 100644
--- a/testdata/language-features/basic-values/deforder01.out
+++ b/testdata/language-features/basic-values/deforder01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: [32m'Char[0m
+x :: [32mChar[0m
-y :: [32m'Char[0m
+y :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder01.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder01.lc 1:5-1:8  Char
diff --git a/testdata/language-features/basic-values/deforder02.out b/testdata/language-features/basic-values/deforder02.out
index 473b93ff..9f79a9bd 100644
--- a/testdata/language-features/basic-values/deforder02.out
+++ b/testdata/language-features/basic-values/deforder02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-x :: [32m'Char[0m
+x :: [32mChar[0m
-y :: [32m'Char[0m
+y :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder02.lc 1:1-1:2  Char
 testdata/language-features/basic-values/deforder02.lc 1:5-1:6  Char
diff --git a/testdata/language-features/basic-values/deforder03.out b/testdata/language-features/basic-values/deforder03.out
index f7c5fa08..d98597f6 100644
--- a/testdata/language-features/basic-values/deforder03.out
+++ b/testdata/language-features/basic-values/deforder03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'Char[0m
+value :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder03.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder03.lc 1:17-1:19  ()
diff --git a/testdata/language-features/basic-values/deforder04.out b/testdata/language-features/basic-values/deforder04.out
index 430a18c3..5d6e1d80 100644
--- a/testdata/language-features/basic-values/deforder04.out
+++ b/testdata/language-features/basic-values/deforder04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'Char[0m
+value :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder04.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder04.lc 1:17-1:18  ()
diff --git a/testdata/language-features/basic-values/deforder05.out b/testdata/language-features/basic-values/deforder05.out
index 59230da2..73897e36 100644
--- a/testdata/language-features/basic-values/deforder05.out
+++ b/testdata/language-features/basic-values/deforder05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'Char[0m
+value :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder05.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder05.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/deforder06.out b/testdata/language-features/basic-values/deforder06.out
index 55bffe51..794432d6 100644
--- a/testdata/language-features/basic-values/deforder06.out
+++ b/testdata/language-features/basic-values/deforder06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'Char[0m
+value :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/deforder06.lc 1:1-1:6  Char
 testdata/language-features/basic-values/deforder06.lc 1:9-1:12  Char
diff --git a/testdata/language-features/basic-values/fixity02.out b/testdata/language-features/basic-values/fixity02.out
index 2f87c92d..e16184f0 100644
--- a/testdata/language-features/basic-values/fixity02.out
+++ b/testdata/language-features/basic-values/fixity02.out
@@ -4,21 +4,21 @@ funL :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32ma[0;32m[0m
 funR :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32mb[0;32m[0m
 <@ :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32ma[0;32m[0m
 @> :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32mb[0;32m[0m
-value1 :: [32m'Float[0m
+value1 :: [32mFloat[0m
-value2 :: [32m'Float[0m
+value2 :: [32mFloat[0m
-value3 :: [32m'Float[0m
+value3 :: [32mFloat[0m
-value4 :: [32m'Float[0m
+value4 :: [32mFloat[0m
-value5 :: [32m'String[0m
+value5 :: [32mString[0m
-value6 :: [32m'Char[0m
+value6 :: [32mChar[0m
-value7 :: [32m'String[0m
+value7 :: [32mString[0m
 value8 :: [32m()[0m
-funValue1 :: [32m'Float[0m
+funValue1 :: [32mFloat[0m
-funValue2 :: [32m'Float[0m
+funValue2 :: [32mFloat[0m
-funValue3 :: [32m'Float[0m
+funValue3 :: [32mFloat[0m
-funValue4 :: [32m'Float[0m
+funValue4 :: [32mFloat[0m
-funValue5 :: [32m'String[0m
+funValue5 :: [32mString[0m
-funValue6 :: [32m'Char[0m
+funValue6 :: [32mChar[0m
-funValue7 :: [32m'String[0m
+funValue7 :: [32mString[0m
 funValue8 :: [32m()[0m
 ------------ tooltips
 testdata/language-features/basic-values/fixity02.lc 1:1-1:5  forall a b . a -> b -> a
diff --git a/testdata/language-features/basic-values/if01.out b/testdata/language-features/basic-values/if01.out
index 991efd46..b68d03e3 100644
--- a/testdata/language-features/basic-values/if01.out
+++ b/testdata/language-features/basic-values/if01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 value1 :: [32m()[0m
-value2 :: [32m'Float[0m
+value2 :: [32mFloat[0m
 ------------ tooltips
 testdata/language-features/basic-values/if01.lc 1:1-1:7  ()
 testdata/language-features/basic-values/if01.lc 1:10-1:33  ()
diff --git a/testdata/language-features/basic-values/infix03.out b/testdata/language-features/basic-values/infix03.out
index 3420e35e..213d9e06 100644
--- a/testdata/language-features/basic-values/infix03.out
+++ b/testdata/language-features/basic-values/infix03.out
@@ -1,12 +1,12 @@
 main is not found
 ------------ trace
 'D :: [32mType[0m
-D2 :: [32m() -> () -> 'D[0m
+D2 :: [32m() -> () -> D[0m
-D3 :: [32m() -> () -> () -> 'D[0m
+D3 :: [32m() -> () -> () -> D[0m
-'DCase :: [32mforall (a :: 'D -> Type) -> (forall (b :: ()) (c :: ()) -> [32m[32ma[0;32m [32m(D2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> (forall (d :: ()) (e :: ()) (f :: ()) -> [32m[32ma[0;32m [32m(D3 [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m) -> forall (g :: 'D) -> [32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m
+'DCase :: [32mforall (a :: D -> Type) -> (forall (b :: ()) (c :: ()) -> [32m[32ma[0;32m [32m('D2 [32mb[0;32m [32mc[0;32m)[0;32m[0;32m) -> (forall (d :: ()) (e :: ()) (f :: ()) -> [32m[32ma[0;32m [32m('D3 [32md[0;32m [32me[0;32m [32mf[0;32m)[0;32m[0;32m) -> forall (g :: D) -> [32m[32ma[0;32m [32m[32mg[0;32m[0;32m[0;32m[0m
-match'D :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32m'D[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
+match'D :: [32mforall (a :: Type -> Type) -> [32m[32ma[0;32m [32mD[0;32m[0;32m -> forall b -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m -> [32m[32ma[0;32m [32m[32mb[0;32m[0;32m[0;32m[0m
-d2 :: [32m() -> () -> 'D[0m
+d2 :: [32m() -> () -> D[0m
-d3 :: [32m() -> () -> () -> 'D[0m
+d3 :: [32m() -> () -> () -> D[0m
 ------------ tooltips
 testdata/language-features/basic-values/infix03.lc 1:6-1:7  Type
 testdata/language-features/basic-values/infix03.lc 1:6-1:18  Type
diff --git a/testdata/language-features/basic-values/let01.out b/testdata/language-features/basic-values/let01.out
index 8ab8c8e0..36ecf369 100644
--- a/testdata/language-features/basic-values/let01.out
+++ b/testdata/language-features/basic-values/let01.out
@@ -1,10 +1,10 @@
 main is not found
 ------------ trace
-value1 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+value1 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-value2 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+value2 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-value3 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+value3 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-value4 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+value4 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-value5 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+value5 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
 ------------ tooltips
 testdata/language-features/basic-values/let01.lc 1:1-1:7  forall a . Num a => a
 testdata/language-features/basic-values/let01.lc 1:18-1:19  _b
diff --git a/testdata/language-features/basic-values/literal01.out b/testdata/language-features/basic-values/literal01.out
index 0f7b3dbf..abaca3a7 100644
--- a/testdata/language-features/basic-values/literal01.out
+++ b/testdata/language-features/basic-values/literal01.out
@@ -1,13 +1,13 @@
 main is not found
 ------------ trace
-intValue1 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+intValue1 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-intValue2 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+intValue2 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-intValue3 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+intValue3 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-floatValue1 :: [32m'Float[0m
+floatValue1 :: [32mFloat[0m
-floatValue2 :: [32m'Float[0m
+floatValue2 :: [32mFloat[0m
-charValue :: [32m'Char[0m
+charValue :: [32mChar[0m
-stringValue1 :: [32m'String[0m
+stringValue1 :: [32mString[0m
-stringValue2 :: [32m'String[0m
+stringValue2 :: [32mString[0m
 ------------ tooltips
 testdata/language-features/basic-values/literal01.lc 1:1-1:10  forall a . Num a => a
 testdata/language-features/basic-values/literal01.lc 1:13-1:14  _b
diff --git a/testdata/language-features/basic-values/shadowing01.out b/testdata/language-features/basic-values/shadowing01.out
index 8956a8a3..9a8f5f22 100644
--- a/testdata/language-features/basic-values/shadowing01.out
+++ b/testdata/language-features/basic-values/shadowing01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'Char[0m
+value :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/shadowing01.lc 1:1-1:6  Char
 testdata/language-features/basic-values/shadowing01.lc 2:11-2:14  Char
diff --git a/testdata/language-features/basic-values/shadowing02.out b/testdata/language-features/basic-values/shadowing02.out
index 201f5f75..d4d4373b 100644
--- a/testdata/language-features/basic-values/shadowing02.out
+++ b/testdata/language-features/basic-values/shadowing02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-c :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
+c :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => [32ma[0;32m[0m
-world :: [32m'String[0m
+world :: [32mString[0m
-value2 :: [32m'Char[0m
+value2 :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/shadowing02.lc 1:1-1:2  forall a . Num a => a
 testdata/language-features/basic-values/shadowing02.lc 1:5-1:6  _b
diff --git a/testdata/language-features/basic-values/tuple02.out b/testdata/language-features/basic-values/tuple02.out
index 649fc85f..4e15f913 100644
--- a/testdata/language-features/basic-values/tuple02.out
+++ b/testdata/language-features/basic-values/tuple02.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-tuple1 :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => ([32ma[0;32m, 'Float, 'Char, 'String, ())[0m
+tuple1 :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => ([32ma[0;32m, Float, Char, String, ())[0m
 tuple2 :: [32m((), ())[0m
-tuple3 :: [32m(('String, 'Char), ())[0m
+tuple3 :: [32m((String, Char), ())[0m
 ------------ tooltips
 testdata/language-features/basic-values/tuple02.lc 1:1-1:7  forall a . Num a => (a, Float, Char, String, ())
 testdata/language-features/basic-values/tuple02.lc 1:10-1:33  (_b, Float, Char, String, ())
diff --git a/testdata/language-features/basic-values/typesig01.out b/testdata/language-features/basic-values/typesig01.out
index cd018c6f..c473b40c 100644
--- a/testdata/language-features/basic-values/typesig01.out
+++ b/testdata/language-features/basic-values/typesig01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: [32m'Char[0m
+value1 :: [32mChar[0m
-value2 :: [32m'Char[0m
+value2 :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/typesig01.lc 1:11-1:15  Type
 testdata/language-features/basic-values/typesig01.lc 2:1-2:7  Char
diff --git a/testdata/language-features/basic-values/typesig02.out b/testdata/language-features/basic-values/typesig02.out
index bbaa5075..c1e6361e 100644
--- a/testdata/language-features/basic-values/typesig02.out
+++ b/testdata/language-features/basic-values/typesig02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-value1 :: [32m'Char[0m
+value1 :: [32mChar[0m
-value2 :: [32m'Char[0m
+value2 :: [32mChar[0m
 ------------ tooltips
 testdata/language-features/basic-values/typesig02.lc 1:1-1:7  Char
 testdata/language-features/basic-values/typesig02.lc 1:10-1:13  Char
diff --git a/testdata/language-features/basic-values/typesig05.out b/testdata/language-features/basic-values/typesig05.out
index 1e8fa0f6..d107f4eb 100644
--- a/testdata/language-features/basic-values/typesig05.out
+++ b/testdata/language-features/basic-values/typesig05.out
@@ -2,10 +2,10 @@ main is not found
 ------------ trace
 funL :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32ma[0;32m[0m
 funR :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32mb[0;32m[0m
-value1 :: [32m'Char[0m
+value1 :: [32mChar[0m
-value2 :: [32m'String[0m
+value2 :: [32mString[0m
-value3 :: [32m'Char[0m
+value3 :: [32mChar[0m
-value4 :: [32m'String[0m
+value4 :: [32mString[0m
 ------------ tooltips
 testdata/language-features/basic-values/typesig05.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig05.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig06.out b/testdata/language-features/basic-values/typesig06.out
index a5bcd427..c249026f 100644
--- a/testdata/language-features/basic-values/typesig06.out
+++ b/testdata/language-features/basic-values/typesig06.out
@@ -2,8 +2,8 @@ main is not found
 ------------ trace
 funL :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32ma[0;32m[0m
 <@ :: [32mforall a b . [32ma[0;32m -> [32mb[0;32m -> [32ma[0;32m[0m
-value1 :: [32m'String[0m
+value1 :: [32mString[0m
-value2 :: [32m'String[0m
+value2 :: [32mString[0m
 ------------ tooltips
 testdata/language-features/basic-values/typesig06.lc 1:1-1:5  forall a b . a -> b -> a
 testdata/language-features/basic-values/typesig06.lc 1:12-1:13  _d
diff --git a/testdata/language-features/basic-values/typesig07.out b/testdata/language-features/basic-values/typesig07.out
index d8beb681..65ce8df7 100644
--- a/testdata/language-features/basic-values/typesig07.out
+++ b/testdata/language-features/basic-values/typesig07.out
@@ -1,8 +1,8 @@
 main is not found
 ------------ trace
-value1 :: [32m'Int[0m
+value1 :: [32mInt[0m
-value2 :: [32m'Int[0m
+value2 :: [32mInt[0m
-value3 :: [32m'Int[0m
+value3 :: [32mInt[0m
 value4 :: [32m() -> () -> ()[0m
 @@@ :: [32m() -> () -> ()[0m
 value6 :: [32m() -> () -> ()[0m
diff --git a/testdata/language-features/basic-values/where05.out b/testdata/language-features/basic-values/where05.out
index a0785fa9..11743f93 100644
--- a/testdata/language-features/basic-values/where05.out
+++ b/testdata/language-features/basic-values/where05.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-value1 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value1 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
-value2 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value2 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
-value3 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value3 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
-value4 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value4 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
 ------------ tooltips
 testdata/language-features/basic-values/where05.lc 1:1-1:7  forall a . (Eq a, Num a) => ()
 testdata/language-features/basic-values/where05.lc 1:10-3:10  ()
diff --git a/testdata/language-features/guard/guard03.out b/testdata/language-features/guard/guard03.out
index 2af70393..7090e22b 100644
--- a/testdata/language-features/guard/guard03.out
+++ b/testdata/language-features/guard/guard03.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'String[0m
+value :: [32mString[0m
 ------------ tooltips
 testdata/language-features/guard/guard03.lc 1:1-1:6  String
 testdata/language-features/guard/guard03.lc 2:5-2:9  Bool
diff --git a/testdata/language-features/guard/guard04.out b/testdata/language-features/guard/guard04.out
index bf31f3ec..3f34c61b 100644
--- a/testdata/language-features/guard/guard04.out
+++ b/testdata/language-features/guard/guard04.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'String[0m
+value :: [32mString[0m
 ------------ tooltips
 testdata/language-features/guard/guard04.lc 1:1-1:6  String
 testdata/language-features/guard/guard04.lc 2:5-2:9  Bool
diff --git a/testdata/language-features/guard/guard07.out b/testdata/language-features/guard/guard07.out
index f4e69791..38e182d2 100644
--- a/testdata/language-features/guard/guard07.out
+++ b/testdata/language-features/guard/guard07.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'String[0m
+value :: [32mString[0m
 ------------ tooltips
 testdata/language-features/guard/guard07.lc 1:1-1:6  String
 testdata/language-features/guard/guard07.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard08.out b/testdata/language-features/guard/guard08.out
index 5c9c1111..075a074b 100644
--- a/testdata/language-features/guard/guard08.out
+++ b/testdata/language-features/guard/guard08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'String[0m
+value :: [32mString[0m
 ------------ tooltips
 testdata/language-features/guard/guard08.lc 1:1-1:6  String
 testdata/language-features/guard/guard08.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard09.out b/testdata/language-features/guard/guard09.out
index e0b89ef8..694aaa0a 100644
--- a/testdata/language-features/guard/guard09.out
+++ b/testdata/language-features/guard/guard09.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32m'String[0m
+value :: [32mString[0m
 ------------ tooltips
 testdata/language-features/guard/guard09.lc 1:1-1:6  String
 testdata/language-features/guard/guard09.lc 1:7-1:11  Bool
diff --git a/testdata/language-features/guard/guard11.out b/testdata/language-features/guard/guard11.out
index abf02c69..08498e54 100644
--- a/testdata/language-features/guard/guard11.out
+++ b/testdata/language-features/guard/guard11.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'Bool -> 'String[0m
+fun :: [32mBool -> String[0m
 ------------ tooltips
 testdata/language-features/guard/guard11.lc 1:1-1:4  Bool -> String
 testdata/language-features/guard/guard11.lc 2:5-2:6  _b
diff --git a/testdata/language-features/guard/guard13.out b/testdata/language-features/guard/guard13.out
index 06e22436..2ab6fd64 100644
--- a/testdata/language-features/guard/guard13.out
+++ b/testdata/language-features/guard/guard13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'Bool -> ()[0m
+fun :: [32mBool -> ()[0m
 ------------ tooltips
 testdata/language-features/guard/guard13.lc 1:1-1:4  Bool -> ()
 testdata/language-features/guard/guard13.lc 1:7-1:8  _b
diff --git a/testdata/language-features/guard/guard16.out b/testdata/language-features/guard/guard16.out
index d2bec88d..1c3bd27d 100644
--- a/testdata/language-features/guard/guard16.out
+++ b/testdata/language-features/guard/guard16.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-value :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
+value :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => ()[0m
 ------------ tooltips
 testdata/language-features/guard/guard16.lc 1:1-1:6  forall a . (Eq a, Num a) => ()
 testdata/language-features/guard/guard16.lc 1:9-3:10  ()
diff --git a/testdata/language-features/module/Hello01.out b/testdata/language-features/module/Hello01.out
index 08a387f1..1092217c 100644
--- a/testdata/language-features/module/Hello01.out
+++ b/testdata/language-features/module/Hello01.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
-world :: [32m'String[0m
+world :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Hello01.lc 3:1-3:6  String
 testdata/language-features/module/Hello01.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Hello02.out b/testdata/language-features/module/Hello02.out
index 17b419db..5add282c 100644
--- a/testdata/language-features/module/Hello02.out
+++ b/testdata/language-features/module/Hello02.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
-world :: [32m'String[0m
+world :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Hello02.lc 3:1-3:6  String
 testdata/language-features/module/Hello02.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Hello03.out b/testdata/language-features/module/Hello03.out
index 4d5deb19..12f70b11 100644
--- a/testdata/language-features/module/Hello03.out
+++ b/testdata/language-features/module/Hello03.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-greeting :: [32m'Char[0m
+greeting :: [32mChar[0m
-value :: [32m'Float[0m
+value :: [32mFloat[0m
 ------------ tooltips
 testdata/language-features/module/Hello03.lc 7:1-7:9  Char
 testdata/language-features/module/Hello03.lc 7:12-7:15  Char
diff --git a/testdata/language-features/module/ModulePackage/SubModule01.out b/testdata/language-features/module/ModulePackage/SubModule01.out
index 347da0c0..513c363e 100644
--- a/testdata/language-features/module/ModulePackage/SubModule01.out
+++ b/testdata/language-features/module/ModulePackage/SubModule01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/ModulePackage/SubModule01.lc 3:1-3:6  String
 testdata/language-features/module/ModulePackage/SubModule01.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Moduledef06.out b/testdata/language-features/module/Moduledef06.out
index 39b689da..0d6e7543 100644
--- a/testdata/language-features/module/Moduledef06.out
+++ b/testdata/language-features/module/Moduledef06.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef06.lc 3:1-3:6  String
 testdata/language-features/module/Moduledef06.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/Moduledef07.out b/testdata/language-features/module/Moduledef07.out
index c465589a..abacda06 100644
--- a/testdata/language-features/module/Moduledef07.out
+++ b/testdata/language-features/module/Moduledef07.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef07.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef07.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef08.out b/testdata/language-features/module/Moduledef08.out
index e6100f0d..873b2467 100644
--- a/testdata/language-features/module/Moduledef08.out
+++ b/testdata/language-features/module/Moduledef08.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef08.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef08.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef09.out b/testdata/language-features/module/Moduledef09.out
index 76e2a240..f8d17e75 100644
--- a/testdata/language-features/module/Moduledef09.out
+++ b/testdata/language-features/module/Moduledef09.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
-world :: [32m'String[0m
+world :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef09.lc 5:1-5:6  String
 testdata/language-features/module/Moduledef09.lc 5:9-5:16  String
diff --git a/testdata/language-features/module/Moduledef10.out b/testdata/language-features/module/Moduledef10.out
index 69ce937f..6064ace1 100644
--- a/testdata/language-features/module/Moduledef10.out
+++ b/testdata/language-features/module/Moduledef10.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
-world :: [32m'String[0m
+world :: [32mString[0m
 value :: [32m()[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef10.lc 6:1-6:6  String
diff --git a/testdata/language-features/module/Moduledef13.out b/testdata/language-features/module/Moduledef13.out
index a5f17505..01a5781b 100644
--- a/testdata/language-features/module/Moduledef13.out
+++ b/testdata/language-features/module/Moduledef13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/Moduledef13.lc 3:1-3:6  String
 testdata/language-features/module/Moduledef13.lc 3:9-3:16  String
diff --git a/testdata/language-features/module/import01.out b/testdata/language-features/module/import01.out
index f22bf842..fbf732d3 100644
--- a/testdata/language-features/module/import01.out
+++ b/testdata/language-features/module/import01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: [32m'String[0m
+x :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import01.lc 3:1-3:2  String
 testdata/language-features/module/import01.lc 3:5-3:10  String
diff --git a/testdata/language-features/module/import04.reject.out b/testdata/language-features/module/import04.reject.out
index 85752b47..da33fb8b 100644
--- a/testdata/language-features/module/import04.reject.out
+++ b/testdata/language-features/module/import04.reject.out
@@ -5,7 +5,7 @@ and at testdata/language-features/module/Hello01.lc:3:1:
 hello = "hello"
 ^^^^^
 ------------ trace
-hello :: [32m'String[0m
+hello :: [32mString[0m
 !already defined hello at testdata/language-features/module/import04.reject.lc:4:1:
 hello = "hello"
 ^^^^^
diff --git a/testdata/language-features/module/import05.out b/testdata/language-features/module/import05.out
index 2d8e2a30..3ed4aafc 100644
--- a/testdata/language-features/module/import05.out
+++ b/testdata/language-features/module/import05.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-x :: [32m'String[0m
+x :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import05.lc 3:6-3:12  Type
 testdata/language-features/module/import05.lc 4:1-4:2  String
diff --git a/testdata/language-features/module/import06.out b/testdata/language-features/module/import06.out
index 7a77815a..b9ec1f0f 100644
--- a/testdata/language-features/module/import06.out
+++ b/testdata/language-features/module/import06.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 hello :: [32m()[0m
-x :: [32m'String[0m
+x :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import06.lc 3:1-3:6  ()
 testdata/language-features/module/import06.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import07.out b/testdata/language-features/module/import07.out
index 818bcafb..10ec3003 100644
--- a/testdata/language-features/module/import07.out
+++ b/testdata/language-features/module/import07.out
@@ -1,7 +1,7 @@
 main is not found
 ------------ trace
 hello :: [32m()[0m
-x :: [32m'String[0m
+x :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import07.lc 3:1-3:6  ()
 testdata/language-features/module/import07.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import08.out b/testdata/language-features/module/import08.out
index 6d053bdf..ea29a899 100644
--- a/testdata/language-features/module/import08.out
+++ b/testdata/language-features/module/import08.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
 value :: [32m()[0m
-g :: [32m'Char[0m
+g :: [32mChar[0m
-h :: [32m'String[0m
+h :: [32mString[0m
-w :: [32m'String[0m
+w :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import08.lc 3:1-3:6  ()
 testdata/language-features/module/import08.lc 3:9-3:11  ()
diff --git a/testdata/language-features/module/import12.out b/testdata/language-features/module/import12.out
index 6f4ea030..fb54d02c 100644
--- a/testdata/language-features/module/import12.out
+++ b/testdata/language-features/module/import12.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'String[0m
+fun :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import12.lc 4:1-4:4  String
 testdata/language-features/module/import12.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import13.out b/testdata/language-features/module/import13.out
index bb815c78..9a46cd6d 100644
--- a/testdata/language-features/module/import13.out
+++ b/testdata/language-features/module/import13.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'String[0m
+fun :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import13.lc 4:1-4:4  String
 testdata/language-features/module/import13.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import14.out b/testdata/language-features/module/import14.out
index cdfebd2b..114303dd 100644
--- a/testdata/language-features/module/import14.out
+++ b/testdata/language-features/module/import14.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'String[0m
+fun :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import14.lc 4:1-4:4  String
 testdata/language-features/module/import14.lc 4:7-4:12  String
diff --git a/testdata/language-features/module/import15.out b/testdata/language-features/module/import15.out
index 5217f2c1..b4d11105 100644
--- a/testdata/language-features/module/import15.out
+++ b/testdata/language-features/module/import15.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32m'String[0m
+fun :: [32mString[0m
 ------------ tooltips
 testdata/language-features/module/import15.lc 3:1-3:4  String
 testdata/language-features/module/import15.lc 3:7-3:12  String
diff --git a/testdata/language-features/pattern/pattern01.out b/testdata/language-features/pattern/pattern01.out
index 2d8ea959..8e753e7d 100644
--- a/testdata/language-features/pattern/pattern01.out
+++ b/testdata/language-features/pattern/pattern01.out
@@ -1,9 +1,9 @@
 main is not found
 ------------ trace
-fun1 :: [32mforall a . ([32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+fun1 :: [32mforall a . ([32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
-fun2 :: [32m'String -> 'Char[0m
+fun2 :: [32mString -> Char[0m
-fun3 :: [32m'Char -> 'Char[0m
+fun3 :: [32mChar -> Char[0m
-fun4 :: [32m() -> 'Char[0m
+fun4 :: [32m() -> Char[0m
 ------------ tooltips
 testdata/language-features/pattern/pattern01.lc 1:1-1:5  forall a . (Eq a, Num a) => a -> Char
 testdata/language-features/pattern/pattern01.lc 1:10-1:13  Char
diff --git a/testdata/language-features/pattern/uncovered.out b/testdata/language-features/pattern/uncovered.out
index f51d2e84..2ff30ef1 100644
--- a/testdata/language-features/pattern/uncovered.out
+++ b/testdata/language-features/pattern/uncovered.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: [32mforall a . [32m'Num [32m[32ma[0;32m[0;32m[0;32m => 'Bool -> 'Bool -> 'Bool -> [32ma[0;32m[0m
+f :: [32mforall a . [32mNum [32m[32ma[0;32m[0;32m[0;32m => Bool -> Bool -> Bool -> [32ma[0;32m[0m
 ------------ tooltips
 testdata/language-features/pattern/uncovered.lc 4:1-4:2  forall a . Num a => Bool -> Bool -> Bool -> a
 testdata/language-features/pattern/uncovered.lc 4:18-4:19  _b
diff --git a/testdata/language-features/pattern/unreachable.out b/testdata/language-features/pattern/unreachable.out
index 4a899374..6c6f0a82 100644
--- a/testdata/language-features/pattern/unreachable.out
+++ b/testdata/language-features/pattern/unreachable.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-f :: [32mforall a . [32ma[0;32m -> 'String[0m
+f :: [32mforall a . [32ma[0;32m -> String[0m
 ------------ tooltips
 testdata/language-features/pattern/unreachable.lc 4:1-4:2  forall a . a -> String
 testdata/language-features/pattern/unreachable.lc 4:7-4:14  String
diff --git a/testdata/language-features/recursion/simplerec01.out b/testdata/language-features/recursion/simplerec01.out
index 42a0f078..f3c0147f 100644
--- a/testdata/language-features/recursion/simplerec01.out
+++ b/testdata/language-features/recursion/simplerec01.out
@@ -1,6 +1,6 @@
 main is not found
 ------------ trace
-fun :: [32mforall a . ([32m'Num [32m[32ma[0;32m[0;32m[0;32m, [32m'Eq [32m[32ma[0;32m[0;32m[0;32m, [32m'Num [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> 'Char[0m
+fun :: [32mforall a . ([32mNum [32m[32ma[0;32m[0;32m[0;32m, [32mEq [32m[32ma[0;32m[0;32m[0;32m, [32mNum [32m[32ma[0;32m[0;32m[0;32m) => [32ma[0;32m -> Char[0m
 ------------ tooltips
 testdata/language-features/recursion/simplerec01.lc 1:1-1:4  forall a . (Num a, Eq a, Num a) => a -> Char
 testdata/language-features/recursion/simplerec01.lc 1:9-1:12  Char