diff --git a/collects/mred/main.rkt b/collects/mred/main.rkt
index e1846008..ccbbdfa7 100644
--- a/collects/mred/main.rkt
+++ b/collects/mred/main.rkt
@@ -1,3 +1,3 @@
-(module main scheme/base
+(module main racket/base
   (require "mred.rkt")
   (provide (all-from-out "mred.rkt")))
diff --git a/collects/mred/mred-sig.rkt b/collects/mred/mred-sig.rkt
index f3bb5b34..bc49ba6e 100644
--- a/collects/mred/mred-sig.rkt
+++ b/collects/mred/mred-sig.rkt
@@ -1,4 +1,4 @@
-#lang scheme/signature
+#lang racket/signature
 
 add-color<%>
 add-editor-keymap-functions
diff --git a/collects/mred/private/dynamic.rkt b/collects/mred/private/dynamic.rkt
index 0fd5c23f..89094303 100644
--- a/collects/mred/private/dynamic.rkt
+++ b/collects/mred/private/dynamic.rkt
@@ -1,6 +1,6 @@
-#lang scheme/base
+#lang racket/base
 
-;; This module is for use by scheme/gui/dynamic.
+;; This module is for use by racket/gui/dynamic.
 ;; It is required by mred/mred so that it gets carried
 ;; along when mred/mred is attached to a new namespace.
 
diff --git a/collects/mred/private/lock.rkt b/collects/mred/private/lock.rkt
index 7d50f669..60f49b87 100644
--- a/collects/mred/private/lock.rkt
+++ b/collects/mred/private/lock.rkt
@@ -15,7 +15,7 @@
 ;;   The `atomically' form is ok for that if no exceptions will
 ;;   be raised. Otherwise, use the more heavyweight `as-entry'.
 ;;
-;; * The scheme/gui classes have internal-consistency requirements.
+;; * The racket/gui classes have internal-consistency requirements.
 ;;   When the user creates an object or calls a method, or when the
 ;;   system invokes a callback, many steps may be required to
 ;;   initialize or reset fields to maintain invariants. To ensure that
diff --git a/collects/mred/private/mred.rkt b/collects/mred/private/mred.rkt
index 050e8bb5..87e4af73 100644
--- a/collects/mred/private/mred.rkt
+++ b/collects/mred/private/mred.rkt
@@ -3,7 +3,7 @@
                  define-namespace-anchor
                  namespace-anchor->empty-namespace
                  make-base-empty-namespace)
-           scheme/class
+           racket/class
            racket/draw racket/snip
            file/resource
            mzlib/etc
diff --git a/collects/mred/private/path-dialog.rkt b/collects/mred/private/path-dialog.rkt
index 1ccbe561..4e16e856 100644
--- a/collects/mred/private/path-dialog.rkt
+++ b/collects/mred/private/path-dialog.rkt
@@ -1,11 +1,11 @@
 (module path-dialog mzscheme
   (require mzlib/class mzlib/list mzlib/string mzlib/file
            (prefix wx: "kernel.rkt")
-	   (prefix wx: racket/snip/private/style)
+           (prefix wx: racket/snip/private/style)
            racket/snip/private/prefs
            "helper.rkt" "mrtop.rkt" "mritem.rkt" "mrpanel.rkt"
            "mrtextfield.rkt" "messagebox.rkt" "mrmenu.rkt"
-           (only scheme/base compose))
+           (only racket/base compose1))
   (provide path-dialog%)
 
   (define last-visted-directory #f)
@@ -46,9 +46,9 @@
       (lambda (p . more)
         (apply simplify-path (expand-path* p) more))))
 
