diff --git a/book/BBT.has.linear.kind2 b/book/BBT.has.linear.kind2
index 027fc812a..53cc839da 100644
--- a/book/BBT.has.linear.kind2
+++ b/book/BBT.has.linear.kind2
@@ -10,7 +10,7 @@ BBT.has.linear
   use bin = λsize λnode_key λval λlft λrgt
     use P = λx
       ∀(cmp: ∀(a: K) ∀(b: K) Cmp)
-      ∀(size: #U60)
+      ∀(size: U60)
       ∀(node_key: K)
       ∀(val: V)
       ∀(lft: (BBT K V))
diff --git a/book/Kind.Term.show.go.kind2 b/book/Kind.Term.show.go.kind2
index a05e32d2e..5ea9d12db 100644
--- a/book/Kind.Term.show.go.kind2
+++ b/book/Kind.Term.show.go.kind2
@@ -140,7 +140,7 @@ Kind.Term.show.go
                 z
                 dep
                 (Kind.Text.show.go
-                  "; +: "
+                  "; _: "
                   (Kind.Term.show.go
                     (s (Kind.var (String.concat nam "-1") dep))
                     (Nat.succ dep)
diff --git a/book/Kind.reduce.mat.kind2 b/book/Kind.reduce.mat.kind2
index a8d4d2591..97e3e4e87 100644
--- a/book/Kind.reduce.mat.kind2
+++ b/book/Kind.reduce.mat.kind2
@@ -12,7 +12,7 @@ Kind.reduce.mat
   use Y = λx.val
     switch x = x.val {
       0: λz λs (Kind.reduce maj z)
-      +: λz λs (Kind.reduce maj (s (Kind.num x-1))) 
+      _: λz λs (Kind.reduce maj (s (Kind.num x-1))) 
     }: ∀(z: Kind.Term) ∀(s: ∀(x: Kind.Term) Kind.Term)
     Kind.Term
   use N = λx λz λs (Kind.mat nam x z s p)
diff --git a/book/QBool.kind2 b/book/QBool.kind2
index b74f1d8f3..8b38035e5 100644
--- a/book/QBool.kind2
+++ b/book/QBool.kind2
@@ -8,9 +8,9 @@ QBool
     ∀(x: 
       switch t = t {
         0: (P QBool.true)
-        +: switch t = t-1 {
+        _: switch t = t-1 {
           0: (P QBool.false)
-          +: ∀(x: Empty) * 
+          _: ∀(x: Empty) * 
         }: * 
       }: *
     )
diff --git a/book/QBool.match.kind2 b/book/QBool.match.kind2
index 1f6a65d0d..c8511e3bf 100644
--- a/book/QBool.match.kind2
+++ b/book/QBool.match.kind2
@@ -10,15 +10,15 @@ QBool.match
     λtag
     switch tag = tag {
       0: λx (x t)
-      +: λx
+      _: λx
       (switch tag_1 = tag-1 {
         0: λx (x f)
-        +: λx (x λe (Empty.absurd e *)) 
+        _: λx (x λe (Empty.absurd e *)) 
       }: ∀(x: 
         ∀(x: 
           switch tag_1 = tag_1 {
             0: (P QBool.false)
-            +: ∀(x: Empty) * 
+            _: ∀(x: Empty) * 
           }: *
         )
         (P a)
@@ -30,9 +30,9 @@ QBool.match
       ∀(x: 
         switch tag = tag {
           0: (P QBool.true)
-          +: switch tag_1 = tag-1 {
+          _: switch tag_1 = tag-1 {
             0: (P QBool.false)
-            +: ∀(x: Empty) * 
+            _: ∀(x: Empty) * 
           }: * 
         }: *
       )
diff --git a/book/QBool2.kind2 b/book/QBool2.kind2
index fb5e8c671..0393c05e2 100644
--- a/book/QBool2.kind2
+++ b/book/QBool2.kind2
@@ -6,9 +6,9 @@ QBool2
     ∀(tag: U60)
     switch tag = tag {
       0: (P QBool2.true)
-      +: switch tag_1 = tag-1 {
+      _: switch tag_1 = tag-1 {
         0: (P QBool2.false)
-        +: ∀(e: Empty) * 
+        _: ∀(e: Empty) * 
       }: * 
     }: *
   )
diff --git a/book/QBool2.match.kind2 b/book/QBool2.match.kind2
index 4df4aa9e4..6c89e7352 100644
--- a/book/QBool2.match.kind2
+++ b/book/QBool2.match.kind2
@@ -10,18 +10,18 @@ QBool2.match
     λtag
     switch tag = tag {
       0: t
-      +: switch tag_1 = tag-1 {
+      _: switch tag_1 = tag-1 {
         0: f
-        +: λe (~e λx *) 
+        _: λe (~e λx *) 
       }: switch tag_1 = tag_1 {
         0: (P QBool2.false)
-        +: ∀(e: Empty) * 
+        _: ∀(e: Empty) * 
       }: * 
     }: switch tag = tag {
       0: (P QBool2.true)
-      +: switch tag_1 = tag-1 {
+      _: switch tag_1 = tag-1 {
         0: (P QBool2.false)
-        +: ∀(e: Empty) * 
+        _: ∀(e: Empty) * 
       }: * 
     }: *
   )
diff --git a/book/QUnit.kind2 b/book/QUnit.kind2
index 331b1c1e0..e0b9effd3 100644
--- a/book/QUnit.kind2
+++ b/book/QUnit.kind2
@@ -7,6 +7,6 @@ QUnit
     λtag
     switch tag = tag {
       0: ∀(one: (P QUnit.one)) (P self)
-      +: Empty 
+      _: Empty 
     }: *
   )
\ No newline at end of file
diff --git a/book/U60.equal.kind2 b/book/U60.equal.kind2
index 22a77793d..5108af028 100644
--- a/book/U60.equal.kind2
+++ b/book/U60.equal.kind2
@@ -3,5 +3,5 @@ U60.equal
 = λa λb
   switch x = (== a b) {
     0: Bool.false
-    +: Bool.true 
+    _: Bool.true 
   }: Bool
diff --git a/book/U60.if.kind2 b/book/U60.if.kind2
index 65385e9b5..96f8fdda0 100644
--- a/book/U60.if.kind2
+++ b/book/U60.if.kind2
@@ -1,3 +1,3 @@
 U60.if
 : ∀(x: U60) ∀(P: *) ∀(t: P) ∀(f: P) P
-= λx λP λt λf switch x = x { 0: t +: f }: P
\ No newline at end of file
+= λx λP λt λf switch x = x { 0: t _: f }: P
\ No newline at end of file
diff --git a/book/U60.match.kind2 b/book/U60.match.kind2
index 1862c491e..50f55e3a0 100644
--- a/book/U60.match.kind2
+++ b/book/U60.match.kind2
@@ -5,4 +5,4 @@ U60.switch
   ∀(z: (P 0))
   (P x)
 = λx λP λs λz
-  switch self = x { 0: z +: (s self-1) }: (P self)
\ No newline at end of file
+  switch self = x { 0: z _: (s self-1) }: (P self)
\ No newline at end of file
diff --git a/book/U60.name.go.kind2 b/book/U60.name.go.kind2
index 13d35d6d6..c356d0724 100644
--- a/book/U60.name.go.kind2
+++ b/book/U60.name.go.kind2
@@ -3,7 +3,7 @@ U60.name.go
 = λn
   switch n = n {
     0: λnil nil
-    +: λnil
+    _: λnil
     (String.cons
       (+ 97 (% n-1 26))
       (U60.name.go (/ n-1 26) nil)
diff --git a/book/U60.show.go.kind2 b/book/U60.show.go.kind2
index 02f8db887..d56df1cf9 100644
--- a/book/U60.show.go.kind2
+++ b/book/U60.show.go.kind2
@@ -7,5 +7,5 @@ U60.show.go
       (/ n 10)
       (String.cons (+ 48 (% n 10)) nil)
     )
-    +: λnil (String.cons (+ 48 n) nil) 
+    _: λnil (String.cons (+ 48 n) nil) 
   }: String.Concatenator
\ No newline at end of file
diff --git a/book/U60.to_bool.kind2 b/book/U60.to_bool.kind2
index 00b55b2a2..cceebad2a 100644
--- a/book/U60.to_bool.kind2
+++ b/book/U60.to_bool.kind2
@@ -1,5 +1,5 @@
 U60.to_bool (x: U60) : Bool =
   switch x {
     0: Bool.false
-    +: Bool.true
+    _: Bool.true
   }: Bool