diff --git a/unison-src/transcripts/delete.md b/unison-src/transcripts/delete.md
index aadb7a602..9c1b8efd1 100644
--- a/unison-src/transcripts/delete.md
+++ b/unison-src/transcripts/delete.md
@@ -1,7 +1,7 @@
 # Delete
 
 ```ucm:hide
-.> builtins.merge
+scratch/main> builtins.merge lib.builtins
 ```
 
 The delete command can delete both terms and types.
@@ -10,7 +10,7 @@ First, let's make sure it complains when we try to delete a name that doesn't
 exist.
 
 ```ucm:error
-.> delete.verbose foo
+scratch/main> delete.verbose foo
 ```
 
 Now for some easy cases. Deleting an unambiguous term, then deleting an
@@ -22,43 +22,43 @@ structural type Foo = Foo ()
 ```
 
 ```ucm
-.> add
-.> delete.verbose foo
-.> delete.verbose Foo
-.> delete.verbose Foo.Foo
+scratch/main> add
+scratch/main> delete.verbose foo
+scratch/main> delete.verbose Foo
+scratch/main> delete.verbose Foo.Foo
 ```
 
 How about an ambiguous term?
 
 ```unison:hide
-foo = 1
-bar = 2
+a.foo = 1
+a.bar = 2
 ```
 
 ```ucm
-.a> add
-.a> debug.alias.term.force bar foo
+scratch/main> add
+scratch/main> debug.alias.term.force a.bar a.foo
 ```
 
 A delete should remove both versions of the term.
 
 ```ucm
-.> delete.verbose a.foo
-.a> ls
+scratch/main> delete.verbose a.foo
+scratch/main> ls a
 ```
 
 Let's repeat all that on a type, for completeness.
 
 ```unison:hide
-structural type Foo = Foo ()
-structural type Bar = Bar
+structural type a.Foo = Foo ()
+structural type a.Bar = Bar
 ```
 
 ```ucm
-.a> add
-.a> debug.alias.type.force Bar Foo
-.> delete.verbose a.Foo
-.> delete.verbose a.Foo.Foo
+scratch/main> add
+scratch/main> debug.alias.type.force a.Bar a.Foo
+scratch/main> delete.verbose a.Foo
+scratch/main> delete.verbose a.Foo.Foo
 ```
 
 Finally, let's try to delete a term and a type with the same name.
@@ -69,8 +69,8 @@ structural type foo = Foo ()
 ```
 
 ```ucm
-.> add
-.> delete.verbose foo
+scratch/main> add
+scratch/main> delete.verbose foo
 ```
 
 We want to be able to delete multiple terms at once
@@ -82,8 +82,8 @@ c = "c"
 ```
 
 ```ucm
-.> add
-.> delete.verbose a b c
+scratch/main> add
+scratch/main> delete.verbose a b c
 ```
 
 We can delete terms and types in the same invocation of delete
@@ -96,9 +96,9 @@ c = "c"
 ```
 
 ```ucm
-.> add
-.> delete.verbose a b c Foo
-.> delete.verbose Foo.Foo
+scratch/main> add
+scratch/main> delete.verbose a b c Foo
+scratch/main> delete.verbose Foo.Foo
 ```
 
 We can delete a type and its constructors
@@ -108,8 +108,8 @@ structural type Foo = Foo ()
 ```
 
 ```ucm
-.> add
-.> delete.verbose Foo Foo.Foo
+scratch/main> add
+scratch/main> delete.verbose Foo Foo.Foo
 ```
 
 You should not be able to delete terms which are referenced by other terms
@@ -122,8 +122,8 @@ d = a + b + c
 ```
 
 ```ucm:error
-.> add
-.> delete.verbose a b c
+scratch/main> add
+scratch/main> delete.verbose a b c
 ```
 
 But you should be able to delete all terms which reference each other in a single command
@@ -136,8 +136,8 @@ h = e + f + g
 ```
 
 ```ucm
-.> add
-.> delete.verbose e f g h
+scratch/main> add
+scratch/main> delete.verbose e f g h
 ```
 
 You should be able to delete a type and all the functions that reference it in a single command
@@ -151,8 +151,8 @@ incrementFoo = cases
 ```
 
 ```ucm
-.> add
-.> delete.verbose Foo Foo.Foo incrementFoo
+scratch/main> add
+scratch/main> delete.verbose Foo Foo.Foo incrementFoo
 ```
 
 If you mess up on one of the names of your command, delete short circuits
@@ -165,8 +165,8 @@ h = e + f + g
 ```
 
 ```ucm:error
-.> add
-.> delete.verbose e f gg
+scratch/main> add
+scratch/main> delete.verbose e f gg
 ```
 
 Cyclical terms which are guarded by a lambda are allowed to be deleted
@@ -177,7 +177,7 @@ pong _ = 4 Nat.+ !ping
 ```
 
 ```ucm
-.> add
-.> delete.verbose ping
-.> view pong
+scratch/main> add
+scratch/main> delete.verbose ping
+scratch/main> view pong
 ```
diff --git a/unison-src/transcripts/delete.output.md b/unison-src/transcripts/delete.output.md
index 14ca930fe..46414513b 100644
--- a/unison-src/transcripts/delete.output.md
+++ b/unison-src/transcripts/delete.output.md
@@ -6,7 +6,7 @@ First, let's make sure it complains when we try to delete a name that doesn't
 exist.
 
 ```ucm
-.> delete.verbose foo
+scratch/main> delete.verbose foo
 
   ⚠️
   
@@ -23,14 +23,14 @@ structural type Foo = Foo ()
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
     structural type Foo
     foo : Nat
 
-.> delete.verbose foo
+scratch/main> delete.verbose foo
 
   Removed definitions:
   
@@ -38,7 +38,7 @@ structural type Foo = Foo ()
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.> delete.verbose Foo
+scratch/main> delete.verbose Foo
 
   Removed definitions:
   
@@ -46,7 +46,7 @@ structural type Foo = Foo ()
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.> delete.verbose Foo.Foo
+scratch/main> delete.verbose Foo.Foo
 
   Removed definitions:
   
@@ -58,21 +58,19 @@ structural type Foo = Foo ()
 How about an ambiguous term?
 
 ```unison
