diff --git a/shell/environment.mu b/shell/environment.mu
index f1634470..938db9f5 100644
--- a/shell/environment.mu
+++ b/shell/environment.mu
@@ -371,7 +371,7 @@ fn edit-environment _self: (addr environment), key: grapheme, data-disk: (addr d
   edit-sandbox sandbox, key, globals, data-disk
 }
 
-fn read-evaluate-and-save-gap-buffer-to-globals _in-ah: (addr handle gap-buffer), result-ah: (addr handle cell), globals: (addr global-table), definitions-created: (addr stream int), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell) {
+fn read-and-evaluate-and-save-gap-buffer-to-globals _in-ah: (addr handle gap-buffer), result-ah: (addr handle cell), globals: (addr global-table), definitions-created: (addr stream int), trace: (addr trace), screen-cell: (addr handle cell), keyboard-cell: (addr handle cell) {
   var in-ah/eax: (addr handle gap-buffer) <- copy _in-ah
   var in/eax: (addr gap-buffer) <- lookup *in-ah
   var read-result-h: (handle cell)
diff --git a/shell/global.mu b/shell/global.mu
index ff1605a0..3b16e2c6 100644
--- a/shell/global.mu
+++ b/shell/global.mu
@@ -56,7 +56,7 @@ fn load-globals in: (addr handle cell), self: (addr global-table) {
     var value-gap-buffer/eax: (addr gap-buffer) <- lookup *value-gap-buffer-ah
     initialize-gap-buffer value-gap-buffer, 0x1000/4KB
     load-gap-buffer-from-stream value-gap-buffer, value-data
-    read-evaluate-and-move-to-globals value-gap-buffer-ah, self, name-data
+    read-and-evaluate-and-save-gap-buffer-and-save-trace-to-globals value-gap-buffer-ah, self, name-data
     loop
   }
   move-cursor-to-left-margin-of-next-line 0/screen
@@ -592,7 +592,7 @@ fn is-definition? _expr: (addr cell) -> _/eax: boolean {
 }
 
 # HERE: ..and this
-fn read-evaluate-and-move-to-globals _in-ah: (addr handle gap-buffer), globals: (addr global-table), definition-name: (addr stream byte) {
+fn read-and-evaluate-and-save-gap-buffer-and-save-trace-to-globals _in-ah: (addr handle gap-buffer), globals: (addr global-table), definition-name: (addr stream byte) {
   var in-ah/eax: (addr handle gap-buffer) <- copy _in-ah
   var in/eax: (addr gap-buffer) <- lookup *in-ah
   var read-result-h: (handle cell)
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index 52302ef3..085a882d 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -632,7 +632,7 @@ fn run-sandbox _self: (addr sandbox), globals: (addr global-table) {
   var keyboard-cell/eax: (addr handle cell) <- get self, keyboard-var
   rewind-keyboard-cell keyboard-cell  # don't clear keys from before
   #
-  read-evaluate-and-save-gap-buffer-to-globals data-ah, eval-result-ah, globals, definitions-created, trace, screen-cell, keyboard-cell
+  read-and-evaluate-and-save-gap-buffer-to-globals data-ah, eval-result-ah, globals, definitions-created, trace, screen-cell, keyboard-cell
   # if necessary, initialize a new gap-buffer for sandbox
   {
     compare globals, 0