From 244f6e49083a75c77b48ec0d9ce6ffc621ef29af Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Fri, 23 Apr 2010 16:37:25 -0500
Subject: [PATCH] started requiring racket/ instead of scheme/

---
 collects/drscheme/acks.ss                     |  2 +-
 collects/drscheme/arrow.ss                    |  2 +-
 collects/drscheme/default-code-style.ss       |  4 ++--
 collects/drscheme/drscheme.ss                 |  2 +-
 collects/drscheme/installer.ss                |  4 ++--
 collects/drscheme/main.ss                     |  4 ++--
 collects/drscheme/private/app.ss              |  6 ++----
 collects/drscheme/private/bindings-browser.ss | 17 +++++++--------
 collects/drscheme/private/bitmap-message.ss   |  4 ++--
 collects/drscheme/private/debug.ss            | 14 ++++++-------
 collects/drscheme/private/drscheme-normal.ss  | 10 ++++-----
 collects/drscheme/private/drsig.ss            |  2 +-
 collects/drscheme/private/eb.ss               |  6 +++---
 .../drscheme/private/embedded-snip-utils.ss   |  6 +++---
 collects/drscheme/private/eval.ss             | 12 +++++------
 collects/drscheme/private/font.ss             |  8 +++----
 collects/drscheme/private/frame.ss            |  9 ++++----
 collects/drscheme/private/get-extend.ss       |  2 +-
 collects/drscheme/private/help-desk.ss        |  4 ++--
 collects/drscheme/private/honu-logo.ss        |  6 +++---
 collects/drscheme/private/init.ss             |  3 +--
 .../drscheme/private/insert-large-letters.ss  |  2 +-
 collects/drscheme/private/key.ss              |  2 +-
 collects/drscheme/private/label-frame-mred.ss | 18 ++++++++--------
 .../private/language-configuration.ss         | 21 ++++++++++++-------
 .../private/language-object-contract.ss       | 14 ++++++-------
 collects/drscheme/private/language.ss         | 10 ++++-----
 .../drscheme/private/launcher-bootstrap.ss    |  4 ++--
 .../private/launcher-mred-bootstrap.ss        |  8 +++----
 .../drscheme/private/launcher-mz-bootstrap.ss |  4 ++--
 collects/drscheme/private/link.ss             |  2 +-
 collects/drscheme/private/main.ss             |  2 +-
 collects/drscheme/private/modes.ss            |  6 +++---
 collects/drscheme/private/module-browser.ss   |  6 +++---
 .../drscheme/private/module-language-tools.ss |  8 +++----
 collects/drscheme/private/module-language.ss  | 14 ++++++-------
 .../drscheme/private/multi-file-search.ss     |  4 ++--
 collects/drscheme/private/number-snip.ss      |  4 ++--
 collects/drscheme/private/palaka.ss           |  4 ++--
 collects/drscheme/private/prefs-contract.ss   |  4 ++--
 collects/drscheme/private/profile-drs.ss      |  6 +++---
 collects/drscheme/private/recon.ss            |  4 ++--
 collects/drscheme/private/rep.ss              | 12 +++++------
 collects/drscheme/private/stick-figures.ss    |  8 +++----
 collects/drscheme/private/tools.ss            | 10 ++++-----
 collects/drscheme/private/tracing.ss          | 14 ++++++-------
 collects/drscheme/private/ts.ss               |  3 +--
 collects/drscheme/private/unit.ss             | 12 +++++------
 collects/drscheme/sprof.ss                    |  2 +-
 collects/drscheme/syncheck-drscheme-button.ss |  2 +-
 collects/drscheme/syncheck.ss                 |  2 +-
 collects/drscheme/tool-lib.ss                 |  2 +-
 collects/drscheme/tool.ss                     |  9 ++++----
 53 files changed, 174 insertions(+), 176 deletions(-)