-foo = 1
-bar = 2
+a.foo = 1
+a.bar = 2
 ```
 
 ```ucm
-  ☝️  The namespace .a is empty.
-
-.a> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
-    bar : ##Nat
-    foo : ##Nat
+    a.bar : Nat
+    a.foo : Nat
 
-.a> debug.alias.term.force bar foo
+scratch/main> debug.alias.term.force a.bar a.foo
 
   Done.
 
@@ -80,7 +78,7 @@ bar = 2
 A delete should remove both versions of the term.
 
 ```ucm
-.> delete.verbose a.foo
+scratch/main> delete.verbose a.foo
 
   Removed definitions:
   
@@ -94,31 +92,32 @@ A delete should remove both versions of the term.
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.a> ls
+scratch/main> ls a
 
-  1. bar (##Nat)
+  1. bar (Nat)
 
 ```
 Let's repeat all that on a type, for completeness.
 
 ```unison
-structural type Foo = Foo ()
-structural type Bar = Bar
+structural type a.Foo = Foo ()
+structural type a.Bar = Bar
 ```
 
 ```ucm
-.a> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
-    structural type Bar
-    structural type Foo
+    structural type a.Bar
+      (also named lib.builtins.Unit)
+    structural type a.Foo
 
-.a> debug.alias.type.force Bar Foo
+scratch/main> debug.alias.type.force a.Bar a.Foo
 
   Done.
 
-.> delete.verbose a.Foo
+scratch/main> delete.verbose a.Foo
 
   Removed definitions:
   
@@ -126,14 +125,14 @@ structural type Bar = Bar
   
   Name changes:
   
-    Original               Changes
-    2. a.Bar            ┐  3. a.Foo#00nv2kob8f (removed)
-    4. builtin.Unit     │  
-    5. a.Foo#00nv2kob8f ┘  
+    Original                Changes
+    2. a.Bar             ┐  3. a.Foo#00nv2kob8f (removed)
+    4. lib.builtins.Unit │  
+    5. a.Foo#00nv2kob8f  ┘  
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.> delete.verbose a.Foo.Foo
+scratch/main> delete.verbose a.Foo.Foo
 
   Removed definitions:
   
@@ -150,14 +149,14 @@ structural type foo = Foo ()
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
     structural type foo
     foo : Nat
 
-.> delete.verbose foo
+scratch/main> delete.verbose foo
 
   Removed definitions:
   
@@ -176,7 +175,7 @@ c = "c"
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
@@ -184,7 +183,7 @@ c = "c"
     b : Text
     c : Text
 
-.> delete.verbose a b c
+scratch/main> delete.verbose a b c
 
   Removed definitions:
   
@@ -205,7 +204,7 @@ c = "c"
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
@@ -214,7 +213,7 @@ c = "c"
     b : Text
     c : Text
 
-.> delete.verbose a b c Foo
+scratch/main> delete.verbose a b c Foo
 
   Removed definitions:
   
@@ -225,7 +224,7 @@ c = "c"
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.> delete.verbose Foo.Foo
+scratch/main> delete.verbose Foo.Foo
 
   Name changes:
   
@@ -243,13 +242,13 @@ structural type Foo = Foo ()
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
     structural type Foo
 
-.> delete.verbose Foo Foo.Foo
+scratch/main> delete.verbose Foo Foo.Foo
 
   Removed definitions:
   
@@ -274,7 +273,7 @@ d = a + b + c
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
@@ -284,7 +283,7 @@ d = a + b + c
     c : Nat
     d : Nat
 
-.> delete.verbose a b c
+scratch/main> delete.verbose a b c
 
   ⚠️
   
@@ -307,7 +306,7 @@ h = e + f + g
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
@@ -316,7 +315,7 @@ h = e + f + g
     g : Nat
     h : Nat
 
-.> delete.verbose e f g h
+scratch/main> delete.verbose e f g h
 
   Removed definitions:
   
@@ -339,14 +338,14 @@ incrementFoo = cases
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
     structural type Foo
     incrementFoo : Foo -> Nat
 
-.> delete.verbose Foo Foo.Foo incrementFoo
+scratch/main> delete.verbose Foo Foo.Foo incrementFoo
 
   Removed definitions:
   
@@ -367,7 +366,7 @@ h = e + f + g
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
@@ -376,7 +375,7 @@ h = e + f + g
     g : Nat
     h : Nat
 
-.> delete.verbose e f gg
+scratch/main> delete.verbose e f gg
 
   ⚠️
   
@@ -392,14 +391,14 @@ pong _ = 4 Nat.+ !ping
 ```
 
 ```ucm
-.> add
+scratch/main> add
 
   ⍟ I've added these definitions:
   
     ping : 'Nat
     pong : 'Nat
 
-.> delete.verbose ping
+scratch/main> delete.verbose ping
 
   Removed definitions:
   
@@ -407,7 +406,7 @@ pong _ = 4 Nat.+ !ping
   
   Tip: You can use `undo` or `reflog` to undo this change.
 
-.> view pong
+scratch/main> view pong
 
   pong : 'Nat
   pong _ =