-  (define directory-exists*? (compose directory-exists? expand-path*))
-  (define file-exists*?      (compose file-exists? expand-path*))
-  (define absolute-path*?    (compose absolute-path? expand-path*))
+  (define directory-exists*? (compose1 directory-exists? expand-path*))
+  (define file-exists*?      (compose1 file-exists? expand-path*))
+  (define absolute-path*?    (compose1 absolute-path? expand-path*))
 
   (define (build-path* dir path)
     (cond [(absolute-path*? path) (if (string? path) (string->path path) path)]
diff --git a/collects/mred/private/syntax.rkt b/collects/mred/private/syntax.rkt
index 431e1a26..b7b47800 100644
--- a/collects/mred/private/syntax.rkt
+++ b/collects/mred/private/syntax.rkt
@@ -1,3 +1,3 @@
-#lang scheme/base
+#lang racket/base
 (require racket/draw/private/syntax)
 (provide (all-from-out racket/draw/private/syntax))
diff --git a/collects/mred/private/wx/cocoa/frame.rkt b/collects/mred/private/wx/cocoa/frame.rkt
index f16baaf0..aecae012 100644
--- a/collects/mred/private/wx/cocoa/frame.rkt
+++ b/collects/mred/private/wx/cocoa/frame.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require ffi/unsafe/objc
          ffi/unsafe
-         scheme/class
+         racket/class
          "pool.rkt"
          "utils.rkt"
          "const.rkt"
diff --git a/collects/mred/private/wx/cocoa/list-box.rkt b/collects/mred/private/wx/cocoa/list-box.rkt
index e45b2e08..19e6524e 100644
--- a/collects/mred/private/wx/cocoa/list-box.rkt
+++ b/collects/mred/private/wx/cocoa/list-box.rkt
@@ -2,7 +2,7 @@
 (require ffi/unsafe/objc
          ffi/unsafe
          racket/class
-         (only-in scheme/list take drop)
+         (only-in racket/list take drop)
           "../../syntax.rkt"
           "../../lock.rkt"
          "item.rkt"
diff --git a/collects/mred/private/wx/cocoa/menu.rkt b/collects/mred/private/wx/cocoa/menu.rkt
index 0162bc21..e4145a32 100644
--- a/collects/mred/private/wx/cocoa/menu.rkt
+++ b/collects/mred/private/wx/cocoa/menu.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          ffi/unsafe
          ffi/unsafe/objc
-         (only-in scheme/list drop take)
+         (only-in racket/list drop take)
          "../common/event.rkt"
          "../../syntax.rkt"
          "../../lock.rkt"
diff --git a/collects/mred/private/wx/win32/menu-item.rkt b/collects/mred/private/wx/win32/menu-item.rkt
index 1f0bcd78..e57fbd4b 100644
--- a/collects/mred/private/wx/win32/menu-item.rkt
+++ b/collects/mred/private/wx/win32/menu-item.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require ffi/unsafe
-         scheme/class
+         racket/class
          "utils.rkt"
          "types.rkt"
          "const.rkt"
diff --git a/collects/mred/private/wxme/const.rkt b/collects/mred/private/wxme/const.rkt
index 37c0eb4a..cc9dfe1a 100644
--- a/collects/mred/private/wxme/const.rkt
+++ b/collects/mred/private/wxme/const.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 (provide (all-defined-out))
 
diff --git a/collects/mred/private/wxme/cycle.rkt b/collects/mred/private/wxme/cycle.rkt
index e55be69c..08230284 100644
--- a/collects/mred/private/wxme/cycle.rkt
+++ b/collects/mred/private/wxme/cycle.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 
 (define-syntax-rule (decl id set-id)
   (begin
diff --git a/collects/mred/private/wxme/editor-admin.rkt b/collects/mred/private/wxme/editor-admin.rkt
index 20d0fe07..8d3267d1 100644
--- a/collects/mred/private/wxme/editor-admin.rkt
+++ b/collects/mred/private/wxme/editor-admin.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "private.rkt"
          racket/snip/private/private
diff --git a/collects/mred/private/wxme/editor-canvas.rkt b/collects/mred/private/wxme/editor-canvas.rkt
index d2cf51f0..e281bb47 100644
--- a/collects/mred/private/wxme/editor-canvas.rkt
+++ b/collects/mred/private/wxme/editor-canvas.rkt
@@ -1,6 +1,6 @@
-#lang scheme/base
-(require scheme/class
-         scheme/file
+#lang racket/base
+(require racket/class
+         racket/file
          "../syntax.rkt"
          "editor.rkt"
          "editor-admin.rkt"
diff --git a/collects/mred/private/wxme/editor-data.rkt b/collects/mred/private/wxme/editor-data.rkt
index f8905be6..1d07db51 100644
--- a/collects/mred/private/wxme/editor-data.rkt
+++ b/collects/mred/private/wxme/editor-data.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
-(require scheme/class
-         scheme/file file/convertible
+(require racket/class
+         racket/file file/convertible
          "../syntax.rkt"
          "private.rkt"
          racket/snip/private/snip-flags
diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt
index e539b59c..d29442be 100644
--- a/collects/mred/private/wxme/editor-snip.rkt
+++ b/collects/mred/private/wxme/editor-snip.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "private.rkt"
          racket/snip/private/private
diff --git a/collects/mred/private/wxme/editor.rkt b/collects/mred/private/wxme/editor.rkt
index edb1c657..a6c485ed 100644
--- a/collects/mred/private/wxme/editor.rkt
+++ b/collects/mred/private/wxme/editor.rkt
@@ -1,7 +1,7 @@
-#lang scheme/base
-(require scheme/class
-         (for-syntax scheme/base)
-         scheme/file
+#lang racket/base
+(require racket/class
+         (for-syntax racket/base)
+         racket/file
          racket/port
          "../syntax.rkt"
          "private.rkt"
diff --git a/collects/mred/private/wxme/keymap.rkt b/collects/mred/private/wxme/keymap.rkt
index 50542028..cb68fb16 100644
--- a/collects/mred/private/wxme/keymap.rkt
+++ b/collects/mred/private/wxme/keymap.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "wx.rkt")
 
diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt
index d2b9c8d3..cda3166d 100644
--- a/collects/mred/private/wxme/mline.rkt
+++ b/collects/mred/private/wxme/mline.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "const.rkt"
          racket/snip/private/snip
diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt
index 7320720d..69e6eae4 100644
--- a/collects/mred/private/wxme/pasteboard.rkt
+++ b/collects/mred/private/wxme/pasteboard.rkt
@@ -1,7 +1,7 @@
-#lang scheme/base
-(require scheme/class
-         scheme/port
-         scheme/file
+#lang racket/base
+(require racket/class
+         racket/port
+         racket/file
          "../syntax.rkt"
          "const.rkt"
          "private.rkt"
diff --git a/collects/mred/private/wxme/private.rkt b/collects/mred/private/wxme/private.rkt
index 8e77adb8..fdd9f7e3 100644
--- a/collects/mred/private/wxme/private.rkt
+++ b/collects/mred/private/wxme/private.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class)
+#lang racket/base
+(require racket/class)
 
 (provide (all-defined-out))
 
diff --git a/collects/mred/private/wxme/standard-snip-admin.rkt b/collects/mred/private/wxme/standard-snip-admin.rkt
index 0f2bb314..5f6be7d1 100644
--- a/collects/mred/private/wxme/standard-snip-admin.rkt
+++ b/collects/mred/private/wxme/standard-snip-admin.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          racket/snip/private/snip
          racket/snip/private/snip-admin
diff --git a/collects/mred/private/wxme/stream.rkt b/collects/mred/private/wxme/stream.rkt
index dbb32cbe..bb188260 100644
--- a/collects/mred/private/wxme/stream.rkt
+++ b/collects/mred/private/wxme/stream.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "private.rkt"
          racket/snip/private/private
diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt
index f9da2b8f..73cbfdd4 100644
--- a/collects/mred/private/wxme/text.rkt
+++ b/collects/mred/private/wxme/text.rkt
@@ -1,8 +1,8 @@
-#lang scheme/base
-(require scheme/class
-         scheme/port
-         scheme/file
-         (for-syntax scheme/base)
+#lang racket/base
+(require racket/class
+         racket/port
+         racket/file
+         (for-syntax racket/base)
          "../syntax.rkt"
          "const.rkt"
          "mline.rkt"
diff --git a/collects/mred/private/wxme/undo.rkt b/collects/mred/private/wxme/undo.rkt
index a304d4ca..cddc0cc2 100644
--- a/collects/mred/private/wxme/undo.rkt
+++ b/collects/mred/private/wxme/undo.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "private.rkt"
          racket/snip/private/private
          racket/snip/private/snip
diff --git a/collects/mred/private/wxme/wordbreak.rkt b/collects/mred/private/wxme/wordbreak.rkt
index bc156d16..b56f02c4 100644
--- a/collects/mred/private/wxme/wordbreak.rkt
+++ b/collects/mred/private/wxme/wordbreak.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/class
+#lang racket/base
+(require racket/class
          "../syntax.rkt"
          "cycle.rkt")
 
diff --git a/collects/mred/private/wxme/wx.rkt b/collects/mred/private/wxme/wx.rkt
index e8a845ab..ebe25445 100644
--- a/collects/mred/private/wxme/wx.rkt
+++ b/collects/mred/private/wxme/wx.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require "../kernel.rkt" racket/draw/private/font-syms)
 
 (define the-clipboard (get-the-clipboard))
diff --git a/collects/racket/gui/init.rkt b/collects/racket/gui/init.rkt
index ec82d642..1afce331 100644
--- a/collects/racket/gui/init.rkt
+++ b/collects/racket/gui/init.rkt
@@ -1,4 +1,3 @@
-
 (module init scheme/gui
   (require scheme/init)