diff --git a/collects/tests/drracket/autosave-recovery-gui.rkt b/collects/tests/drracket/autosave-recovery-gui.rkt
index 21eb319404..4d68b0a17b 100644
--- a/collects/tests/drracket/autosave-recovery-gui.rkt
+++ b/collects/tests/drracket/autosave-recovery-gui.rkt
@@ -16,9 +16,9 @@
            "there was a non-empty autosave toc when starting the test, so the test won't work right; contents:\n  ~s"
            autosave-contents)))
    
-(fire-up-drscheme-and-run-tests 
+(fire-up-drracket-and-run-tests 
  (λ ()
-   (define drs (wait-for-drscheme-frame))
+   (define drs (wait-for-drracket-frame))
    (define defs (send drs get-definitions-text))
    
    
diff --git a/collects/tests/drracket/hangman.rkt b/collects/tests/drracket/hangman.rkt
index ca9c5fca20..935c8dbe53 100644
--- a/collects/tests/drracket/hangman.rkt
+++ b/collects/tests/drracket/hangman.rkt
@@ -3,9 +3,9 @@
          racket/class
          racket/gui/base)
 
-(fire-up-drscheme-and-run-tests 
+(fire-up-drracket-and-run-tests 
  (λ ()
-   (define drs (wait-for-drscheme-frame))
+   (define drs (wait-for-drracket-frame))
    (define defs (send drs get-definitions-text))
    (define rep (send drs get-interactions-text))
    (set-language-level! (list #rx"How to Design Programs" #rx"Beginning Student$"))
diff --git a/collects/tests/drracket/incremental-keybindings-test.rkt b/collects/tests/drracket/incremental-keybindings-test.rkt
index 024b0b451a..c414060b5b 100644
--- a/collects/tests/drracket/incremental-keybindings-test.rkt
+++ b/collects/tests/drracket/incremental-keybindings-test.rkt
@@ -10,9 +10,9 @@ to DrRacket and then tries out the keystrokes.
          framework/test
          racket/class)
 
-(fire-up-drscheme-and-run-tests 
+(fire-up-drracket-and-run-tests 
  (λ ()
-   (define drs-frame (wait-for-drscheme-frame))
+   (define drs-frame (wait-for-drracket-frame))
    (use-get/put-dialog 
     (λ ()
       (test:menu-select "Edit" "Keybindings" "Add User-defined Keybindings..."))
diff --git a/collects/tests/drracket/io.rkt b/collects/tests/drracket/io.rkt
index 78daee2b0d..f9acd50cab 100644
--- a/collects/tests/drracket/io.rkt
+++ b/collects/tests/drracket/io.rkt
@@ -191,9 +191,9 @@ add this test:
 (define drs-frame #f)
 (define interactions-text #f)
 
-(fire-up-drscheme-and-run-tests
+(fire-up-drracket-and-run-tests
  (λ ()
-   (set! drs-frame (wait-for-drscheme-frame))
+   (set! drs-frame (wait-for-drracket-frame))
    (set! interactions-text (queue-callback/res (lambda () (send drs-frame get-interactions-text))))
    (set-language-level! (list #rx"Pretty Big"))
    (clear-definitions drs-frame)
diff --git a/collects/tests/drracket/language-test.rkt b/collects/tests/drracket/language-test.rkt
index cff40fa05f..8b7949245e 100644
--- a/collects/tests/drracket/language-test.rkt
+++ b/collects/tests/drracket/language-test.rkt
@@ -1090,7 +1090,7 @@ the settings above should match r5rs
 
 
 (define (prepare-for-test-expression)
-  (let ([drs (wait-for-drscheme-frame)])
+  (let ([drs (wait-for-drracket-frame)])
     (clear-definitions drs)
     (set-language #t)
     (sleep 1) ;; this shouldn't be neccessary....
@@ -1143,7 +1143,7 @@ the settings above should match r5rs
                   ""))
 
 (define (check-top-of-repl)
-  (let ([drs (wait-for-drscheme-frame)])
+  (let ([drs (wait-for-drracket-frame)])
     (set-language #t)
     (with-handlers ([exn:fail? void])
       (fw:test:menu-select "Testing" "Disable tests"))
@@ -1221,7 +1221,7 @@ the settings above should match r5rs
 
 (define (generic-output list? quasi-quote? has-sharing? has-print-printing?)
   (let* ([plain-print-style (if has-print-printing? "print" "write")]
-         [drs (wait-for-drscheme-frame)]
+         [drs (wait-for-drracket-frame)]
          [expression "(define x (list 2))\n(list x x)"]
          [set-output-choice
           (lambda (option show-sharing pretty?)
@@ -1309,7 +1309,7 @@ the settings above should match r5rs
    "WARNING: Interactions window is out of sync with the definitions window\\."))
 
 (define (test-error-after-definition)
-  (let* ([drs (wait-for-drscheme-frame)]
+  (let* ([drs (wait-for-drracket-frame)]
          [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))])
     (clear-definitions drs)
     (type-in-definitions drs "(define y 0) (define (f x) (/ x y)) (f 2)")
@@ -1336,7 +1336,7 @@ the settings above should match r5rs
 ;; types an expression in the definitions window, executes it and tests the output
 ;; types an expression in the REPL and tests the output from the REPL.
 (define (test-expression expression defs-expected [repl-expected defs-expected])
-  (let* ([drs (wait-for-drscheme-frame)]
+  (let* ([drs (wait-for-drracket-frame)]
          [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
          [definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
          [handle-insertion
@@ -1457,4 +1457,4 @@ the settings above should match r5rs
   (go advanced)
   )
 
-(fire-up-drscheme-and-run-tests run-test)
+(fire-up-drracket-and-run-tests run-test)
diff --git a/collects/tests/drracket/memory-log.rkt b/collects/tests/drracket/memory-log.rkt
index ed0e4a6b48..295a11be32 100644
--- a/collects/tests/drracket/memory-log.rkt
+++ b/collects/tests/drracket/memory-log.rkt
@@ -41,9 +41,9 @@
       (printf "cpu time: ~a real time: ~a gc time: ~a\n"
               n n n))))
 
-(fire-up-drscheme-and-run-tests 
+(fire-up-drracket-and-run-tests 
  (λ ()
-   (let ([drs-frame (wait-for-drscheme-frame)])
+   (let ([drs-frame (wait-for-drracket-frame)])
      
      ;; initial startup memory use
      (wait-and-print)
diff --git a/collects/tests/drracket/module-lang-test.rkt b/collects/tests/drracket/module-lang-test.rkt
index b50a1a0335..96250f0975 100644
--- a/collects/tests/drracket/module-lang-test.rkt
+++ b/collects/tests/drracket/module-lang-test.rkt
@@ -378,4 +378,4 @@
      ;; test to make sure that we don't get "exception raised by error display handler"
      #rx"module-lang-test-syn-error.rkt:[0-9]+:[0-9]+: lambda: bad syntax in: \\(lambda\\)")
 
-(fire-up-drscheme-and-run-tests run-test)
+(fire-up-drracket-and-run-tests run-test)
diff --git a/collects/tests/drracket/no-write-and-frame-leak.rkt b/collects/tests/drracket/no-write-and-frame-leak.rkt
index 0a3b4f03b0..b809741b12 100644
--- a/collects/tests/drracket/no-write-and-frame-leak.rkt
+++ b/collects/tests/drracket/no-write-and-frame-leak.rkt
@@ -12,9 +12,9 @@
                      (error who "Deleting files is not allowed")))
                  void
                  void)])
-  (fire-up-drscheme-and-run-tests 
+  (fire-up-drracket-and-run-tests 
    (λ ()
-     (define drs-frame1 (wait-for-drscheme-frame))
+     (define drs-frame1 (wait-for-drracket-frame))
      (sync (system-idle-evt))
      
      (test:menu-select "File" "New Tab")
diff --git a/collects/tests/drracket/private/drracket-test-util.rkt b/collects/tests/drracket/private/drracket-test-util.rkt
index 637e5bffd8..7cf799c86a 100644
--- a/collects/tests/drracket/private/drracket-test-util.rkt
+++ b/collects/tests/drracket/private/drracket-test-util.rkt
@@ -12,13 +12,13 @@
    [set-module-language! (->* () (boolean?) void?)])
   
   (provide queue-callback/res
-           fire-up-drscheme-and-run-tests
-           save-drscheme-window-as
+           fire-up-drracket-and-run-tests
+           save-drracket-window-as
            do-execute
            test-util-error
            poll-until
            wait-for-computation
-           wait-for-drscheme-frame
+           wait-for-drracket-frame
            wait-for-new-frame
            clear-definitions
            type-in-definitions
@@ -39,11 +39,11 @@
            run-one/sync
            alt-return-in-interactions)
   
-  ;; save-drscheme-window-as : string -> void
-  ;; use the "save as" dialog in drscheme to save the definitions
+  ;; save-drracket-window-as : string -> void
+  ;; use the "save as" dialog in drracket to save the definitions
   ;; window to a file.
-  (define (save-drscheme-window-as filename)
-    (not-on-eventspace-handler-thread 'save-drscheme-window-as)
+  (define (save-drracket-window-as filename)
+    (not-on-eventspace-handler-thread 'save-drracket-window-as)
     (use-get/put-dialog
      (lambda ()
        (fw:test:menu-select "File" "Save Definitions As..."))
@@ -53,7 +53,7 @@
   ;; filename is a string naming a file that should be typed into the dialog
   (define (use-get/put-dialog open-dialog filename)
     (not-on-eventspace-handler-thread 'use-get/put-dialog)
-    (let ([drs (wait-for-drscheme-frame)])
+    (let ([drs (wait-for-drracket-frame)])
       (with-handlers ([(lambda (x) #t)
 		       (lambda (x)
 			 (fw:preferences:set 'framework:file-dialogs 'std)
@@ -95,22 +95,22 @@
                     (sleep step)
                     (loop (- counter step)))))))))
   
-  (define (drscheme-frame? frame)
+  (define (drracket-frame? frame)
     (method-in-interface? 'get-execute-button (object-interface frame)))
   
-  (define (wait-for-drscheme-frame [print-message? #f])
-    (let ([wait-for-drscheme-frame-pred
+  (define (wait-for-drracket-frame [print-message? #f])
+    (let ([wait-for-drracket-frame-pred
            (lambda ()
              (let ([active (fw:test:get-active-top-level-window)])
                (if (and active
-                        (drscheme-frame? active))
+                        (drracket-frame? active))
                    active
                    #f)))])
-      (or (wait-for-drscheme-frame-pred)
+      (or (wait-for-drracket-frame-pred)
           (begin
             (when print-message?
               (printf "Select DrRacket frame\n"))
-            (poll-until wait-for-drscheme-frame-pred)))))
+            (poll-until wait-for-drracket-frame-pred)))))
   
   ;; wait-for-new-frame : frame [(listof eventspace) = null] -> frame
   ;; returns the newly opened frame, waiting until old-frame
@@ -137,7 +137,7 @@
 	(poll-until wait-for-new-frame-pred timeout))]))
 
   ;; wait-for-computation : frame -> void
-  ;; waits until the drscheme frame finishes some computation.
+  ;; waits until the drracket frame finishes some computation.
   ;; uses the state of the execute button to indicate when the
   ;; computations is finished. That is, waits for the execute
   ;; button to dim, indicating a computation is running. Then,
@@ -145,7 +145,7 @@
   ;; is complete.
   (define (wait-for-computation frame)
     (not-on-eventspace-handler-thread 'wait-for-computation)
-    (queue-callback/res (λ () (verify-drscheme-frame-frontmost 'wait-for-computation frame)))
+    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'wait-for-computation frame)))
     (let* ([wait-for-computation-to-start
 	    (lambda ()
 	      (fw:test:reraise-error)
@@ -164,21 +164,21 @@
       (do-execute frame #t)]
      [(frame wait-for-finish?)
       (not-on-eventspace-handler-thread 'do-execute)
-      (queue-callback/res (λ () (verify-drscheme-frame-frontmost 'do-execute frame)))
+      (queue-callback/res (λ () (verify-drracket-frame-frontmost 'do-execute frame)))
       (let ([button (queue-callback/res (λ () (send frame get-execute-button)))])
 	(fw:test:run-one (lambda () (send button command)))
 	(when wait-for-finish?
 	  (wait-for-computation frame)))]))
   
-  (define (verify-drscheme-frame-frontmost function-name frame)
-    (on-eventspace-handler-thread 'verify-drscheme-frame-frontmost)
+  (define (verify-drracket-frame-frontmost function-name frame)
+    (on-eventspace-handler-thread 'verify-drracket-frame-frontmost)
     (let ([tl (fw:test:get-active-top-level-window)])
       (unless (and (eq? frame tl)
-                   (drscheme-frame? tl))
-        (error function-name "drscheme frame not frontmost: ~e (found ~e)" frame tl))))
+                   (drracket-frame? tl))
+        (error function-name "drracket frame not frontmost: ~e (found ~e)" frame tl))))
   
   (define (clear-definitions frame)
-    (queue-callback/res (λ () (verify-drscheme-frame-frontmost 'clear-definitions frame)))
+    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'clear-definitions frame)))
     (fw:test:new-window (queue-callback/res (λ () (send frame get-definitions-canvas))))
     (let ([window (queue-callback/res (λ () (send frame get-edit-target-window)))])
       (let-values ([(cw ch) (queue-callback/res (λ () (send window get-client-size)))]
@@ -214,7 +214,7 @@
 		     (parameterize ([current-output-port port])
 		       (write str/sexp port))
 		     (get-output-string port)))])
-      (queue-callback/res (λ () (verify-drscheme-frame-frontmost who frame)))
+      (queue-callback/res (λ () (verify-drracket-frame-frontmost who frame)))
       (let ([canvas (queue-callback/res (λ () (get-canvas frame)))])
 	(fw:test:new-window canvas)
 	(let ([editor (queue-callback/res (λ () (send canvas get-editor)))])
@@ -242,7 +242,7 @@
 
   (define (alt-return-in-interactions frame)
     (not-on-eventspace-handler-thread 'alt-return-in-interactions)
-    (queue-callback/res (λ () (verify-drscheme-frame-frontmost 'alt-return-in-interactions frame)))
+    (queue-callback/res (λ () (verify-drracket-frame-frontmost 'alt-return-in-interactions frame)))
     (let ([canvas (send frame get-interactions-canvas)])
       (fw:test:new-window canvas)
       (let ([editor (send canvas get-editor)])
@@ -406,7 +406,7 @@
             (let ([new-frame (wait-for-new-frame language-dialog)])
               (unless (eq? new-frame drs-frame)
                 (error 'set-language-level! 
-                       "didn't get drscheme frame back, got: ~s (drs-frame ~s)\n"
+                       "didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
                        new-frame
                        drs-frame)))))))) 
   (define (set-module-language! [close-dialog? #t])
@@ -426,16 +426,16 @@
           (let ([new-frame (wait-for-new-frame language-dialog)])
             (unless (eq? new-frame drs-frame)
               (error 'set-language-level! 
-                     "didn't get drscheme frame back, got: ~s (drs-frame ~s)\n"
+                     "didn't get drracket frame back, got: ~s (drs-frame ~s)\n"
                      new-frame
                      drs-frame)))))))
   
   (provide/contract [check-language-level ((or/c string? regexp?) . -> . void?)])
-  ;; checks that the language in the drscheme window is set to the given one.
+  ;; checks that the language in the drracket window is set to the given one.
   ;; clears the definitions, clicks execute and checks the interactions window.
   (define (check-language-level lang-spec)
     (not-on-eventspace-handler-thread 'check-language-level!)
-    (let* ([drs-frame (wait-for-drscheme-frame)]
+    (let* ([drs-frame (wait-for-drracket-frame)]
            [interactions (send drs-frame get-interactions-text)]
            [definitions-canvas (send drs-frame get-definitions-canvas)])
       (fw:test:new-window definitions-canvas)
@@ -454,7 +454,7 @@
   
   (define (repl-in-edit-sequence?)
     (not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
-    (let ([drr (wait-for-drscheme-frame)])
+    (let ([drr (wait-for-drracket-frame)])
       (queue-callback/res
        (λ ()
          (send (send drr get-interactions-text) refresh-delayed?)))))
@@ -466,7 +466,7 @@
     (not-on-eventspace-handler-thread 'repl-in-edit-sequence?)
     (run-one/sync
      (lambda ()
-       (verify-drscheme-frame-frontmost 'had-error? frame)
+       (verify-drracket-frame-frontmost 'had-error? frame)
        (let* ([interactions-text (send frame get-interactions-text)]
               [last-para (send interactions-text last-paragraph)])
          (unless (>= last-para 2)
@@ -508,7 +508,7 @@
        (not-on-eventspace-handler-thread 'fetch-output)
        (run-one/sync
         (lambda ()
-          (verify-drscheme-frame-frontmost 'fetch-output frame)
+          (verify-drracket-frame-frontmost 'fetch-output frame)
           (let-values ([(start end)
                         (if (and _start _end)
                             (values _start _end)
@@ -594,8 +594,8 @@
   ;; but just to print and return.
   (define orig-display-handler (error-display-handler))
   
-  (define (fire-up-drscheme-and-run-tests #:use-focus-table? [use-focus-table? #t] run-test)
-    (on-eventspace-handler-thread 'fire-up-drscheme-and-run-tests)
+  (define (fire-up-drracket-and-run-tests #:use-focus-table? [use-focus-table? #t] run-test)
+    (on-eventspace-handler-thread 'fire-up-drracket-and-run-tests)
     (let ()
       ;; change the preferences system so that it doesn't write to 
       ;; a file; partly to avoid problems of concurrency in drdr
@@ -614,7 +614,7 @@
 
       ;; set all preferences to their defaults (some pref values may have
       ;; been read by this point, but hopefully that won't affect much
-      ;; of the startup of drscheme)
+      ;; of the startup of drracket)
       (fw:preferences:restore-defaults)
       
       (fw:test:use-focus-table use-focus-table?)
diff --git a/collects/tests/drracket/private/module-lang-test-utils.rkt b/collects/tests/drracket/private/module-lang-test-utils.rkt
index 15ad4a9827..b882f57576 100644
--- a/collects/tests/drracket/private/module-lang-test-utils.rkt
+++ b/collects/tests/drracket/private/module-lang-test-utils.rkt
@@ -149,7 +149,7 @@
 (define definitions-text 'not-yet-definitions-text)
 
 (define (run-test)
-  (set! drs (wait-for-drscheme-frame))
+  (set! drs (wait-for-drracket-frame))
   (set! interactions-text  (send drs get-interactions-text))
   (set! definitions-text (send drs get-definitions-text))
   (init-temp-files)
diff --git a/collects/tests/drracket/private/repl-test.rkt b/collects/tests/drracket/private/repl-test.rkt
index 5fc37941de..8ea002856d 100644
--- a/collects/tests/drracket/private/repl-test.rkt
+++ b/collects/tests/drracket/private/repl-test.rkt
@@ -1096,7 +1096,7 @@ This produces an ACK message
 
 (define (run-test which-tests)
     
-  (define drscheme-frame (wait-for-drscheme-frame))
+  (define drscheme-frame (wait-for-drracket-frame))
   
   (define interactions-text (queue-callback/res (λ () (send drscheme-frame get-interactions-text))))
   (define interactions-canvas (queue-callback/res (λ () (send drscheme-frame get-interactions-canvas))))
@@ -1160,7 +1160,7 @@ This produces an ACK message
       ; load contents of test-file into the REPL, recording
       ; the start and end positions of the text
       
-      (wait-for-drscheme-frame)
+      (wait-for-drracket-frame)
       
       (cond
         [(string? program)
@@ -1458,7 +1458,7 @@ This produces an ACK message
   
   (when (file-exists? tmp-load-filename)
     (delete-file tmp-load-filename))
-  (save-drscheme-window-as tmp-load-filename)
+  (save-drracket-window-as tmp-load-filename)
   
   ;; the debug and debug/profile tests should not differ in their output
   ;; they are both run here because debug uses the automatic-compilation 
diff --git a/collects/tests/drracket/private/run-example-tool.rkt b/collects/tests/drracket/private/run-example-tool.rkt
index 1dbf440854..25d3152bfd 100644
--- a/collects/tests/drracket/private/run-example-tool.rkt
+++ b/collects/tests/drracket/private/run-example-tool.rkt
@@ -55,9 +55,9 @@
           [((COMPILER : compiler^)) compiler@ COMPILER-OPTION DYNEXT-FILE DYNEXT-COMPILE DYNEXT-LINK]
           [() setup@ LAUNCHER OPTIONS COMPILER-OPTION COMPILER DYNEXT-FILE])))))
   
-  (fire-up-drscheme-and-run-tests
+  (fire-up-drracket-and-run-tests
    (λ () 
-     (define drs (wait-for-drscheme-frame))
+     (define drs (wait-for-drracket-frame))
      (queue-callback/res (λ () (send (send drs get-definitions-canvas) focus)))
      (for ([x (in-string "egg\r1\r2\r3")])  
        ;; need #\r to actually get newlines in the editor
diff --git a/collects/tests/drracket/repl-test-debug.rkt b/collects/tests/drracket/repl-test-debug.rkt
index e8308e29ca..da254d1a6d 100644
--- a/collects/tests/drracket/repl-test-debug.rkt
+++ b/collects/tests/drracket/repl-test-debug.rkt
@@ -1,4 +1,4 @@
 #lang racket/base
 (require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drscheme-and-run-tests (λ () (run-test '(debug))))
+(fire-up-drracket-and-run-tests (λ () (run-test '(debug))))
 
diff --git a/collects/tests/drracket/repl-test-debugprofile.rkt b/collects/tests/drracket/repl-test-debugprofile.rkt
index 1d3fa38815..84aa81aa4f 100644
--- a/collects/tests/drracket/repl-test-debugprofile.rkt
+++ b/collects/tests/drracket/repl-test-debugprofile.rkt
@@ -1,4 +1,4 @@
 #lang racket/base
 (require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drscheme-and-run-tests (λ () (run-test '(debug/profile))))
+(fire-up-drracket-and-run-tests (λ () (run-test '(debug/profile))))
 
diff --git a/collects/tests/drracket/repl-test-misc.rkt b/collects/tests/drracket/repl-test-misc.rkt
index 6875573ac3..adbed0007b 100644
--- a/collects/tests/drracket/repl-test-misc.rkt
+++ b/collects/tests/drracket/repl-test-misc.rkt
@@ -1,4 +1,4 @@
 #lang racket/base
 (require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drscheme-and-run-tests (λ () (run-test '(misc))))
+(fire-up-drracket-and-run-tests (λ () (run-test '(misc))))
 
diff --git a/collects/tests/drracket/repl-test-raw.rkt b/collects/tests/drracket/repl-test-raw.rkt
index 86ee52fdf0..e0b7789e3e 100644
--- a/collects/tests/drracket/repl-test-raw.rkt
+++ b/collects/tests/drracket/repl-test-raw.rkt
@@ -1,4 +1,4 @@
 #lang racket/base
 (require "private/repl-test.rkt" "private/drracket-test-util.rkt")
-(fire-up-drscheme-and-run-tests (λ () (run-test '(raw))))
+(fire-up-drracket-and-run-tests (λ () (run-test '(raw))))
 
diff --git a/collects/tests/drracket/sample-solutions-one-window.rkt b/collects/tests/drracket/sample-solutions-one-window.rkt
index 9ee0c97a64..0741cf062f 100644
--- a/collects/tests/drracket/sample-solutions-one-window.rkt
+++ b/collects/tests/drracket/sample-solutions-one-window.rkt
@@ -38,7 +38,7 @@
            [language (section->language section)]
            [errors-ok? (car toc-entry)]
            [teachpacks (cadr toc-entry)])
-      (let* ([drs-frame (wait-for-drscheme-frame)]
+      (let* ([drs-frame (wait-for-drracket-frame)]
              [definitions-text (send drs-frame get-definitions-text)]
              [interactions-text (send drs-frame get-interactions-text)])
         
@@ -115,7 +115,7 @@
                                       "Evaluation Terminated"))))])
               (poll-until wait-for-kill-window)
               (fw:test:button-push "OK")
-              (wait-for-drscheme-frame #f)
+              (wait-for-drracket-frame #f)
               (printf "killed\n"))))
         
         (check-for-red-text filename drs-frame)
diff --git a/collects/tests/drracket/stepper-test.rkt b/collects/tests/drracket/stepper-test.rkt
index 7742c09805..ea23516201 100644
--- a/collects/tests/drracket/stepper-test.rkt
+++ b/collects/tests/drracket/stepper-test.rkt
@@ -372,7 +372,7 @@
   ;; executes each of the steps in DrRacket and raises
   ;; an exception if something doesn't match up.
   (define (check-steps program steps)
-    (let* ([drs-frame (wait-for-drscheme-frame)]
+    (let* ([drs-frame (wait-for-drracket-frame)]
            [defs-text (send drs-frame get-definitions-text)])
       (let loop ([last-results #f]
                  [steps steps])
@@ -483,7 +483,7 @@
   
   ;; step-and-extract-program : program-spec -> (listof step)
   (define (step-and-extract-program program)
-    (let ([drs-frame (wait-for-drscheme-frame)])
+    (let ([drs-frame (wait-for-drracket-frame)])
       (clear-definitions drs-frame)
       (set-definitions-to-program drs-frame program)
       (let* ([stepper-frame (start-stepper drs-frame)]
diff --git a/collects/tests/drracket/syncheck-eval-compile-time.rkt b/collects/tests/drracket/syncheck-eval-compile-time.rkt
index 168794e731..48f04b5805 100644
--- a/collects/tests/drracket/syncheck-eval-compile-time.rkt
+++ b/collects/tests/drracket/syncheck-eval-compile-time.rkt
@@ -5,9 +5,9 @@
          framework)
 
 (define (main)
-  (fire-up-drscheme-and-run-tests
+  (fire-up-drracket-and-run-tests
    (λ ()
-     (let ([drs (wait-for-drscheme-frame)])
+     (let ([drs (wait-for-drracket-frame)])
        (set-module-language!)
        (do-execute drs)
        (queue-callback/res
diff --git a/collects/tests/drracket/syncheck-test.rkt b/collects/tests/drracket/syncheck-test.rkt
index e821d1f4b8..7bb4d3a6b7 100644
--- a/collects/tests/drracket/syncheck-test.rkt
+++ b/collects/tests/drracket/syncheck-test.rkt
@@ -1039,9 +1039,9 @@ trigger runtime errors in check syntax.
                   
   
   (define (main)
-    (fire-up-drscheme-and-run-tests
+    (fire-up-drracket-and-run-tests
      (λ ()
-       (let ([drs (wait-for-drscheme-frame)])
+       (let ([drs (wait-for-drracket-frame)])
          ;(set-language-level! (list "Pretty Big"))
          (begin
            (set-language-level! (list "Pretty Big") #f)
@@ -1081,7 +1081,7 @@ trigger runtime errors in check syntax.
   
   (define ((run-one-test save-dir) test)
     (set! total-tests-run (+ total-tests-run 1))
-    (let* ([drs (wait-for-drscheme-frame)]
+    (let* ([drs (wait-for-drracket-frame)]
            [defs (queue-callback/res (λ () (send drs get-definitions-text)))])
       (clear-definitions drs)
       (cond
diff --git a/collects/tests/drracket/teaching-lang-coverage.rkt b/collects/tests/drracket/teaching-lang-coverage.rkt
index b003768631..4a181a4f7e 100644
--- a/collects/tests/drracket/teaching-lang-coverage.rkt
+++ b/collects/tests/drracket/teaching-lang-coverage.rkt
@@ -80,9 +80,9 @@
 (define (find-uncovered-text string/style-desc)
   (map car (filter is-uncovered? string/style-desc)))
 
-(fire-up-drscheme-and-run-tests
+(fire-up-drracket-and-run-tests
  (λ ()
-   (let* ([drr-frame (wait-for-drscheme-frame)]
+   (let* ([drr-frame (wait-for-drracket-frame)]
           [definitions-text (send drr-frame get-definitions-text)]
           [interactions-text (send drr-frame get-interactions-text)])
        
diff --git a/collects/tests/drracket/teaching-lang-save-file.rkt b/collects/tests/drracket/teaching-lang-save-file.rkt
index ace1e8a172..1270560b2d 100644
--- a/collects/tests/drracket/teaching-lang-save-file.rkt
+++ b/collects/tests/drracket/teaching-lang-save-file.rkt
@@ -7,9 +7,9 @@
 
 (require tests/drracket/private/drracket-test-util)
 
-(fire-up-drscheme-and-run-tests
+(fire-up-drracket-and-run-tests
  (λ ()
-   (let* ([drr-frame (wait-for-drscheme-frame)]
+   (let* ([drr-frame (wait-for-drracket-frame)]
           [fn (make-temporary-file "save-teaching-lang-test~a")])
      (test:menu-select "File" "New Tab")
      
diff --git a/collects/tests/drracket/teaching-lang-sharing-modules.rkt b/collects/tests/drracket/teaching-lang-sharing-modules.rkt
index 3486aa1ded..818ebb5396 100644
--- a/collects/tests/drracket/teaching-lang-sharing-modules.rkt
+++ b/collects/tests/drracket/teaching-lang-sharing-modules.rkt
@@ -32,10 +32,10 @@ Of course, other (similar) things can go wrong, too.
 (define first-line-output (format "All ~a tests passed!" (length things-to-try)))
 
 (define (go)
-  (fire-up-drscheme-and-run-tests
+  (fire-up-drracket-and-run-tests
    (λ ()
      (putenv "PLTDRHTDPNOCOMPILED" "yes")
-     (define drs-frame (wait-for-drscheme-frame))
+     (define drs-frame (wait-for-drracket-frame))
      (set-language-level! '("How to Design Programs" "Beginning Student"))
      (clear-definitions drs-frame)
      (for ([exp (in-list things-to-try)])
diff --git a/collects/tests/drracket/teachpack.rkt b/collects/tests/drracket/teachpack.rkt
index ca4d1ea133..c0a5f44d0e 100644
--- a/collects/tests/drracket/teachpack.rkt
+++ b/collects/tests/drracket/teachpack.rkt
@@ -252,10 +252,10 @@
       [else #f])))
 
 (define (run-test)
-  (set! drs-frame (wait-for-drscheme-frame))
+  (set! drs-frame (wait-for-drracket-frame))
   (set! interactions-text (send drs-frame get-interactions-text))
   ;(good-tests)
   ;(bad-tests)
   (test-built-in-teachpacks))
 
-(fire-up-drscheme-and-run-tests run-test)
+(fire-up-drracket-and-run-tests run-test)
diff --git a/collects/tests/drracket/test-engine-test.rkt b/collects/tests/drracket/test-engine-test.rkt
index 8cdadf30e7..02f61709ef 100644
--- a/collects/tests/drracket/test-engine-test.rkt
+++ b/collects/tests/drracket/test-engine-test.rkt
@@ -214,7 +214,7 @@
     (common-signatures-DMdA)))
 
 (define (prepare-for-test-expression)
-  (let ([drs (wait-for-drscheme-frame)])
+  (let ([drs (wait-for-drracket-frame)])
     (clear-definitions drs)
     (set-language #t)
     (sleep 1) ;; this shouldn't be neccessary....
@@ -353,7 +353,7 @@
 			 #:signature-violations-expected (signature-violations-expected '())
 			 #:repl-check-failures-expected (repl-check-failures-expected '())
 			 #:repl-signature-violations-expected (repl-signature-violations-expected '()))
-  (let* ([drs (wait-for-drscheme-frame)]
+  (let* ([drs (wait-for-drracket-frame)]
          [interactions-text (queue-callback/res (λ () (send drs get-interactions-text)))]
          [definitions-text (queue-callback/res (λ () (send drs get-definitions-text)))]
          [handle-definition-insertion
@@ -460,7 +460,7 @@
 		    (append check-failures-expected repl-check-failures-expected))))
 
 (define (test-disabling-tests)
-  (define drs (wait-for-drscheme-frame))
+  (define drs (wait-for-drracket-frame))
   
   (parameterize ([language (list "How to Design Programs" #rx"Beginning Student(;|$)")]) 
     (prepare-for-test-expression)
@@ -495,4 +495,4 @@
   (go DMdA-advanced)
   (go test-disabling-tests))
 
-(fire-up-drscheme-and-run-tests run-test)
+(fire-up-drracket-and-run-tests run-test)