diff --git a/collects/drscheme/acks.ss b/collects/drscheme/acks.ss
index 20fdc9e163..601afb6739 100644
--- a/collects/drscheme/acks.ss
+++ b/collects/drscheme/acks.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 (provide get-general-acks
          get-translating-acks
diff --git a/collects/drscheme/arrow.ss b/collects/drscheme/arrow.ss
index 3c27480bce..6cc8852bc0 100644
--- a/collects/drscheme/arrow.ss
+++ b/collects/drscheme/arrow.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 (require scheme/class
          scheme/math
diff --git a/collects/drscheme/default-code-style.ss b/collects/drscheme/default-code-style.ss
index b4ea007e2d..971c64d4bc 100644
--- a/collects/drscheme/default-code-style.ss
+++ b/collects/drscheme/default-code-style.ss
@@ -1,4 +1,4 @@
-(module default-code-style mzscheme
+#lang racket/base
   (provide color-default-code-styles
            bw-default-code-styles
            code-style-color
@@ -24,4 +24,4 @@
           (list 'unbound-variable (make-code-style "red" #f #f #f))
           (list 'bound-variable (make-code-style "navy" #f #f #f))
           (list 'primitive (make-code-style "navy" #f #f #f))
-          (list 'constant (make-code-style '(51 135 39) #f #f #f)))))
+          (list 'constant (make-code-style '(51 135 39) #f #f #f))))
diff --git a/collects/drscheme/drscheme.ss b/collects/drscheme/drscheme.ss
index e5c5207b8f..fab93a1b2e 100644
--- a/collects/drscheme/drscheme.ss
+++ b/collects/drscheme/drscheme.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require scheme/gui/base "private/key.ss")
 
 (define debugging? (getenv "PLTDRDEBUG"))
diff --git a/collects/drscheme/installer.ss b/collects/drscheme/installer.ss
index 79c6c2883f..c6259165ac 100644
--- a/collects/drscheme/installer.ss
+++ b/collects/drscheme/installer.ss
@@ -1,4 +1,4 @@
-(module installer mzscheme
+#lang racket/base
   (require mzlib/file
            mzlib/etc
            launcher)
@@ -18,4 +18,4 @@
        (mred-program-launcher-path "DrScheme")
        (cons
         `(exe-name . "DrScheme")
-        (build-aux-from-path (build-path (collection-path "drscheme") "drscheme")))))))
+        (build-aux-from-path (build-path (collection-path "drscheme") "drscheme"))))))
diff --git a/collects/drscheme/main.ss b/collects/drscheme/main.ss
index f5202c93ea..1c1d394370 100644
--- a/collects/drscheme/main.ss
+++ b/collects/drscheme/main.ss
@@ -1,2 +1,2 @@
-(module main scheme/base
-  (require "drscheme.ss"))
+#lang racket/base
+(require "drscheme.ss")
diff --git a/collects/drscheme/private/app.ss b/collects/drscheme/private/app.ss
index 71c67d4822..47dff1bcbc 100644
--- a/collects/drscheme/private/app.ss
+++ b/collects/drscheme/private/app.ss
@@ -1,10 +1,8 @@
 #lang scheme/unit
 
-(require mzlib/class
-         mzlib/list
-         scheme/file
+(require racket/class
          string-constants
-         mred
+         racket/gui/base
          framework
          browser/external
          setup/getinfo
diff --git a/collects/drscheme/private/bindings-browser.ss b/collects/drscheme/private/bindings-browser.ss
index 9a2b5181ef..74bae33bd5 100644
--- a/collects/drscheme/private/bindings-browser.ss
+++ b/collects/drscheme/private/bindings-browser.ss
@@ -1,4 +1,4 @@
-#lang mzscheme
+#lang racket/base
 #|
 
 CODE COPIED (with permission ...) from syntax-browser.ss
@@ -9,13 +9,10 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
 |#
 
 
-  (require mzlib/pretty
-           mzlib/list
-           mzlib/class
-           mred
-           mzlib/match
-           mzlib/string
-           mzlib/contract)
+  (require racket/pretty
+           racket/class
+           racket/gui/base
+           racket/contract)
   
   (provide render-bindings/snip)
 
@@ -64,7 +61,7 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
                     ; how to enrich the notion of an output-port to get 'bold'ing to 
                     ; work otherwise...
                     (let* ([before (send output-text last-position)])
-                      (pretty-print (syntax-object->datum stx))
+                      (pretty-print (syntax->datum stx))
                       (let* ([post-newline (send output-text last-position)])
                         (send output-text delete post-newline) ; delete the trailing \n. yuck!
                         (send output-text insert " ")
@@ -164,7 +161,7 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
   
   (define black-style-delta (make-object style-delta% 'change-normal-color))
   (define green-style-delta (make-object style-delta%))
-  (send green-style-delta set-delta-foreground "forest green")
+  (void (send green-style-delta set-delta-foreground "forest green"))
 
   (define turn-snip%
     (class snip%
diff --git a/collects/drscheme/private/bitmap-message.ss b/collects/drscheme/private/bitmap-message.ss
index 80c440b0f7..afa90a2c9a 100644
--- a/collects/drscheme/private/bitmap-message.ss
+++ b/collects/drscheme/private/bitmap-message.ss
@@ -1,6 +1,6 @@
-#lang scheme
+#lang racket/base
 
-(require mred/mred)
+(require racket/gui/base racket/class)
 (provide bitmap-message%)
 
 (define bitmap-message%
diff --git a/collects/drscheme/private/debug.ss b/collects/drscheme/private/debug.ss
index a60d0c792b..10214d7789 100644
--- a/collects/drscheme/private/debug.ss
+++ b/collects/drscheme/private/debug.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 #|
 
@@ -10,11 +10,11 @@ profile todo:
 
 (require errortrace/errortrace-key
          scheme/unit
-         scheme/contract
+         racket/contract
          errortrace/stacktrace
-         scheme/class
-         scheme/path
-         scheme/gui/base
+         racket/class
+         racket/path
+         racket/gui/base
          string-constants
          framework
          framework/private/bday
@@ -23,9 +23,9 @@ profile todo:
          "bindings-browser.ss"
          net/sendurl
          net/url
-         scheme/match
+         racket/match
          mrlib/include-bitmap
-         (for-syntax scheme/base))
+         (for-syntax racket/base))
 
 (define orig (current-output-port))
 
diff --git a/collects/drscheme/private/drscheme-normal.ss b/collects/drscheme/private/drscheme-normal.ss
index 428f013005..1450eeae21 100644
--- a/collects/drscheme/private/drscheme-normal.ss
+++ b/collects/drscheme/private/drscheme-normal.ss
@@ -1,12 +1,12 @@
-#lang scheme/base
+#lang racket/base
 
 (require mred
-         scheme/class
-         scheme/cmdline
-         scheme/list
+         racket/class
+         racket/cmdline
+         racket/list
          framework/private/bday
          framework/splash
-         scheme/file
+         racket/file
          "eb.ss")
 
 (define files-to-open (command-line #:args filenames filenames))
diff --git a/collects/drscheme/private/drsig.ss b/collects/drscheme/private/drsig.ss
index 414fe8d8bc..a41a6860b6 100644
--- a/collects/drscheme/private/drsig.ss
+++ b/collects/drscheme/private/drsig.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require scheme/unit)
 
 (provide drscheme:eval^
diff --git a/collects/drscheme/private/eb.ss b/collects/drscheme/private/eb.ss
index 6b74f5561f..09e3c99a93 100644
--- a/collects/drscheme/private/eb.ss
+++ b/collects/drscheme/private/eb.ss
@@ -1,7 +1,7 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          framework/splash
-         scheme/gui/base)
+         racket/gui/base)
 
 (provide install-eb)
 (define (install-eb)
diff --git a/collects/drscheme/private/embedded-snip-utils.ss b/collects/drscheme/private/embedded-snip-utils.ss
index 9e96e233be..3c3dcf55a5 100644
--- a/collects/drscheme/private/embedded-snip-utils.ss
+++ b/collects/drscheme/private/embedded-snip-utils.ss
@@ -1,6 +1,6 @@
-#lang scheme/base
-(require scheme/class
-         scheme/gui/base)
+#lang racket/base
+(require racket/class
+         racket/gui/base)
 
 (provide get-enclosing-editor-frame)
 
diff --git a/collects/drscheme/private/eval.ss b/collects/drscheme/private/eval.ss
index 8c55abdbb3..4cc00542d0 100644
--- a/collects/drscheme/private/eval.ss
+++ b/collects/drscheme/private/eval.ss
@@ -1,9 +1,9 @@
-#lang mzscheme
+#lang racket/base
 
   (require mred
-           mzlib/unit
-           mzlib/port
-           mzlib/class
+           scheme/unit
+           racket/port
+           racket/class
            syntax/toplevel
            framework
            "drsig.ss")
@@ -11,7 +11,7 @@
   ;; to ensure this guy is loaded (and the snipclass installed) in the drscheme namespace & eventspace
   ;; these things are for effect only!
   (require mrlib/cache-image-snip
-           (prefix image-core: mrlib/image-core))
+           (prefix-in image-core: mrlib/image-core))
   
   (define op (current-output-port))
   (define (oprintf . args) (apply fprintf op args))
@@ -173,7 +173,7 @@
       (error-print-width 250)
       (current-ps-setup (make-object ps-setup%))
       
-      (current-namespace (make-namespace 'empty))
+      (current-namespace (make-empty-namespace))
       (for-each (λ (x) (namespace-attach-module drscheme:init:system-namespace x))
                 to-be-copied-module-names))
     
diff --git a/collects/drscheme/private/font.ss b/collects/drscheme/private/font.ss
index aa2dc23a8d..0428a5b698 100644
--- a/collects/drscheme/private/font.ss
+++ b/collects/drscheme/private/font.ss
@@ -1,8 +1,8 @@
-#lang mzscheme
-  (require mzlib/unit
-           mzlib/class
+#lang racket/base
+  (require scheme/unit
+           racket/class
+           racket/gui/base
            "drsig.ss"
-           mred
            framework
            string-constants)
   
diff --git a/collects/drscheme/private/frame.ss b/collects/drscheme/private/frame.ss
index 30f5f6c471..c55512116f 100644
--- a/collects/drscheme/private/frame.ss
+++ b/collects/drscheme/private/frame.ss
@@ -1,9 +1,8 @@
 #lang scheme/unit
   (require string-constants
-           mzlib/match
-           mzlib/class
-           mzlib/string
-           mzlib/list
+           racket/match
+           racket/class
+           racket/string
            "drsig.ss"
            mred
            framework
@@ -11,7 +10,7 @@
            net/head
            setup/plt-installer
            help/bug-report
-           scheme/file)
+           racket/file)
   
   (import [prefix drscheme:unit: drscheme:unit^]
           [prefix drscheme:app: drscheme:app^]
diff --git a/collects/drscheme/private/get-extend.ss b/collects/drscheme/private/get-extend.ss
index d0d492fac7..67e877d9f6 100644
--- a/collects/drscheme/private/get-extend.ss
+++ b/collects/drscheme/private/get-extend.ss
@@ -1,6 +1,6 @@
 #lang scheme/unit
 
-(require scheme/class
+(require racket/class
          "drsig.ss")
 
 (import [prefix drscheme:unit: drscheme:unit^]
diff --git a/collects/drscheme/private/help-desk.ss b/collects/drscheme/private/help-desk.ss
index af8be7a308..cc1f6c5c1b 100644
--- a/collects/drscheme/private/help-desk.ss
+++ b/collects/drscheme/private/help-desk.ss
@@ -1,9 +1,9 @@
 #lang scheme/unit
 
-(require scheme/gui/base
+(require racket/gui/base
          browser/external
          framework
-         scheme/class
+         racket/class
          net/url
          setup/dirs
          help/search
diff --git a/collects/drscheme/private/honu-logo.ss b/collects/drscheme/private/honu-logo.ss
index a60e3afa7c..6c36990c16 100644
--- a/collects/drscheme/private/honu-logo.ss
+++ b/collects/drscheme/private/honu-logo.ss
@@ -1,8 +1,8 @@
-#lang scheme/base
+#lang racket/base
 (provide draw-honu)
 
-(require scheme/class
-         scheme/gui/base
+(require racket/class
+         racket/gui/base
          "palaka.ss")
 
 (define pi (atan 0 -1))
diff --git a/collects/drscheme/private/init.ss b/collects/drscheme/private/init.ss
index 5c69bf7ca6..d3fc01bdc2 100644
--- a/collects/drscheme/private/init.ss
+++ b/collects/drscheme/private/init.ss
@@ -1,8 +1,7 @@
 #lang scheme/unit
   (require string-constants
            "drsig.ss"
-           mzlib/list
-           mred)
+           racket/gui/base)
   
   
   (import)
diff --git a/collects/drscheme/private/insert-large-letters.ss b/collects/drscheme/private/insert-large-letters.ss
index 609d7ffa85..5184e03d5d 100644
--- a/collects/drscheme/private/insert-large-letters.ss
+++ b/collects/drscheme/private/insert-large-letters.ss
@@ -2,7 +2,7 @@
 
 (require typed/mred/mred
          typed/framework/framework
-         scheme/class
+         racket/class
          string-constants/string-constant)
 
 
diff --git a/collects/drscheme/private/key.ss b/collects/drscheme/private/key.ss
index ccd52cc2d3..0df77cdffc 100644
--- a/collects/drscheme/private/key.ss
+++ b/collects/drscheme/private/key.ss
@@ -1,4 +1,4 @@
-#lang mzscheme
+#lang racket/base
   (provide break-threads)
   (define super-cust (current-custodian))
   (define first-child (make-custodian))
diff --git a/collects/drscheme/private/label-frame-mred.ss b/collects/drscheme/private/label-frame-mred.ss
index 1ca3158cc0..842153fcb7 100644
--- a/collects/drscheme/private/label-frame-mred.ss
+++ b/collects/drscheme/private/label-frame-mred.ss
@@ -1,28 +1,28 @@
-#lang mzscheme
-  (require mred
-           mzlib/class)
-  (provide (all-from-except mred frame%)
-           (rename registering-frame% frame%)
+#lang racket/base
+  (require racket/gui/base
+           racket/class)
+  (provide (except-out (all-from-out racket/gui/base) frame%)
+           (rename-out [registering-frame% frame%])
            lookup-frame-name)
   
   (define (lookup-frame-name frame)
     (semaphore-wait label-sema)
     (begin0
-      (hash-table-get label-ht frame (λ () #f))
+      (hash-ref label-ht frame (λ () #f))
       (semaphore-post label-sema)))
   
   (define label-sema (make-semaphore 1))
-  (define label-ht (make-hash-table 'weak))
+  (define label-ht (make-weak-hasheq))
   
   (define registering-frame%
     (class frame%
       (define/override (set-label x)
         (semaphore-wait label-sema)
-        (hash-table-put! label-ht this x)
+        (hash-set! label-ht this x)
         (semaphore-post label-sema)
         (super set-label x))
       (inherit get-label)
       (super-instantiate ())
       (semaphore-wait label-sema)
-      (hash-table-put! label-ht this (get-label))
+      (hash-set! label-ht this (get-label))
       (semaphore-post label-sema)))
diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss
index 1b9e223a7f..20efcb9c11 100644
--- a/collects/drscheme/private/language-configuration.ss
+++ b/collects/drscheme/private/language-configuration.ss
@@ -1,13 +1,13 @@
-#lang scheme/base
+#lang racket/base
   (require scheme/unit
            mrlib/hierlist
-           scheme/class
-           scheme/contract
-           scheme/string
-           scheme/list
+           racket/class
+           racket/contract
+           racket/string
+           racket/list
+           racket/gui/base
            "drsig.ss"
            string-constants
-           mred
            framework
            setup/getinfo
            syntax/toplevel
@@ -1252,7 +1252,12 @@
                (message-box
                 (string-constant drscheme)
                 (format
-                 "The drscheme-language-position, drscheme-language-modules, drscheme-language-numbers, and drscheme-language-readers specifications aren't correct. Expected (listof (cons string (listof string))), (listof (listof string)), (listof (listof number)), (listof string), (listof string), and (listof module-spec) respectively, where the lengths of the outer lists are the same. Got ~e, ~e, ~e, ~e, ~e, and ~e"
+                 (string-append
+                  "The drscheme-language-position, drscheme-language-modules, drscheme-language-numbers,"
+                  " and drscheme-language-readers specifications aren't correct. Expected"
+                  " (listof (cons string (listof string))), (listof (listof string)), (listof (listof number)), (listof string),"
+                  " (listof string), and (listof module-spec) respectively, where the lengths of the outer lists are the same."
+                  " Got ~e, ~e, ~e, ~e, ~e, and ~e")
                  lang-positions
                  lang-modules
                  numberss
@@ -1431,7 +1436,7 @@
       (let ([words #f])
         (λ ()
           (unless words
-            (set! words (text:get-completions/manuals '(scheme/base scheme/contract))))
+            (set! words (text:get-completions/manuals '(racket/base racket/contract))))
           words)))
     
     (define get-all-manual-keywords
diff --git a/collects/drscheme/private/language-object-contract.ss b/collects/drscheme/private/language-object-contract.ss
index dbb6eba60c..a9836f12d4 100644
--- a/collects/drscheme/private/language-object-contract.ss
+++ b/collects/drscheme/private/language-object-contract.ss
@@ -1,14 +1,14 @@
 #reader scribble/reader
-#lang scheme/base
-(require (for-syntax scheme/base)
+#lang racket/base
+(require (for-syntax racket/base)
          scribble/srcdoc
-         scheme/class
-         scheme/gui/base
-         scheme/contract
+         racket/class
+         racket/gui/base
+         racket/contract
          "recon.ss")
-(require/doc scheme/base scribble/manual)
+(require/doc racket/base scribble/manual)
 
-(require (for-meta 2 scheme/base))
+(require (for-meta 2 racket/base))
 
 (provide language-object-abstraction)
 
diff --git a/collects/drscheme/private/language.ss b/collects/drscheme/private/language.ss
index 7387ce3377..d9f61db1c4 100644
--- a/collects/drscheme/private/language.ss
+++ b/collects/drscheme/private/language.ss
@@ -9,17 +9,17 @@
          
          ;; NOTE: this module instantiates stacktrace itself, so we have
          ;; to be careful to not mix that instantiation with the one
-         ;; drscheme/private/debug.ss does. errortrace-lib's is for the
+         ;; drracket/private/debug.ss does. errortrace-lib's is for the
          ;; compilation handling, DrScheme's is for profiling and test coverage
          ;; (which do not do compilation)
          (prefix-in el: errortrace/errortrace-lib) 
          
          mzlib/pconvert
-         scheme/pretty
+         racket/pretty
          mzlib/struct
-         scheme/class
-         scheme/file
-         scheme/list
+         racket/class
+         racket/file
+         racket/list
          compiler/embed
          launcher
          mred
diff --git a/collects/drscheme/private/launcher-bootstrap.ss b/collects/drscheme/private/launcher-bootstrap.ss
index 13e63f0313..36074c81e3 100644
--- a/collects/drscheme/private/launcher-bootstrap.ss
+++ b/collects/drscheme/private/launcher-bootstrap.ss
@@ -1,8 +1,8 @@
-#lang scheme/base
+#lang racket/base
 
 (provide startup)
 
-(require scheme/file)
+(require racket/file)
 
 (define (read-from-string s) (read (open-input-string s)))
 
diff --git a/collects/drscheme/private/launcher-mred-bootstrap.ss b/collects/drscheme/private/launcher-mred-bootstrap.ss
index 20820223ab..ac676bb763 100644
--- a/collects/drscheme/private/launcher-mred-bootstrap.ss
+++ b/collects/drscheme/private/launcher-mred-bootstrap.ss
@@ -1,9 +1,9 @@
-#lang scheme/base
+#lang racket/base
 
-(require scheme/gui/base "launcher-bootstrap.ss")
+(require racket/gui/base "launcher-bootstrap.ss")
 
 (current-namespace (make-gui-empty-namespace))
-(namespace-require 'scheme/gui/base)
-(namespace-require 'scheme/class)
+(namespace-require 'racket/gui/base)
+(namespace-require 'racket/class)
 
 (startup)
diff --git a/collects/drscheme/private/launcher-mz-bootstrap.ss b/collects/drscheme/private/launcher-mz-bootstrap.ss
index f591a62c7a..e2054aebca 100644
--- a/collects/drscheme/private/launcher-mz-bootstrap.ss
+++ b/collects/drscheme/private/launcher-mz-bootstrap.ss
@@ -1,8 +1,8 @@
-#lang scheme/base
+#lang racket/base
 
 (require "launcher-bootstrap.ss")
 
 (current-namespace (make-base-empty-namespace))
-(namespace-require 'scheme/base)
+(namespace-require 'racket/base)
 
 (startup)
diff --git a/collects/drscheme/private/link.ss b/collects/drscheme/private/link.ss
index e2fabeceb9..e1ded533aa 100644
--- a/collects/drscheme/private/link.ss
+++ b/collects/drscheme/private/link.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require scheme/unit
          "modes.ss"
          "font.ss"
diff --git a/collects/drscheme/private/main.ss b/collects/drscheme/private/main.ss
index 998285168a..d54f1fd7dc 100644
--- a/collects/drscheme/private/main.ss
+++ b/collects/drscheme/private/main.ss
@@ -7,7 +7,7 @@
          framework
          mzlib/class
          mzlib/list
-         scheme/path
+         racket/path
          browser/external
          setup/plt-installer)
 
diff --git a/collects/drscheme/private/modes.ss b/collects/drscheme/private/modes.ss
index 973d6275d2..f9a717578e 100644
--- a/collects/drscheme/private/modes.ss
+++ b/collects/drscheme/private/modes.ss
@@ -1,7 +1,7 @@
 #lang scheme/unit
   (require string-constants
-           mzlib/class
-           mzlib/list
+           racket/class
+	   racket/list
            framework
            "drsig.ss")
   
@@ -23,7 +23,7 @@
   
   (define (not-a-language-language? l)
     (and (not (null? l))
-         (equal? (car (last-pair l))
+         (equal? (last l)
                  (string-constant no-language-chosen))))
   
   (define (add-initial-modes)
diff --git a/collects/drscheme/private/module-browser.ss b/collects/drscheme/private/module-browser.ss
index d58fd4da64..281cfba0fc 100644
--- a/collects/drscheme/private/module-browser.ss
+++ b/collects/drscheme/private/module-browser.ss
@@ -1,7 +1,7 @@
-#lang scheme/base
+#lang racket/base
 
 (require mred
-         scheme/class
+         racket/class
          syntax/moddep
          syntax/toplevel
          framework/framework
@@ -9,7 +9,7 @@
          mrlib/graph
          "drsig.ss"
          scheme/unit
-         scheme/async-channel
+         racket/async-channel
          setup/private/lib-roots)
 
 (define-struct req (filename key))
diff --git a/collects/drscheme/private/module-language-tools.ss b/collects/drscheme/private/module-language-tools.ss
index 73bc52053d..deead1f19e 100644
--- a/collects/drscheme/private/module-language-tools.ss
+++ b/collects/drscheme/private/module-language-tools.ss
@@ -1,12 +1,12 @@
-#lang scheme/base
+#lang racket/base
 (provide module-language-tools@)
 (require mrlib/switchable-button 
          mrlib/bitmap-label
-         scheme/contract
+         racket/contract
          framework
          scheme/unit
-         scheme/class
-         scheme/gui/base
+         racket/class
+         racket/gui/base
          "drsig.ss")
 
 (define op (current-output-port))
diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss
index 7c09d02989..6ffa79b563 100644
--- a/collects/drscheme/private/module-language.ss
+++ b/collects/drscheme/private/module-language.ss
@@ -1,11 +1,11 @@
-#lang scheme/base
+#lang racket/base
 
 (provide module-language@)
 (require scheme/unit
-         scheme/class
-         scheme/list
-         scheme/path
-         scheme/contract
+         racket/class
+         racket/list
+         racket/path
+         racket/contract
          mred
          compiler/embed
          compiler/cm
@@ -382,7 +382,7 @@
                           #:literal-expression
                           (begin
                             (parameterize ([current-namespace (make-base-empty-namespace)])
-                              (namespace-require 'scheme/base)
+                              (namespace-require 'racket/base)
                               (compile 
                                `(namespace-require '',(string->symbol (path->string short-program-name))))))
                           #:cmdline '("-U" "--")))))
@@ -672,7 +672,7 @@
       (raise-hopeless-syntax-error "bad syntax in name position of module"
                                    stx name))
     (when filename (check-filename-matches filename name* stx))
-    (let* (;; rewrite the module to use the scheme/base version of `module'
+    (let* (;; rewrite the module to use the racket/base version of `module'
            [mod  (datum->syntax #'here 'module mod)]
            [expr (datum->syntax stx `(,mod ,name ,lang . ,body) stx stx)])
       (values name lang expr)))
diff --git a/collects/drscheme/private/multi-file-search.ss b/collects/drscheme/private/multi-file-search.ss
index f185e45972..aa1647cd05 100644
--- a/collects/drscheme/private/multi-file-search.ss
+++ b/collects/drscheme/private/multi-file-search.ss
@@ -2,8 +2,8 @@
   (require framework
            mzlib/class
            mred
-           scheme/file
-           scheme/path
+           racket/file
+           racket/path
            mzlib/thread
            mzlib/async-channel
            string-constants
diff --git a/collects/drscheme/private/number-snip.ss b/collects/drscheme/private/number-snip.ss
index 5426620d15..c224e5ab3a 100644
--- a/collects/drscheme/private/number-snip.ss
+++ b/collects/drscheme/private/number-snip.ss
@@ -1,6 +1,6 @@
-#lang mzscheme
+#lang racket/base
   (require mred
-           mzlib/class
+           racket/class
            framework)
   
   (provide snip-class)
diff --git a/collects/drscheme/private/palaka.ss b/collects/drscheme/private/palaka.ss
index 70ba631293..f10c0e9f9f 100755
--- a/collects/drscheme/private/palaka.ss
+++ b/collects/drscheme/private/palaka.ss
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class scheme/gui/base)
+#lang racket/base
+(require racket/class racket/gui/base)
 (provide draw-palaka palaka-pattern-size)
 
 (define scale 1)
diff --git a/collects/drscheme/private/prefs-contract.ss b/collects/drscheme/private/prefs-contract.ss
index dd62fb14d3..d850ca725e 100644
--- a/collects/drscheme/private/prefs-contract.ss
+++ b/collects/drscheme/private/prefs-contract.ss
@@ -1,6 +1,6 @@
-#lang scheme/base
+#lang racket/base
 
-(require (for-syntax scheme/base)
+(require (for-syntax racket/base)
          framework/framework)
 
 (provide (rename-out [-preferences:get preferences:get])
diff --git a/collects/drscheme/private/profile-drs.ss b/collects/drscheme/private/profile-drs.ss
index 78e0131d1f..819e83ae71 100644
--- a/collects/drscheme/private/profile-drs.ss
+++ b/collects/drscheme/private/profile-drs.ss
@@ -1,6 +1,6 @@
-#lang scheme/base
-(require scheme/gui/base
-         scheme/class
+#lang racket/base
+(require racket/gui/base
+         racket/class
          profile/sampler
          profile/render-text
          profile/analyzer
diff --git a/collects/drscheme/private/recon.ss b/collects/drscheme/private/recon.ss
index 6c9a7f1822..3d7c37ce91 100644
--- a/collects/drscheme/private/recon.ss
+++ b/collects/drscheme/private/recon.ss
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require (for-syntax scheme/base))
+#lang racket/base
+(require (for-syntax racket/base))
 (provide reconstitute)
 
 (begin-for-syntax
diff --git a/collects/drscheme/private/rep.ss b/collects/drscheme/private/rep.ss
index 35aa44c1f5..7a8d95f40b 100644
--- a/collects/drscheme/private/rep.ss
+++ b/collects/drscheme/private/rep.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 #|
 
@@ -20,15 +20,15 @@ TODO
 ;;          user's io ports, to aid any debugging printouts.
 ;;          (esp. useful when debugging the users's io)
 
-(require scheme/class
-         scheme/path
-         scheme/pretty
+(require racket/class
+         racket/path
+         racket/pretty
          scheme/unit
-         scheme/list
+         racket/list
          
          string-constants
          setup/xref
-         scheme/gui/base
+         racket/gui/base
          framework
          browser/external
          "drsig.ss"
diff --git a/collects/drscheme/private/stick-figures.ss b/collects/drscheme/private/stick-figures.ss
index 49a404ed67..dbe81bc423 100644
--- a/collects/drscheme/private/stick-figures.ss
+++ b/collects/drscheme/private/stick-figures.ss
@@ -1,7 +1,7 @@
-#lang mzscheme
-  (require mzlib/class
-           mzlib/pretty
-           mred)
+#lang racket/base
+  (require racket/class
+           racket/pretty
+           racket/gui/base)
   
   (define head-size 40)
   (define small-bitmap-factor 1/2)
diff --git a/collects/drscheme/private/tools.ss b/collects/drscheme/private/tools.ss
index 5198030441..d66d10a192 100644
--- a/collects/drscheme/private/tools.ss
+++ b/collects/drscheme/private/tools.ss
@@ -1,9 +1,9 @@
 #lang scheme/unit
 
-(require scheme/class
-         scheme/list
-         scheme/runtime-path
-         scheme/contract
+(require racket/class
+         racket/list
+         racket/runtime-path
+         racket/contract
          setup/getinfo
          mred
          framework
@@ -13,7 +13,7 @@
          mrlib/switchable-button
 string-constants)
 
-(require (for-syntax scheme/base scheme/match))
+(require (for-syntax racket/base racket/match))
 
 (import [prefix drscheme:frame: drscheme:frame^]
         [prefix drscheme:unit: drscheme:unit^]
diff --git a/collects/drscheme/private/tracing.ss b/collects/drscheme/private/tracing.ss
index 599b359d11..f30b0568cb 100644
--- a/collects/drscheme/private/tracing.ss
+++ b/collects/drscheme/private/tracing.ss
@@ -1,12 +1,12 @@
-#lang scheme/base
+#lang racket/base
 
-(require scheme/contract
+(require racket/contract
          scheme/unit
-         scheme/class
-         scheme/path
-         scheme/port
-         scheme/list
-         scheme/gui/base
+         racket/class
+         racket/path
+         racket/port
+         racket/list
+         racket/gui/base
          string-constants
          framework
          (prefix-in tr: trace/stacktrace)
diff --git a/collects/drscheme/private/ts.ss b/collects/drscheme/private/ts.ss
index e1d6de5dc8..eb706554ef 100644
--- a/collects/drscheme/private/ts.ss
+++ b/collects/drscheme/private/ts.ss
@@ -1,5 +1,4 @@
-#reader scribble/reader
-#lang scheme/base
+#lang at-exp racket/base
 
 (require scribble/decode
          scribble/manual)
diff --git a/collects/drscheme/private/unit.ss b/collects/drscheme/private/unit.ss
index 67c1f52236..47b5df12c0 100644
--- a/collects/drscheme/private/unit.ss
+++ b/collects/drscheme/private/unit.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 #|
 
 closing:
@@ -11,12 +11,12 @@ module browser threading seems wrong.
 
 |#
 
-  (require scheme/contract
+  (require racket/contract
            scheme/unit
-           scheme/class
-           scheme/path
-           scheme/port
-           scheme/list
+           racket/class
+           racket/path
+           racket/port
+           racket/list
            string-constants
            framework
            mrlib/name-message
diff --git a/collects/drscheme/sprof.ss b/collects/drscheme/sprof.ss
index 099dc03230..5f66b0c1ea 100644
--- a/collects/drscheme/sprof.ss
+++ b/collects/drscheme/sprof.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require scheme/gui/base
          framework
          scheme/class)
diff --git a/collects/drscheme/syncheck-drscheme-button.ss b/collects/drscheme/syncheck-drscheme-button.ss
index 25e5279643..a4d7f28d30 100644
--- a/collects/drscheme/syncheck-drscheme-button.ss
+++ b/collects/drscheme/syncheck-drscheme-button.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require scheme/class 
          scheme/gui/base
          string-constants/string-constant)
diff --git a/collects/drscheme/syncheck.ss b/collects/drscheme/syncheck.ss
index 09c7ad29db..128cfa3496 100644
--- a/collects/drscheme/syncheck.ss
+++ b/collects/drscheme/syncheck.ss
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 #|
 
 Check Syntax separates two classes of identifiers,
diff --git a/collects/drscheme/tool-lib.ss b/collects/drscheme/tool-lib.ss
index cbfa92f77b..440b8387fe 100644
--- a/collects/drscheme/tool-lib.ss
+++ b/collects/drscheme/tool-lib.ss
@@ -1,4 +1,4 @@
-#lang at-exp scheme/base
+#lang at-exp racket/base
 
 #|
 
diff --git a/collects/drscheme/tool.ss b/collects/drscheme/tool.ss
index 7fd1b8188c..ff4a7fbf66 100644
--- a/collects/drscheme/tool.ss
+++ b/collects/drscheme/tool.ss
@@ -1,4 +1,5 @@
-(module tool mzscheme
-  (require "private/drsig.ss")
-  (provide drscheme:tool^
-           drscheme:tool-exports^))
+#lang racket/base
+(require "private/drsig.ss")
+(provide drscheme:tool^
+	 drscheme:tool-exports^)
+