diff --git a/collects/drscheme/private/debug.rkt b/collects/drscheme/private/debug.rkt
index d4aa4ac832..c07351a18b 100644
--- a/collects/drscheme/private/debug.rkt
+++ b/collects/drscheme/private/debug.rkt
@@ -574,10 +574,10 @@ profile todo:
           (make-object backtrace-frame%
             (string-constant backtrace-window-title)
             #f
-            (preferences:get 'drscheme:backtrace-window-width)
-            (preferences:get 'drscheme:backtrace-window-height)
-            (preferences:get 'drscheme:backtrace-window-x)
-            (preferences:get 'drscheme:backtrace-window-y))))
+            (preferences:get 'drracket:backtrace-window-width)
+            (preferences:get 'drracket:backtrace-window-height)
+            (preferences:get 'drracket:backtrace-window-x)
+            (preferences:get 'drracket:backtrace-window-y))))
   
   ;; hide-backtrace-window : -> void
   (define (hide-backtrace-window)
@@ -589,12 +589,12 @@ profile todo:
   (define backtrace-frame%
     (class (drracket:frame:basics-mixin (frame:standard-menus-mixin frame:basic%))
       (define/override (on-size x y)
-        (preferences:set 'drscheme:backtrace-window-width x)
-        (preferences:set 'drscheme:backtrace-window-height y)
+        (preferences:set 'drracket:backtrace-window-width x)
+        (preferences:set 'drracket:backtrace-window-height y)
         (super on-size x y))
       (define/override (on-move x y)
-        (preferences:set 'drscheme:backtrace-window-x x)
-        (preferences:set 'drscheme:backtrace-window-y y)
+        (preferences:set 'drracket:backtrace-window-x x)
+        (preferences:set 'drracket:backtrace-window-y y)
         (super on-move x y))
       (define/override (edit-menu:between-find-and-preferences edit-menu) (void))
       (define/override (edit-menu:between-select-all-and-find edit-menu) (void))
@@ -991,7 +991,7 @@ profile todo:
       (inherit get-canvas get-tab)
       
       (define/private (clear-test-coverage?)
-        (if (preferences:get 'drscheme:test-coverage-ask-about-clearing?)
+        (if (preferences:get 'drracket:test-coverage-ask-about-clearing?)
             (let ([msg-box-result
                    (message-box/custom
                     (string-constant drscheme)
@@ -1006,7 +1006,7 @@ profile todo:
                 [(1) #t]
                 [(2) #f]
                 [(3)
-                 (preferences:set 'drscheme:test-coverage-ask-about-clearing? #f)
+                 (preferences:set 'drracket:test-coverage-ask-about-clearing? #f)
                  #t]))
             #t))
       
@@ -1364,15 +1364,15 @@ profile todo:
   (define (get-color-value val max-val)
     (get-color-value/pref val 
                           max-val
-                          (preferences:get 'drscheme:profile:low-color)
-                          (preferences:get 'drscheme:profile:high-color)
-                          (preferences:get 'drscheme:profile:scale)))
+                          (preferences:get 'drracket:profile:low-color)
+                          (preferences:get 'drracket:profile:high-color)
+                          (preferences:get 'drracket:profile:scale)))
   
   ;; extract-maximum : (listof prof-info) -> number
   ;; gets the maximum value of the currently preferred profiling info.
   (define (extract-maximum infos)
     (let ([max-value 0]
-          [sel (if (eq? (preferences:get 'drscheme:profile-how-to-count) 'time)
+          [sel (if (eq? (preferences:get 'drracket:profile-how-to-count) 'time)
                    prof-info-time
                    prof-info-num)])
       (for-each
@@ -1449,7 +1449,7 @@ profile todo:
       (define profile-info-visible? #f)
       (define/public (get-profile-info-visible?) profile-info-visible?)
       
-      (define sort-mode (preferences:get 'drscheme:profile-how-to-count))
+      (define sort-mode (preferences:get 'drracket:profile-how-to-count))
       (define/public (get-sort-mode) sort-mode)
       (define/public (set-sort-mode mode) (set! sort-mode mode))
       
@@ -1626,14 +1626,14 @@ profile todo:
                                      (callback
                                       (λ (x y)
                                         (let ([mode (profile-selection->mode (send profile-choice get-selection))])
-                                          (preferences:set 'drscheme:profile-how-to-count mode)
+                                          (preferences:set 'drracket:profile-how-to-count mode)
                                           (send (get-current-tab) set-sort-mode mode)
                                           (send (get-current-tab) refresh-profile))))
                                      (choices (list (string-constant profiling-time)
                                                     (string-constant profiling-number))))))
             (define _1
               (send profile-choice set-selection
-                    (case (preferences:get 'drscheme:profile-how-to-count)
+                    (case (preferences:get 'drracket:profile-how-to-count)
                       [(time) 0]
                       [(count) 1])))
             (define update-profile-button
@@ -1651,7 +1651,7 @@ profile todo:
                  (λ (x y)
                    (send (get-current-tab) hide-profile)))))
             (send profile-choice set-selection 
-                  (profile-mode->selection (preferences:get 'drscheme:profile-how-to-count)))
+                  (profile-mode->selection (preferences:get 'drracket:profile-how-to-count)))
             
             (send profile-left-side stretchable-width #f)
             
@@ -1757,7 +1757,7 @@ profile todo:
                         (hash-set! in-edit-sequence src #t)
                         (send src begin-edit-sequence))
                       (let* ([color (get-color-value 
-                                     (if (eq? (preferences:get 'drscheme:profile-how-to-count) 'time)
+                                     (if (eq? (preferences:get 'drracket:profile-how-to-count) 'time)
                                          (prof-info-time info)
                                          (prof-info-num info))
                                      max-value)]
@@ -1819,7 +1819,7 @@ profile todo:
                
                [bigger-value?
                 (λ (x y)
-                  (let ([sel (if (eq? 'count (preferences:get 'drscheme:profile-how-to-count))
+                  (let ([sel (if (eq? 'count (preferences:get 'drracket:profile-how-to-count))
                                  prof-info-num
                                  prof-info-time)])
                     (> (sel x) (sel y))))]
@@ -2037,22 +2037,22 @@ profile todo:
                                  #f
                                  (preferences:get
                                   (if low?
-                                      'drscheme:profile:low-color
-                                      'drscheme:profile:high-color)))])
+                                      'drracket:profile:low-color
+                                      'drracket:profile:high-color)))])
                      (when color
                        (preferences:set 
-                        (if low? 'drscheme:profile:low-color 'drscheme:profile:high-color)
+                        (if low? 'drracket:profile:low-color 'drracket:profile:high-color)
                         color))))]
                 [scale-callback
                  (λ ()
                    (preferences:set 
-                    'drscheme:profile:scale
+                    'drracket:profile:scale
                     (case (send scale get-selection)
                       [(0) 'sqrt]
                       [(1) 'linear]
                       [(2) 'square])))])
          (preferences:add-callback
-          'drscheme:profile:scale
+          'drracket:profile:scale
           (λ (p v)
             (send scale set-selection
                   (case v
@@ -2072,9 +2072,9 @@ profile todo:
         (set! in-on-paint? #t)
         (let* ([dc (get-dc)]
                [dummy-pen (send dc get-pen)]
-               [drracket:profile:low-color (preferences:get 'drscheme:profile:low-color)]
-               [drracket:profile:high-color (preferences:get 'drscheme:profile:high-color)]
-               [drracket:profile:scale (preferences:get 'drscheme:profile:scale)])
+               [drracket:profile:low-color (preferences:get 'drracket:profile:low-color)]
+               [drracket:profile:high-color (preferences:get 'drracket:profile:high-color)]
+               [drracket:profile:scale (preferences:get 'drracket:profile:scale)])
           (let-values ([(w h) (get-client-size)])
             (let loop ([n 0])
               (when (n . <= . w)
@@ -2096,21 +2096,21 @@ profile todo:
       ;; values are actually set by the time on-paint
       ;; is called.
       (preferences:add-callback
-       'drscheme:profile:scale
+       'drracket:profile:scale
        (λ (p v)
          (unless in-on-paint?
            (queue-callback
             (λ ()
               (on-paint))))))
       (preferences:add-callback
-       'drscheme:profile:low-color
+       'drracket:profile:low-color
        (λ (p v)
          (unless in-on-paint?
            (queue-callback
             (λ ()
               (on-paint))))))
       (preferences:add-callback
-       'drscheme:profile:high-color
+       'drracket:profile:high-color
        (λ (p v)
          (unless in-on-paint?
            (queue-callback
diff --git a/collects/drscheme/private/drsig.rkt b/collects/drscheme/private/drsig.rkt
index 24eac1088f..b6e5c857ae 100644
--- a/collects/drscheme/private/drsig.rkt
+++ b/collects/drscheme/private/drsig.rkt
@@ -305,7 +305,9 @@
 (define-signature drracket:multi-file-search-cm^
   ())
 (define-signature drracket:multi-file-search^ extends drracket:multi-file-search-cm^
-  (multi-file-search))
+  (multi-file-search
+   search-type-params
+   search-types))
 
 (define-signature drracket:module-overview-cm^
   ())
diff --git a/collects/drscheme/private/frame.rkt b/collects/drscheme/private/frame.rkt
index ac91c0cda9..cf5f662fbe 100644
--- a/collects/drscheme/private/frame.rkt
+++ b/collects/drscheme/private/frame.rkt
@@ -236,7 +236,7 @@
                               (message-box (string-constant drscheme)
                                            (format (string-constant keybindings-planet-malformed-spec)
                                                    planet-spec))]))))))
-               (let ([ud (preferences:get 'drscheme:user-defined-keybindings)])
+               (let ([ud (preferences:get 'drracket:user-defined-keybindings)])
                  (unless (null? ud)
                    (new separator-menu-item% (parent keybindings-menu))
                    (for-each (λ (item)
@@ -256,9 +256,9 @@
   
   (define (add-keybindings-item/update-prefs item)
     (when (add-keybindings-item item)
-      (preferences:set 'drscheme:user-defined-keybindings
+      (preferences:set 'drracket:user-defined-keybindings
                        (cons item
-                             (preferences:get 'drscheme:user-defined-keybindings)))))
+                             (preferences:get 'drracket:user-defined-keybindings)))))
   
   (define (planet-string-spec? p)
     (let ([sexp
@@ -291,15 +291,15 @@
   (define (remove-keybindings-item item)
     (keymap:remove-user-keybindings-file item)
     (preferences:set
-     'drscheme:user-defined-keybindings
+     'drracket:user-defined-keybindings
      (remove item
-             (preferences:get 'drscheme:user-defined-keybindings))))
+             (preferences:get 'drracket:user-defined-keybindings))))
   
   ;; install-plt-file : (union #f dialog% frame%) -> void
   ;; asks the user for a .plt file, either from the web or from
   ;; a file on the disk and installs it.
   (define (install-plt-file parent)
-    (define pref (preferences:get 'drscheme:install-plt-dialog))
+    (define pref (preferences:get 'drracket:install-plt-dialog))
     (define dialog
       (new dialog% [parent parent]
            [label (string-constant install-plt-file-dialog-title)]
@@ -370,7 +370,7 @@
     (send tab-panel set-selection (if (car pref) 0 1))
     (update-panels)
     (send dialog show #t)
-    (preferences:set 'drscheme:install-plt-dialog
+    (preferences:set 'drracket:install-plt-dialog
                      (list (from-web?)
                            (send url-text-field get-value)
                            (send file-text-field get-value)))
@@ -464,7 +464,7 @@
       (override on-size)
       [define on-size
         (lambda (w h)
-          (preferences:set 'drscheme:keybindings-window-size (cons w h))
+          (preferences:set 'drracket:keybindings-window-size (cons w h))
           (super on-size w h))]
       (super-instantiate ())))
   
@@ -472,8 +472,8 @@
     (letrec ([f (instantiate keybindings-dialog% ()
                   (label (string-constant keybindings-frame-title))
                   (parent frame)
-                  (width (car (preferences:get 'drscheme:keybindings-window-size)))
-                  (height (cdr (preferences:get 'drscheme:keybindings-window-size)))
+                  (width (car (preferences:get 'drracket:keybindings-window-size)))
+                  (height (cdr (preferences:get 'drracket:keybindings-window-size)))
                   (style '(resize-border)))]
              [bp (make-object horizontal-panel% f)]
              [search-field (new text-field% 
diff --git a/collects/drscheme/private/insert-large-letters.rkt b/collects/drscheme/private/insert-large-letters.rkt
index 577754f4ab..1dec37a9a1 100644
--- a/collects/drscheme/private/insert-large-letters.rkt
+++ b/collects/drscheme/private/insert-large-letters.rkt
@@ -24,14 +24,6 @@
       (render-large-letters comment-prefix comment-character (get-chosen-font) str edit)
       (void))))
 
-(preferences:set-default 'drscheme:large-letters-font #f (λ: ([x : Any])
-                                                             (or (and (pair? x)
-                                                                      (string? (car x))
-                                                                      (let ([i (cdr x)])
-                                                                        (and (integer? i)
-                                                                             (<= 1 i 255))))
-                                                                 (not x))))
-
 (: get-default-font (-> (Instance Font%)))
 (define (get-default-font)
   (send (send (editor:get-standard-style-list)
@@ -41,7 +33,7 @@
 
 (: get-chosen-font (-> (Instance Font%)))
 (define (get-chosen-font)
-  (let ([pref-val (preferences:get 'drscheme:large-letters-font)])
+  (let ([pref-val (preferences:get 'drracket:large-letters-font)])
     (cond
       [pref-val
        (let ([candidate (send the-font-list find-or-create-font (cdr pref-val) (car pref-val) 'default 'normal 'normal)])
@@ -78,10 +70,10 @@
                          (get-face-list))]
            [callback
             (λ: ([x : Any] [y : Any])
-                (let ([old (preferences:get 'drscheme:large-letters-font)]
+                (let ([old (preferences:get 'drracket:large-letters-font)]
                       [choice (send font-choice get-selection)])
                   (when choice
-                    (preferences:set 'drscheme:large-letters-font
+                    (preferences:set 'drracket:large-letters-font
                                      (cons (list-ref (get-face-list)
                                                      choice)
                                            (if old
diff --git a/collects/drscheme/private/language-configuration.rkt b/collects/drscheme/private/language-configuration.rkt
index 68cac6ebf5..4fd10a06ca 100644
--- a/collects/drscheme/private/language-configuration.rkt
+++ b/collects/drscheme/private/language-configuration.rkt
@@ -36,7 +36,7 @@
     
     ;; settings-preferences-symbol : symbol
     ;; this pref used to depend on `version', but no longer does.
-    (define settings-preferences-symbol 'drscheme:language-settings)
+    (define settings-preferences-symbol 'drracket:language-settings)
     
     ;; get-settings-preferences-symbol : -> symbol
     (define (get-settings-preferences-symbol) settings-preferences-symbol)
@@ -58,7 +58,7 @@
     (define add-language
       (λ (language [front? #f])
         
-        (drracket:tools:only-in-phase 'drscheme:language:add-language 'phase2)
+        (drracket:tools:only-in-phase 'drracket:language:add-language 'phase2)
         (for-each
          (λ (i<%>)
            (unless (is-a? language i<%>)
diff --git a/collects/drscheme/private/main.rkt b/collects/drscheme/private/main.rkt
index 4b78e6a602..0296abecb7 100644
--- a/collects/drscheme/private/main.rkt
+++ b/collects/drscheme/private/main.rkt
@@ -22,10 +22,14 @@
         [prefix drracket:frame: drracket:frame^]
         [prefix drracket:font: drracket:font^]
         [prefix drracket:modes: drracket:modes^]
-        [prefix drracket:help-desk: drracket:help-desk^])
+        [prefix drracket:help-desk: drracket:help-desk^]
+        [prefix drracket:multi-file-search: drracket:multi-file-search^])
 (export)
 
-
+(define (drr:set-default name val predicate)
+  (preferences:set-default 
+   name val predicate 
+   #:aliases (list (string->symbol (regexp-replace #rx"^drracket:" (symbol->string name) "drscheme:")))))
 
 (when (eq? (system-type) 'unix)
   (let ()
@@ -90,9 +94,9 @@
                                (finder:default-filters)))
 (application:current-app-name (string-constant drscheme))
 
-(preferences:set-default 'drscheme:logger-gui-tab-panel-level 0 (λ (x) (and (exact-integer? x) (<= 0 x 5)))) 
+(drr:set-default 'drracket:logger-gui-tab-panel-level 0 (λ (x) (and (exact-integer? x) (<= 0 x 5)))) 
 
-(preferences:set-default 'drscheme:saved-bug-reports 
+(drr:set-default 'drracket:saved-bug-reports 
                          '() 
                          (λ (ll) 
                            (and (list? ll)
@@ -105,17 +109,17 @@
                                                 l)))
                                  ll))))
 
-(preferences:set-default 'drscheme:module-language-first-line-special? #t boolean?)
+(drr:set-default 'drracket:module-language-first-line-special? #t boolean?)
 
-(preferences:set-default 'drscheme:defns-popup-sort-by-name? #f boolean?)
+(drr:set-default 'drracket:defns-popup-sort-by-name? #f boolean?)
 
-(preferences:set-default 'drscheme:toolbar-state 
+(drr:set-default 'drracket:toolbar-state 
                          '(#f . top)
                          (λ (x) (and (pair? x)
                                      (boolean? (car x))
                                      (memq (cdr x) '(left top right)))))
 
-(preferences:set-default 'drscheme:htdp:last-set-teachpacks
+(drr:set-default 'drracket:htdp:last-set-teachpacks
                          '() 
                          (λ (x)
                            (and (list? x)
@@ -125,20 +129,20 @@
                                                (eq? (car x) 'lib)
                                                (andmap string? (cdr x))))
                                         x))))
-(preferences:set-default 'drscheme:defs/ints-horizontal #f boolean?)
-(preferences:set-default 'drscheme:unit-window-max? #f boolean?)
-(preferences:set-default 'drscheme:frame:initial-position #f 
+(drr:set-default 'drracket:defs/ints-horizontal #f boolean?)
+(drr:set-default 'drracket:unit-window-max? #f boolean?)
+(drr:set-default 'drracket:frame:initial-position #f 
                          (λ (x) (or (not x)
                                     (and (pair? x)
                                          (number? (car x))
                                          (number? (cdr x))))))
 
-(preferences:set-default 'drscheme:child-only-memory-limit (* 1024 1024 128)
+(drr:set-default 'drracket:child-only-memory-limit (* 1024 1024 128)
                          (λ (x) (or (boolean? x)
                                     (integer? x)
                                     (x . >= . (* 1024 1024 1)))))
 
-(preferences:set-default 'drscheme:recent-language-names 
+(drr:set-default 'drracket:recent-language-names 
                          null 
                          (λ (x) 
                            (and (list? x) 
@@ -147,22 +151,22 @@
                                    (and (pair? x)
                                         (string? (car x))))
                                  x))))
-(preferences:set-default 'drscheme:show-interactions-on-execute #t boolean?)
-(preferences:set-default 'drscheme:open-in-tabs #f boolean?)
-(preferences:set-default 'drscheme:toolbar-shown #t boolean?)
-(preferences:set-default 'drscheme:user-defined-keybindings
+(drr:set-default 'drracket:show-interactions-on-execute #t boolean?)
+(drr:set-default 'drracket:open-in-tabs #f boolean?)
+(drr:set-default 'drracket:toolbar-shown #t boolean?)
+(drr:set-default 'drracket:user-defined-keybindings
                          '()
                          (λ (x) (and (list? x) 
                                      (andmap (λ (x) (or (path? x) (drracket:frame:planet-spec? x)))
                                              x))))
-(preferences:set-default 'drscheme:install-plt-dialog
+(drr:set-default 'drracket:install-plt-dialog
                          '(#t "" "") ; url-selected?, url string, file string
                          (λ (x) (and (list? x) (= 3 (length x))
                                      (boolean? (car x))
                                      (andmap string? (cdr x)))))
 
 (preferences:set-un/marshall 
- 'drscheme:user-defined-keybindings
+ 'drracket:user-defined-keybindings
  (λ (in) (map (λ (x) (if (path? x) (path->bytes x) x))
               in))
  (λ (ex) (if (list? ex)
@@ -171,17 +175,17 @@
 
 (let ([number-between-zero-and-one?
        (λ (x) (and (number? x) (<= 0 x 1)))])
-  (preferences:set-default 'drscheme:unit-window-size-percentage 
+  (drr:set-default 'drracket:unit-window-size-percentage 
                            1/2 
                            number-between-zero-and-one?)
-  (preferences:set-default 'drscheme:module-browser-size-percentage
+  (drr:set-default 'drracket:module-browser-size-percentage
                            1/5
                            number-between-zero-and-one?)
-  (preferences:set-default 'drscheme:logging-size-percentage
+  (drr:set-default 'drracket:logging-size-percentage
                            3/4
                            number-between-zero-and-one?))
 
-(preferences:set-default 'drscheme:module-browser:name-length 1 
+(drr:set-default 'drracket:module-browser:name-length 1 
                          (λ (x) (memq x '(0 1 2 3))))
 
 (let ([frame-width 600]
@@ -191,31 +195,31 @@
   (let-values ([(w h) (get-display-size)])
     (set! frame-width (min frame-width (- w window-trimming-upper-bound-width)))
     (set! frame-height (min frame-height (- h window-trimming-upper-bound-height))))
-  (preferences:set-default 'drscheme:unit-window-width frame-width number?)
-  (preferences:set-default 'drscheme:unit-window-height frame-height number?))
+  (drr:set-default 'drracket:unit-window-width frame-width number?)
+  (drr:set-default 'drracket:unit-window-height frame-height number?))
 
-(preferences:set-default 'drscheme:backtrace-window-width 400 number?)
-(preferences:set-default 'drscheme:backtrace-window-height 300 number?)
-(preferences:set-default 'drscheme:backtrace-window-x 0 number?)
-(preferences:set-default 'drscheme:backtrace-window-y 0 number?)
+(drr:set-default 'drracket:backtrace-window-width 400 number?)
+(drr:set-default 'drracket:backtrace-window-height 300 number?)
+(drr:set-default 'drracket:backtrace-window-x 0 number?)
+(drr:set-default 'drracket:backtrace-window-y 0 number?)
 
-(preferences:set-default 'drscheme:profile-how-to-count 'time
+(drr:set-default 'drracket:profile-how-to-count 'time
                          (λ (x)
                            (memq x '(time count))))
-(preferences:set-default 'drscheme:profile:low-color
+(drr:set-default 'drracket:profile:low-color
                          (make-object color% 150 255 150)
                          (λ (x) (is-a? x color%)))
-(preferences:set-default 'drscheme:profile:high-color
+(drr:set-default 'drracket:profile:high-color
                          (make-object color% 255 150 150)
                          (λ (x) (is-a? x color%)))
-(preferences:set-default 'drscheme:profile:scale
+(drr:set-default 'drracket:profile:scale
                          'linear
                          (λ (x) (memq x '(sqrt linear square))))
 
-(preferences:set-default 'drscheme:test-coverage-ask-about-clearing? #t boolean?)
+(drr:set-default 'drracket:test-coverage-ask-about-clearing? #t boolean?)
 
 ;; size is in editor positions
-(preferences:set-default 'drscheme:repl-buffer-size 
+(drr:set-default 'drracket:repl-buffer-size 
                          '(#t . 1000)
                          (λ (x)
                            (and (pair? x)
@@ -235,41 +239,49 @@
              (make-object color% (car l) (cadr l) (caddr l))
              (make-object color% 0 0 0)))])
   (preferences:set-un/marshall 
-   'drscheme:profile:low-color
+   'drracket:profile:low-color
    marshall-color
    unmarshall-color)
   (preferences:set-un/marshall 
-   'drscheme:profile:high-color
+   'drracket:profile:high-color
    marshall-color
    unmarshall-color))
 
-(preferences:set-default 
- 'drscheme:keybindings-window-size
+(drr:set-default 
+ 'drracket:keybindings-window-size
  (cons 400 600)
  (λ (x) (and (pair? x)
              (number? (car x))
              (number? (cdr x)))))
 
-(preferences:set-default
- 'drscheme:execute-warning-once
+(drr:set-default
+ 'drracket:execute-warning-once
  #f
  (λ (x)
    (or (eq? x #t)
        (not x))))
 
-(preferences:set-default 'drscheme:switch-to-module-language-automatically? #t boolean?)
+(drr:set-default 'drracket:switch-to-module-language-automatically? #t boolean?)
 
-(preferences:set-default
- 'drscheme:default-tools-configuration
+(drr:set-default
+ 'drracket:default-tools-configuration
  'load
  (lambda (p)
    (memq p '(load skip))))
 
-(preferences:set-default
- 'drscheme:tools-configuration
+(drr:set-default
+ 'drracket:tools-configuration
  null
  list?)
 
+  (drr:set-default 'drracket:module-overview:label-font-size 12 number?)
+  (drr:set-default 'drracket:module-overview:window-height 500 number?)
+  (drr:set-default 'drracket:module-overview:window-width 500 number?)
+  (drr:set-default 'drracket:module-browser:hide-paths '(lib)
+                           (λ (x)
+                             (and (list? x)
+                                  (andmap symbol? x))))
+  
 
 (drracket:font:setup-preferences)
 (color-prefs:add-background-preferences-panel)
@@ -293,22 +305,22 @@
            (send q set-value (preferences:get pref-sym))))])
   (preferences:add-to-general-checkbox-panel
    (λ (editor-panel)
-     (make-check-box 'drscheme:open-in-tabs 
+     (make-check-box 'drracket:open-in-tabs 
                      (string-constant open-files-in-tabs)
                      editor-panel)
-     (make-check-box 'drscheme:show-interactions-on-execute 
+     (make-check-box 'drracket:show-interactions-on-execute 
                      (string-constant show-interactions-on-execute)
                      editor-panel)
      
-     (make-check-box 'drscheme:switch-to-module-language-automatically?
+     (make-check-box 'drracket:switch-to-module-language-automatically?
                      (string-constant switch-to-module-language-automatically)
                      editor-panel)
      
-     (make-check-box 'drscheme:defs/ints-horizontal
+     (make-check-box 'drracket:defs/ints-horizontal
                      (string-constant interactions-beside-definitions)
                      editor-panel)
      
-     (make-check-box 'drscheme:module-language-first-line-special?
+     (make-check-box 'drracket:module-language-first-line-special?
                      (string-constant ml-always-show-#lang-line)
                      editor-panel)))
   
@@ -335,13 +347,13 @@
                         (λ (sl _) (sl-callback))))]
               [cb-callback
                (λ ()
-                 (preferences:set 'drscheme:repl-buffer-size
+                 (preferences:set 'drracket:repl-buffer-size
                                   (cons (send cb get-value)
-                                        (cdr (preferences:get 'drscheme:repl-buffer-size)))))]
+                                        (cdr (preferences:get 'drracket:repl-buffer-size)))))]
               [sl-callback
                (λ ()
-                 (preferences:set 'drscheme:repl-buffer-size
-                                  (cons (car (preferences:get 'drscheme:repl-buffer-size))
+                 (preferences:set 'drracket:repl-buffer-size
+                                  (cons (car (preferences:get 'drracket:repl-buffer-size))
                                         (send sl get-value))))]
               [update-controls
                (λ (v)
@@ -349,15 +361,15 @@
                    (send sl enable on?)
                    (send cb set-value on?)
                    (send sl set-value (cdr v))))])
-       (preferences:add-callback 'drscheme:repl-buffer-size (λ (p v) (update-controls v)))
-       (update-controls (preferences:get 'drscheme:repl-buffer-size)))))
+       (preferences:add-callback 'drracket:repl-buffer-size (λ (p v) (update-controls v)))
+       (update-controls (preferences:get 'drracket:repl-buffer-size)))))
   
   (preferences:add-to-warnings-checkbox-panel
    (λ (warnings-panel)
-     (make-check-box 'drscheme:execute-warning-once 
+     (make-check-box 'drracket:execute-warning-once 
                      (string-constant only-warn-once)
                      warnings-panel)
-     (make-check-box 'drscheme:test-coverage-ask-about-clearing?
+     (make-check-box 'drracket:test-coverage-ask-about-clearing?
                      (string-constant test-coverage-ask?)
                      warnings-panel))))
 (drracket:debug:add-prefs-panel)
@@ -438,7 +450,7 @@
 
 ;; this default can only be set *after* the
 ;; languages have all be registered by tools
-(preferences:set-default
+(drr:set-default
  drracket:language-configuration:settings-preferences-symbol
  (drracket:language-configuration:get-default-language-settings)
  drracket:language-configuration:language-settings?)
@@ -476,6 +488,61 @@
                   lang
                   (or settings (send lang default-settings)))))))))
 
+  ;; preferences initialization
+  (drr:set-default 'drracket:multi-file-search:recur? #t boolean?)
+  (drr:set-default 'drracket:multi-file-search:filter? #t boolean?)
+  (drr:set-default 'drracket:multi-file-search:filter-string "\\.(ss|scm)$" string?)
+  (drr:set-default 'drracket:multi-file-search:search-string "" string?)
+  (drr:set-default 'drracket:multi-file-search:search-type
+                           1
+                           (λ (x) 
+                             (and (number? x)
+                                  (exact? x)
+                                  (integer? x)
+                                  (<= 0 x)
+                                  (< x (length drracket:multi-file-search:search-types)))))
+  
+  ;; drracket:mult-file-search:search-check-boxes : (listof (listof boolean))
+  (drr:set-default 'drracket:multi-file-search:search-check-boxes 
+                           (map (λ (x) (map cdr (drracket:multi-file-search:search-type-params x)))
+                                drracket:multi-file-search:search-types)
+                           (λ (x) 
+                             (and (list? x)
+                                  (andmap (λ (x)
+                                            (and (list? x)
+                                                 (andmap boolean? x)))
+                                          x))))
+  
+  (drr:set-default 'drracket:multi-file-search:percentages
+                           '(1/3 2/3)
+                           (λ (x) (and (list? x)
+                                       (= 2 (length x))
+                                       (= 1 (apply + x)))))
+  
+  (drr:set-default 'drracket:multi-file-search:frame-size '(300 . 400) 
+                           (λ (x) (and (pair? x)
+                                       (number? (car x))
+                                       (number? (cdr x)))))
+  (drr:set-default 'drracket:multi-file-search:directory 
+                           ;; The default is #f because
+                           ;; filesystem-root-list is expensive under Windows
+                           #f 
+                           (lambda (x) (or (not x) (path? x))))
+  (preferences:set-un/marshall 
+   'drracket:multi-file-search:directory
+   (λ (v) (and v (path->string v)))
+   (λ (p) (if (path-string? p)
+              (string->path p)
+              #f)))
+  
+  (drr:set-default 'drracket:large-letters-font #f (λ (x)
+                                                       (or (and (pair? x)
+                                                                (string? (car x))
+                                                                (let ([i (cdr x)])
+                                                                  (and (integer? i)
+                                                                       (<= 1 i 255))))
+                                                           (not x))))
+
 (let ([drs-handler-recent-items-super%
        (class (drracket:frame:basics-mixin
                (frame:standard-menus-mixin
@@ -504,9 +571,9 @@
               sd)))  
 
 
-(define repl-error-pref 'drscheme:read-eval-print-loop:error-color)
-(define repl-out-pref 'drscheme:read-eval-print-loop:out-color)
-(define repl-value-pref 'drscheme:read-eval-print-loop:value-color)
+(define repl-error-pref 'drracket:read-eval-print-loop:error-color)
+(define repl-out-pref 'drracket:read-eval-print-loop:out-color)
+(define repl-value-pref 'drracket:read-eval-print-loop:value-color)
 (color-prefs:register-color-preference repl-value-pref
                                        "text:ports value"
                                        (make-object color% 0 0 175)
@@ -536,6 +603,7 @@
                                             "text:ports out"
                                             (string-constant repl-out-color))))
 
+
 (let* ([find-frame
         (λ (item)
           (let loop ([item item])
@@ -591,7 +659,7 @@
 
 ;; install user's keybindings
 (for-each drracket:frame:add-keybindings-item 
-          (preferences:get 'drscheme:user-defined-keybindings))
+          (preferences:get 'drracket:user-defined-keybindings))
 
 ;; the initial window doesn't set the 
 ;; unit object's state correctly, yet.
@@ -616,7 +684,7 @@
 ;; NOTE: drscheme-normal.rkt sets current-command-line-arguments to
 ;; the list of files to open, after parsing out flags like -h
 (let* ([files-to-open 
-        (if (preferences:get 'drscheme:open-in-tabs)
+        (if (preferences:get 'drracket:open-in-tabs)
             (vector->list (current-command-line-arguments))
             (reverse (vector->list (current-command-line-arguments))))]
        [normalized/filtered
@@ -639,6 +707,6 @@
              no-dups)])
   (when (null? (filter (λ (x) x) frames))
     (make-basic))
-  (when (and (preferences:get 'drscheme:open-in-tabs)
+  (when (and (preferences:get 'drracket:open-in-tabs)
              (not (null? no-dups)))
     (handler:edit-file (car no-dups))))
diff --git a/collects/drscheme/private/module-browser.rkt b/collects/drscheme/private/module-browser.rkt
index 4e3671e20a..35ec9e7163 100644
--- a/collects/drscheme/private/module-browser.rkt
+++ b/collects/drscheme/private/module-browser.rkt
@@ -36,14 +36,6 @@
   (define open-file-format (string-constant module-browser-open-file-format))
   (define lib-paths-checkbox-constant (string-constant module-browser-show-lib-paths))
   
-  (preferences:set-default 'drscheme:module-overview:label-font-size 12 number?)
-  (preferences:set-default 'drscheme:module-overview:window-height 500 number?)
-  (preferences:set-default 'drscheme:module-overview:window-width 500 number?)
-  (preferences:set-default 'drscheme:module-browser:hide-paths '(lib)
-                           (λ (x)
-                             (and (list? x)
-                                  (andmap symbol? x))))
-  
   (define (set-box/f b v) (when (box? b) (set-box! b v)))
   
   (define (module-overview parent)
@@ -83,7 +75,7 @@
     
     ;; snip-table : hash-table[sym -o> snip]
     (define snip-table (make-hash))
-    (define label-font (find-label-font (preferences:get 'drscheme:module-overview:label-font-size)))
+    (define label-font (find-label-font (preferences:get 'drracket:module-overview:label-font-size)))
     (define text-color (make-object color% "blue"))
     
     (define dark-syntax-pen (send the-pen-list find-or-create-pen "darkorchid" 1 'solid))
@@ -134,7 +126,7 @@
         ;; snip themselves.
         (define dont-move-snips #f)
         
-        (field (label-font-size (preferences:get 'drscheme:module-overview:label-font-size)))
+        (field (label-font-size (preferences:get 'drracket:module-overview:label-font-size)))
         (define/public (get-label-font-size) label-font-size)
         (define/private (get-snip-hspace) (if vertical?
                                               2
@@ -153,7 +145,7 @@
             (queue-callback
              (λ ()
                (set! label-font-size new-font-size)
-               (preferences:set 'drscheme:module-overview:label-font-size 
+               (preferences:set 'drracket:module-overview:label-font-size 
                                 new-font-size)
                (set! label-font (find-label-font label-font-size))
                (begin-edit-sequence)
@@ -314,7 +306,7 @@
             (- (unbox bb)
                (unbox tb))))
         
-        (field [hidden-paths (preferences:get 'drscheme:module-browser:hide-paths)])
+        (field [hidden-paths (preferences:get 'drracket:module-browser:hide-paths)])
         (define/public (remove-visible-paths symbol)
           (unless (memq symbol hidden-paths)
             (set! hidden-paths (cons symbol hidden-paths))
@@ -696,8 +688,8 @@
         (let ()
           (define frame (instantiate overview-frame% ()
                           (label (string-constant module-browser))
-                          (width (preferences:get 'drscheme:module-overview:window-width))
-                          (height (preferences:get 'drscheme:module-overview:window-height))
+                          (width (preferences:get 'drracket:module-overview:window-width))
+                          (height (preferences:get 'drracket:module-overview:window-height))
                           (alignment '(left center))))
           (define vp (instantiate vertical-panel% ()
                        (parent (send frame get-area-container))
@@ -720,7 +712,7 @@
               (label font-size-gauge-label)
               (min-value 1)
               (max-value 72)
-              (init-value (preferences:get 'drscheme:module-overview:label-font-size))
+              (init-value (preferences:get 'drracket:module-overview:label-font-size))
               (parent font/label-panel)
               (callback
                (λ (x y)
@@ -731,7 +723,7 @@
                  (label (string-constant module-browser-name-length))
                  (choices (list (string-constant module-browser-name-long)
                                 (string-constant module-browser-name-very-long)))
-                 (selection (case (preferences:get 'drscheme:module-browser:name-length)
+                 (selection (case (preferences:get 'drracket:module-browser:name-length)
                               [(0) 0]
                               [(1) 0]
                               [(2) 0]
@@ -741,7 +733,7 @@
                     ;; note: the preference drracket:module-browser:name-length is also used for the View|Show Module Browser version of the module browser
                     ;; here we just treat any pref value except '3' as if it were for the long names.
                     (let ([selection (send module-browser-name-length-choice get-selection)])
-                      (preferences:set 'drscheme:module-browser:name-length (+ 2 selection))
+                      (preferences:set 'drracket:module-browser:name-length (+ 2 selection))
                       (send pasteboard set-name-length 
                             (case selection
                               [(0) 'long]
@@ -759,7 +751,7 @@
           
           (define ec (make-object canvas:basic% vp pasteboard))
           
-          (send lib-paths-checkbox set-value (not (memq 'lib (preferences:get 'drscheme:module-browser:hide-paths))))
+          (send lib-paths-checkbox set-value (not (memq 'lib (preferences:get 'drracket:module-browser:hide-paths))))
           (set! update-label
                 (λ (s)
                   (if (and s (not (null? s)))
@@ -772,7 +764,7 @@
                       (send label-message set-label ""))))
           
           (send pasteboard set-name-length 
-                (case (preferences:get 'drscheme:module-browser:name-length)
+                (case (preferences:get 'drracket:module-browser:name-length)
                   [(0) 'long]
                   [(1) 'long]
                   [(2) 'long]
@@ -916,8 +908,8 @@
       (define/override (edit-menu:create-select-all?) #f)
       
       (define/override (on-size w h)
-        (preferences:set 'drscheme:module-overview:window-width w)
-        (preferences:set 'drscheme:module-overview:window-height h)
+        (preferences:set 'drracket:module-overview:window-width w)
+        (preferences:set 'drracket:module-overview:window-height h)
         (super on-size w h))
       (super-instantiate ()))))
 
diff --git a/collects/drscheme/private/multi-file-search.rkt b/collects/drscheme/private/multi-file-search.rkt
index f663de0edd..c8e2919e18 100644
--- a/collects/drscheme/private/multi-file-search.rkt
+++ b/collects/drscheme/private/multi-file-search.rkt
@@ -50,54 +50,6 @@
   ;; search-entry = (make-search-entry string number number number)
   (define-struct search-entry (filename line-string line-number col-number match-length))
   
-  ;; preferences initialization
-  (preferences:set-default 'drscheme:multi-file-search:recur? #t boolean?)
-  (preferences:set-default 'drscheme:multi-file-search:filter? #t boolean?)
-  (preferences:set-default 'drscheme:multi-file-search:filter-string "\\.(ss|scm)$" string?)
-  (preferences:set-default 'drscheme:multi-file-search:search-string "" string?)
-  (preferences:set-default 'drscheme:multi-file-search:search-type
-                           1
-                           (λ (x) 
-                             (and (number? x)
-                                  (exact? x)
-                                  (integer? x)
-                                  (<= 0 x)
-                                  (< x (length search-types)))))
-  
-  ;; drscheme:mult-file-search:search-check-boxes : (listof (listof boolean))
-  (preferences:set-default 'drscheme:multi-file-search:search-check-boxes 
-                           (map (λ (x) (map cdr (search-type-params x)))
-                                search-types)
-                           (λ (x) 
-                             (and (list? x)
-                                  (andmap (λ (x)
-                                            (and (list? x)
-                                                 (andmap boolean? x)))
-                                          x))))
-  
-  (preferences:set-default 'drscheme:multi-file-search:percentages
-                           '(1/3 2/3)
-                           (λ (x) (and (list? x)
-                                       (= 2 (length x))
-                                       (= 1 (apply + x)))))
-  
-  (preferences:set-default 'drscheme:multi-file-search:frame-size '(300 . 400) 
-                           (λ (x) (and (pair? x)
-                                       (number? (car x))
-                                       (number? (cdr x)))))
-  (preferences:set-default 'drscheme:multi-file-search:directory 
-                           ;; The default is #f because
-                           ;; filesystem-root-list is expensive under Windows
-                           #f 
-                           (lambda (x) (or (not x) (path? x))))
-  (preferences:set-un/marshall 
-   'drscheme:multi-file-search:directory
-   (λ (v) (and v (path->string v)))
-   (λ (p) (if (path-string? p)
-              (string->path p)
-              #f)))
-  
-  
   ;; open-search-window : search-info -> void
   ;; thread: eventspace main thread
   ;; opens a window and creates the thread that does the search
@@ -142,7 +94,7 @@
     (send frame set-text-to-search results-text) ;; just to initialize it to something.
     (send results-text lock #t)
     (send frame reflow-container)
-    (send panel set-percentages (preferences:get 'drscheme:multi-file-search:percentages))
+    (send panel set-percentages (preferences:get 'drracket:multi-file-search:percentages))
     (send button-panel set-alignment 'right 'center)
     (send button-panel stretchable-height #f)
     (send frame show #t)
@@ -356,9 +308,9 @@
              frame:standard-menus%))
       (init-field name)
       (define/override (on-size w h)
-        (preferences:set 'drscheme:multi-file-search:frame-size (cons w h))
+        (preferences:set 'drracket:multi-file-search:frame-size (cons w h))
         (super on-size w h))
-      (let ([size (preferences:get 'drscheme:multi-file-search:frame-size)])
+      (let ([size (preferences:get 'drracket:multi-file-search:frame-size)])
         (super-instantiate ()
           (label name)
           (width (car size))
@@ -374,7 +326,7 @@
       (define/augment (after-percentage-change)
         (let ([ps (get-percentages)])
           (when (= (length ps) 2)
-            (preferences:set 'drscheme:multi-file-search:percentages ps)))
+            (preferences:set 'drracket:multi-file-search:percentages ps)))
         (inner (void) after-percentage-change))
       (super-instantiate ())))
   
@@ -417,7 +369,7 @@
                                 (λ (x y) (search-text-field-callback))))
     (define active-method-panel (make-object panel:single% method-panel))
     (define methods-check-boxess
-      (let ([pref (preferences:get 'drscheme:multi-file-search:search-check-boxes)])
+      (let ([pref (preferences:get 'drracket:multi-file-search:search-check-boxes)])
         (map
          (λ (search-type prefs-settings)
            (let ([p (make-object vertical-panel% active-method-panel)]
@@ -489,7 +441,7 @@
     
     (define (method-callback chk)
       (preferences:set
-       'drscheme:multi-file-search:search-check-boxes
+       'drracket:multi-file-search:search-check-boxes
        (let loop ([methods-check-boxess methods-check-boxess])
          (cond
            [(null? methods-check-boxess) null]
@@ -504,28 +456,28 @@
     (define (dir-field-callback)
       (let ([df (send dir-field get-value)])
         (when (path-string? df)
-          (preferences:set 'drscheme:multi-file-search:directory (string->path df)))))
+          (preferences:set 'drracket:multi-file-search:directory (string->path df)))))
     
     (define (filter-check-box-callback) 
-      (preferences:set 'drscheme:multi-file-search:filter? (send filter-check-box get-value))
+      (preferences:set 'drracket:multi-file-search:filter? (send filter-check-box get-value))
       (send filter-text-field enable (send filter-check-box get-value)))
     (define (filter-text-field-callback)
-      (preferences:set 'drscheme:multi-file-search:filter-string (send filter-text-field get-value)))
+      (preferences:set 'drracket:multi-file-search:filter-string (send filter-text-field get-value)))
     
     (define (recur-check-box-callback)
-      (preferences:set 'drscheme:multi-file-search:recur? (send recur-check-box get-value)))
+      (preferences:set 'drracket:multi-file-search:recur? (send recur-check-box get-value)))
     (define (methods-choice-callback)
-      (preferences:set 'drscheme:multi-file-search:search-type (send methods-choice get-selection)) 
+      (preferences:set 'drracket:multi-file-search:search-type (send methods-choice get-selection)) 
       (send active-method-panel active-child
             (list-ref (send active-method-panel get-children)
                       (send methods-choice get-selection))))
     (define (search-text-field-callback)
-      (preferences:set 'drscheme:multi-file-search:search-string (send search-text-field get-value)))
+      (preferences:set 'drracket:multi-file-search:search-string (send search-text-field get-value)))
     (define (dir-button-callback) 
       (let ([d (get-directory)])
         (when (and d
                    (directory-exists? d))
-          (preferences:set 'drscheme:multi-file-search:directory d)
+          (preferences:set 'drracket:multi-file-search:directory d)
           (send dir-field set-value (path->string d)))))
     
     (define (get-files)
@@ -545,15 +497,15 @@
     (send files-inset-panel stretchable-width #f)
     (send files-panel set-alignment 'left 'center)
     
-    (send recur-check-box set-value (preferences:get 'drscheme:multi-file-search:recur?))
-    (send filter-check-box set-value (preferences:get 'drscheme:multi-file-search:filter?))
-    (send search-text-field set-value (preferences:get 'drscheme:multi-file-search:search-string))
-    (send filter-text-field set-value (preferences:get 'drscheme:multi-file-search:filter-string))
+    (send recur-check-box set-value (preferences:get 'drracket:multi-file-search:recur?))
+    (send filter-check-box set-value (preferences:get 'drracket:multi-file-search:filter?))
+    (send search-text-field set-value (preferences:get 'drracket:multi-file-search:search-string))
+    (send filter-text-field set-value (preferences:get 'drracket:multi-file-search:filter-string))
     (send dir-field set-value (path->string 
-                               (let ([p (preferences:get 'drscheme:multi-file-search:directory)])
+                               (let ([p (preferences:get 'drracket:multi-file-search:directory)])
                                  (if (not p)
                                      (let ([p (car (filesystem-root-list))])
-                                       (preferences:set 'drscheme:multi-file-search:directory p)
+                                       (preferences:set 'drracket:multi-file-search:directory p)
                                        p)
                                      p))))
     
diff --git a/collects/drscheme/private/rep.rkt b/collects/drscheme/private/rep.rkt
index 03b67ac3fd..478cd0b446 100644
--- a/collects/drscheme/private/rep.rkt
+++ b/collects/drscheme/private/rep.rkt
@@ -449,7 +449,7 @@ TODO
          [list-of-snip/strings? (list-of? snip/string?)]
          [list-of-lists-of-snip/strings? (list-of? list-of-snip/strings?)])
     (preferences:set-default
-     'drscheme:console-previous-exprs
+     'drracket:console-previous-exprs
      null
      list-of-lists-of-snip/strings?))
   (let ([marshall 
@@ -469,7 +469,7 @@ TODO
                 lls))]
         [unmarshall (λ (x) x)])
     (preferences:set-un/marshall
-     'drscheme:console-previous-exprs
+     'drracket:console-previous-exprs
      marshall unmarshall))
   
   (define color? ((get-display-depth) . > . 8))
@@ -856,7 +856,7 @@ TODO
           (let* ([start (get-repl-header-end)]
                  [end (get-insertion-point)]
                  [space (- end start)]
-                 [pref (preferences:get 'drscheme:repl-buffer-size)])
+                 [pref (preferences:get 'drracket:repl-buffer-size)])
             (when (car pref)
               (let ([max-space (* 1000 (cdr pref))])
                 (when (space . > . max-space)
@@ -891,7 +891,7 @@ TODO
              (memory-killed-cust-box #f)
              (user-custodian #f)
              (custodian-limit (and (custodian-memory-accounting-available?)
-                                   (preferences:get 'drscheme:child-only-memory-limit)))
+                                   (preferences:get 'drracket:child-only-memory-limit)))
              (user-eventspace-box (make-weak-box #f))
              (user-namespace-box (make-weak-box #f))
              (user-eventspace-main-thread #f)
@@ -975,7 +975,7 @@ TODO
                      )])
           (when (equal? ans 3)
             (set-custodian-limit new-limit)
-            (preferences:set 'drscheme:child-only-memory-limit new-limit))
+            (preferences:set 'drracket:child-only-memory-limit new-limit))
           (set-insertion-point (last-position))
           (insert-warning "\nInteractions disabled")))
       
@@ -1437,10 +1437,10 @@ TODO
       
       (define/augment (on-close)
         (shutdown)
-        (preferences:set 'drscheme:console-previous-exprs 
+        (preferences:set 'drracket:console-previous-exprs 
                          (trim-previous-exprs
                           (append 
-                           (preferences:get 'drscheme:console-previous-exprs)
+                           (preferences:get 'drracket:console-previous-exprs)
                            local-previous-exprs)))
         (inner (void) on-close))
       
@@ -1739,7 +1739,7 @@ TODO
             (copy-previous-expr))))
       
       ;; private fields
-      (define global-previous-exprs (preferences:get 'drscheme:console-previous-exprs))
+      (define global-previous-exprs (preferences:get 'drracket:console-previous-exprs))
       (define local-previous-exprs null)
       (define/private (get-previous-exprs)
         (append global-previous-exprs local-previous-exprs))
diff --git a/collects/drscheme/private/tools.rkt b/collects/drscheme/private/tools.rkt
index 0b734f42be..340441e47f 100644
--- a/collects/drscheme/private/tools.rkt
+++ b/collects/drscheme/private/tools.rkt
@@ -176,12 +176,12 @@ string-constants)
 
 ;; default-tool-configuration : installed-tool -> (union 'load 'skip)
 (define (default-tool-configuration it)
-  (preferences:get 'drscheme:default-tools-configuration))
+  (preferences:get 'drracket:default-tools-configuration))
 
 (define toolspref
   (case-lambda
-    [() (preferences:get 'drscheme:tools-configuration)]
-    [(v) (preferences:set 'drscheme:tools-configuration v)]))
+    [() (preferences:get 'drracket:tools-configuration)]
+    [(v) (preferences:set 'drracket:tools-configuration v)]))
 
 (define (installed-tool->key it)
   (list (directory-record-spec (installed-tool-dir it))
diff --git a/collects/drscheme/private/unit.rkt b/collects/drscheme/private/unit.rkt
index efe6d32ce8..b491403c93 100644
--- a/collects/drscheme/private/unit.rkt
+++ b/collects/drscheme/private/unit.rkt
@@ -385,11 +385,11 @@ module browser threading seems wrong.
                 (apply super-make-object args))]
              [get-program-editor-mixin
               (λ ()
-                (drracket:tools:only-in-phase 'drscheme:unit:get-program-editor-mixin 'phase2 'init-complete)
+                (drracket:tools:only-in-phase 'drracket:unit:get-program-editor-mixin 'phase2 'init-complete)
                 program-editor-mixin)]
              [add-to-program-editor-mixin
               (λ (mixin)
-                (drracket:tools:only-in-phase 'drscheme:unit:add-to-program-editor-mixin 'phase1)
+                (drracket:tools:only-in-phase 'drracket:unit:add-to-program-editor-mixin 'phase1)
                 (let ([old program-editor-mixin])
                   (set! program-editor-mixin (λ (x) (mixin (old x))))))])
         (values get-program-editor-mixin
@@ -641,12 +641,12 @@ module browser threading seems wrong.
             (let ([lang (drracket:language-configuration:language-settings-language next-settings)]
                   [sets (drracket:language-configuration:language-settings-settings next-settings)])
               (preferences:set
-               'drscheme:recent-language-names
+               'drracket:recent-language-names
                (limit-length
                 (remove-duplicate-languages
                  (cons (cons (send lang get-language-name)
                              (send lang marshall-settings sets))
-                       (preferences:get 'drscheme:recent-language-names)))
+                       (preferences:get 'drracket:recent-language-names)))
                 10)))
             
             (when update-prefs?
@@ -700,7 +700,7 @@ module browser threading seems wrong.
             (inner (void) after-delete x y))
           
           (define/override (is-special-first-line? l) 
-            (and (preferences:get 'drscheme:module-language-first-line-special?)
+            (and (preferences:get 'drracket:module-language-first-line-special?)
                  (is-lang-line? l)))
           
           (inherit get-filename)
@@ -849,7 +849,7 @@ module browser threading seems wrong.
     
     (define (get-module-language/settings)
       (let* ([module-language
-              (and (preferences:get 'drscheme:switch-to-module-language-automatically?)
+              (and (preferences:get 'drracket:switch-to-module-language-automatically?)
                    (ormap 
                     (λ (lang)
                       (and (is-a? lang drracket:module-language:module-language<%>)
@@ -953,13 +953,13 @@ module browser threading seems wrong.
         (unless (is-a? frame -frame<%>)
           (error 'func-defs-canvas "frame is not a drracket:unit:frame<%>"))
         
-        (define sort-by-name? (preferences:get 'drscheme:defns-popup-sort-by-name?))
+        (define sort-by-name? (preferences:get 'drracket:defns-popup-sort-by-name?))
         (define sorting-name (if sort-by-name?
                                  (string-constant sort-by-position) 
                                  (string-constant sort-by-name)))
         (define/private (change-sorting-order)
           (set! sort-by-name? (not sort-by-name?))
-          (preferences:set 'drscheme:defns-popup-sort-by-name? sort-by-name?)
+          (preferences:set 'drracket:defns-popup-sort-by-name? sort-by-name?)
           (set! sorting-name (if sort-by-name?
                                  (string-constant sort-by-position) 
                                  (string-constant sort-by-name))))
@@ -1178,7 +1178,7 @@ module browser threading seems wrong.
                           (length (send unit-frame get-definitions-canvases))
                           (length (send unit-frame get-interactions-canvases)))
                        (= 2 (length percentages)))
-              (preferences:set 'drscheme:unit-window-size-percentage (car percentages))))
+              (preferences:set 'drracket:unit-window-size-percentage (car percentages))))
           (inner (void) after-percentage-change))
         (super-new)))
     
@@ -1494,7 +1494,7 @@ module browser threading seems wrong.
         (define logger-menu-item #f)
 
         (define/public-final (show/hide-log show?)
-          (let ([p (preferences:get 'drscheme:logging-size-percentage)])
+          (let ([p (preferences:get 'drracket:logging-size-percentage)])
             (begin-container-sequence)
             (cond
               [logger-gui-tab-panel
@@ -1528,9 +1528,9 @@ module browser threading seems wrong.
                             [parent logger-panel]
                             [callback
                              (λ (tp evt)
-                               (preferences:set 'drscheme:logger-gui-tab-panel-level (send logger-gui-tab-panel get-selection))
+                               (preferences:set 'drracket:logger-gui-tab-panel-level (send logger-gui-tab-panel get-selection))
                                (update-logger-window #f))]))
-                 (send logger-gui-tab-panel set-selection (preferences:get 'drscheme:logger-gui-tab-panel-level))
+                 (send logger-gui-tab-panel set-selection (preferences:get 'drracket:logger-gui-tab-panel-level))
                  (new-logger-text)
                  (set! logger-gui-canvas 
                        (new editor-canvas% [parent logger-gui-tab-panel] [editor logger-gui-text]))
@@ -1778,12 +1778,12 @@ module browser threading seems wrong.
                        #t)])))))
         
         (define/override (make-root-area-container cls parent)
-          (let* ([saved-p (preferences:get 'drscheme:module-browser-size-percentage)]
-                 [saved-p2 (preferences:get 'drscheme:logging-size-percentage)]
+          (let* ([saved-p (preferences:get 'drracket:module-browser-size-percentage)]
+                 [saved-p2 (preferences:get 'drracket:logging-size-percentage)]
                  [_module-browser-parent-panel
                   (super make-root-area-container 
                          (make-two-way-prefs-dragable-panel% panel:horizontal-dragable%
-                                                             'drscheme:module-browser-size-percentage)
+                                                             'drracket:module-browser-size-percentage)
                          parent)]
                  [_module-browser-panel (new vertical-panel%
                                              (parent _module-browser-parent-panel)
@@ -1792,7 +1792,7 @@ module browser threading seems wrong.
                  [planet-status-outer-panel (new vertical-panel% [parent _module-browser-parent-panel])]
                  [execute-warning-outer-panel (new vertical-panel% [parent planet-status-outer-panel])]
                  [logger-outer-panel (new (make-two-way-prefs-dragable-panel% panel:vertical-dragable%
-                                                                              'drscheme:logging-size-percentage)
+                                                                              'drracket:logging-size-percentage)
                                           [parent execute-warning-outer-panel])]
                  [trans-outer-panel (new vertical-panel% [parent logger-outer-panel])]
                  [root (make-object cls trans-outer-panel)])
@@ -1821,13 +1821,13 @@ module browser threading seems wrong.
             (send planet-status-parent-panel change-children (λ (l) (remq planet-status-panel l)))
             (unless (toolbar-shown?)
               (send transcript-parent-panel change-children (λ (l) '())))
-            (preferences:set 'drscheme:module-browser-size-percentage saved-p)
-            (preferences:set 'drscheme:logging-size-percentage saved-p2)
+            (preferences:set 'drracket:module-browser-size-percentage saved-p)
+            (preferences:set 'drracket:logging-size-percentage saved-p2)
             
             root))
         
         (inherit show-info hide-info is-info-hidden?)
-        (field [toolbar-state (preferences:get 'drscheme:toolbar-state)]
+        (field [toolbar-state (preferences:get 'drracket:toolbar-state)]
                [toolbar-top-menu-item #f]
                [toolbar-left-menu-item #f]
                [toolbar-right-menu-item #f]
@@ -1839,7 +1839,7 @@ module browser threading seems wrong.
         
         (define/private (change-toolbar-state new-state)
           (set! toolbar-state new-state)
-          (preferences:set 'drscheme:toolbar-state new-state)
+          (preferences:set 'drracket:toolbar-state new-state)
           (update-toolbar-visibility))
         
         (define/override (on-toolbar-button-click) (change-toolbar-state (cons (not (car toolbar-state)) (cdr toolbar-state))))
@@ -1870,18 +1870,18 @@ module browser threading seems wrong.
           (update-defs/ints-resize-corner))
         
         (define/private (toolbar-is-hidden?)
-          (car (preferences:get 'drscheme:toolbar-state)))
+          (car (preferences:get 'drracket:toolbar-state)))
         (define/private (toolbar-is-top?)
           (and (not (toolbar-is-hidden?))
-               (eq? (cdr (preferences:get 'drscheme:toolbar-state))
+               (eq? (cdr (preferences:get 'drracket:toolbar-state))
                     'top)))
         (define/private (toolbar-is-right?)
           (and (not (toolbar-is-hidden?))
-               (eq? (cdr (preferences:get 'drscheme:toolbar-state))
+               (eq? (cdr (preferences:get 'drracket:toolbar-state))
                     'right)))
         (define/private (toolbar-is-left?)
           (and (not (toolbar-is-hidden?))
-               (eq? (cdr (preferences:get 'drscheme:toolbar-state))
+               (eq? (cdr (preferences:get 'drracket:toolbar-state))
                     'left)))
 
         (define/private (orient/show bar-at-beginning?)
@@ -2587,7 +2587,7 @@ module browser threading seems wrong.
                   (list interactions-canvases
                         definitions-canvases))]
                 [old-children (send resizable-panel get-children)]
-                [p (preferences:get 'drscheme:unit-window-size-percentage)])
+                [p (preferences:get 'drracket:unit-window-size-percentage)])
             (update-defs/ints-resize-corner)
             (send definitions-item set-label 
                   (if definitions-shown?
@@ -2602,7 +2602,7 @@ module browser threading seems wrong.
             ;; this might change the unit-window-size-percentage, so save/restore it
             (send resizable-panel change-children (λ (l) new-children))
             
-            (preferences:set 'drscheme:unit-window-size-percentage p)
+            (preferences:set 'drracket:unit-window-size-percentage p)
             ;; restore preferred interactions/definitions sizes
             (when (and (= 1 (length definitions-canvases))
                        (= 1 (length interactions-canvases))
@@ -2696,7 +2696,7 @@ module browser threading seems wrong.
                              module-language-settings)))))))
             
             (check-if-save-file-up-to-date)
-            (when (preferences:get 'drscheme:show-interactions-on-execute)
+            (when (preferences:get 'drracket:show-interactions-on-execute)
               (ensure-rep-shown interactions-text))
             (when transcript
               (record-definitions)
@@ -2747,9 +2747,9 @@ module browser threading seems wrong.
         (inherit is-maximized?)
         (define/override (on-size w h)
           (unless (is-maximized?)
-            (preferences:set 'drscheme:unit-window-width w)
-            (preferences:set 'drscheme:unit-window-height h))
-          (preferences:set 'drscheme:unit-window-max? (is-maximized?))
+            (preferences:set 'drracket:unit-window-width w)
+            (preferences:set 'drracket:unit-window-height h))
+          (preferences:set 'drracket:unit-window-max? (is-maximized?))
           (super on-size w h))
         
         (define on-move-timer-args #f)
@@ -2766,7 +2766,7 @@ module browser threading seems wrong.
                          (λ () 
                            (set! on-move-timer #f)
                            (set! on-move-timer-args #f)
-                           (preferences:set 'drscheme:frame:initial-position on-move-timer-args))]
+                           (preferences:set 'drracket:frame:initial-position on-move-timer-args))]
                         [interval 1000]
                         [just-once? #t]))]))
         
@@ -3272,13 +3272,13 @@ module browser threading seems wrong.
                       (if (send cb get-value)
                           (send module-browser-pb show-visible-paths key)
                           (send module-browser-pb remove-visible-paths key))
-                      (preferences:set 'drscheme:module-browser:hide-paths (send module-browser-pb get-hidden-paths)))]
+                      (preferences:set 'drracket:module-browser:hide-paths (send module-browser-pb get-hidden-paths)))]
                    [mk-checkbox
                     (λ (key label)
                       (new check-box%
                            (parent module-browser-panel)
                            (label label)
-                           (value (not (memq key (preferences:get 'drscheme:module-browser:hide-paths))))
+                           (value (not (memq key (preferences:get 'drracket:module-browser:hide-paths))))
                            (callback 
                             (λ (cb _) 
                               (show-callback cb key)))))])
@@ -3293,14 +3293,14 @@ module browser threading seems wrong.
                                       (string-constant module-browser-name-medium)
                                       (string-constant module-browser-name-long)
                                       (string-constant module-browser-name-very-long)))
-                       (selection (preferences:get 'drscheme:module-browser:name-length))
+                       (selection (preferences:get 'drracket:module-browser:name-length))
                        (callback
                         (λ (x y)
                           (let ([selection (send module-browser-name-length-choice get-selection)])
-                            (preferences:set 'drscheme:module-browser:name-length selection)
+                            (preferences:set 'drracket:module-browser:name-length selection)
                             (update-module-browser-name-length selection))))))
             (update-module-browser-name-length 
-             (preferences:get 'drscheme:module-browser:name-length))
+             (preferences:get 'drracket:module-browser:name-length))
             
             (set! module-browser-button 
                   (new button%
@@ -3309,7 +3309,7 @@ module browser threading seems wrong.
                        (callback (λ (x y) (update-module-browser-pane)))
                        (stretchable-width #t))))
           
-          (let ([p (preferences:get 'drscheme:module-browser-size-percentage)])
+          (let ([p (preferences:get 'drracket:module-browser-size-percentage)])
             (send module-browser-parent-panel change-children
                   (λ (l)
                     (cons module-browser-panel
@@ -3712,10 +3712,10 @@ module browser threading seems wrong.
                         (when num
                           (cond
                             [(eq? num #t)
-                             (preferences:set 'drscheme:child-only-memory-limit #f)
+                             (preferences:set 'drracket:child-only-memory-limit #f)
                              (send interactions-text set-custodian-limit #f)]
                             [else
-                             (preferences:set 'drscheme:child-only-memory-limit 
+                             (preferences:set 'drracket:child-only-memory-limit 
                                               (* 1024 1024 num))
                              (send interactions-text set-custodian-limit
                                    (* 1024 1024 num))]))))]))
@@ -3936,10 +3936,10 @@ module browser threading seems wrong.
         (super-new
          (filename filename)
          (style '(toolbar-button))
-         (width (preferences:get 'drscheme:unit-window-width))
-         (height (preferences:get 'drscheme:unit-window-height)))
+         (width (preferences:get 'drracket:unit-window-width))
+         (height (preferences:get 'drracket:unit-window-height)))
         (inherit maximize)
-        (when (preferences:get 'drscheme:unit-window-max?)
+        (when (preferences:get 'drracket:unit-window-max?)
           (maximize #t))
         
         (initialize-menus)
@@ -3989,7 +3989,7 @@ module browser threading seems wrong.
                                             (let ([sel (send tabs-panel get-selection)])
                                               (when sel
                                                 (change-to-nth-tab sel)))))))
-        [define resizable-panel (new (if (preferences:get 'drscheme:defs/ints-horizontal)
+        [define resizable-panel (new (if (preferences:get 'drracket:defs/ints-horizontal)
                                          horizontal-dragable/def-int%
                                          vertical-dragable/def-int%)
                                      (unit-frame this)
@@ -4062,10 +4062,10 @@ module browser threading seems wrong.
           (if (null? v)
               (send bug-icon show #f)
               (send bug-icon show #t)))
-        (set-bug-label (preferences:get 'drscheme:saved-bug-reports))
+        (set-bug-label (preferences:get 'drracket:saved-bug-reports))
         (define remove-bug-icon-callback
           (preferences:add-callback
-           'drscheme:saved-bug-reports
+           'drracket:saved-bug-reports
            (λ (p v)
              (set-bug-label v))))
         
@@ -4133,7 +4133,7 @@ module browser threading seems wrong.
         
         (when (= 2 (length (send resizable-panel get-children)))
           (send resizable-panel set-percentages
-                (let ([p (preferences:get 'drscheme:unit-window-size-percentage)])
+                (let ([p (preferences:get 'drracket:unit-window-size-percentage)])
                   (list p (- 1 p)))))
         
         (set-label-prefix (string-constant drscheme))
@@ -4442,7 +4442,7 @@ module browser threading seems wrong.
                                      (drracket:language-configuration:make-language-settings
                                       lang
                                       settings)))]))))))
-             (preferences:get 'drscheme:recent-language-names))
+             (preferences:get 'drracket:recent-language-names))
             (unless added-one?
               (send (new menu-item% 
                          [label (string-append
@@ -4493,9 +4493,9 @@ module browser threading seems wrong.
     ;; record-saved-bug-report : (listof (cons symbol string)) -> void
     ;; =Kernel= =Handler=
     (define (record-saved-bug-report table)
-      (let ([recorded (preferences:get 'drscheme:saved-bug-reports)])
+      (let ([recorded (preferences:get 'drracket:saved-bug-reports)])
         (unless (member table recorded)
-          (preferences:set 'drscheme:saved-bug-reports (shorten-to (cons table recorded) 15)))))
+          (preferences:set 'drracket:saved-bug-reports (shorten-to (cons table recorded) 15)))))
     
     ;; shorten-to : (listof X) number -> (listof X)
     ;; drops items from the end of the list to bring it back down to `n' items
@@ -4528,12 +4528,12 @@ module browser threading seems wrong.
                                   [callback 
                                    (λ (_1 _2)
                                      (send saved-bug-reports-window show #f)
-                                     (preferences:set 'drscheme:saved-bug-reports '()))]
+                                     (preferences:set 'drracket:saved-bug-reports '()))]
                                   [parent hp]))
           (void))))
     
     (preferences:add-callback
-     'drscheme:saved-bug-reports
+     'drracket:saved-bug-reports
      (λ (p v)
        (when saved-bug-reports-window
          (when (send saved-bug-reports-window is-shown?)
@@ -4600,12 +4600,12 @@ module browser threading seems wrong.
       (send saved-bug-reports-window end-container-sequence))
     
     (define (forget-saved-bug-report item)
-      (preferences:set 'drscheme:saved-bug-reports (remove item (preferences:get 'drscheme:saved-bug-reports))))
+      (preferences:set 'drracket:saved-bug-reports (remove item (preferences:get 'drracket:saved-bug-reports))))
     
     (define (show-saved-bug-reports-window)
       (init-saved-bug-reports-window)
       (unless (send saved-bug-reports-window is-shown?)
-        (refresh-saved-bug-reports-window (preferences:get 'drscheme:saved-bug-reports)))
+        (refresh-saved-bug-reports-window (preferences:get 'drracket:saved-bug-reports)))
       (send saved-bug-reports-window show #t))
     
     
@@ -4686,7 +4686,7 @@ module browser threading seems wrong.
             (begin0 newest-frame
                     (set! newest-frame #f))]
            [(and name ;; only open a tab if we have a filename
-                 (preferences:get 'drscheme:open-in-tabs))
+                 (preferences:get 'drracket:open-in-tabs))
             (let ([fr (let loop ([frs (cons (send (group:get-the-frame-group) get-active-frame)
                                             (send (group:get-the-frame-group) get-frames))])
                         (cond
@@ -4709,7 +4709,7 @@ module browser threading seems wrong.
              [frame (new drs-frame% (filename filename))])
         (send (send frame get-interactions-text) initialize-console)
         (when first-frame?
-          (let ([pos (preferences:get 'drscheme:frame:initial-position)])
+          (let ([pos (preferences:get 'drracket:frame:initial-position)])
             (when pos
               (send frame move (car pos) (cdr pos)))))
         (send frame update-toolbar-visibility)
diff --git a/collects/drscheme/syncheck.rkt b/collects/drscheme/syncheck.rkt
index 8349f3cd7c..51dccd30a8 100644
--- a/collects/drscheme/syncheck.rkt
+++ b/collects/drscheme/syncheck.rkt
@@ -99,7 +99,7 @@ If the namespace does not, they are colored the unbound color.
               (bitmap syncheck-bitmap)
               (parent parent)
               (callback (λ (button) (send frame syncheck:button-callback)))))
-       'drscheme:syncheck)
+       'drracket:syncheck)
       (drracket:unit:add-to-program-editor-mixin clearing-text-mixin))
     (define (phase2) (void))
     
@@ -382,7 +382,7 @@ If the namespace does not, they are colored the unbound color.
               (set! cleanup-texts '())
               (let ([f (get-top-level-window)])
                 (when f
-                  (send f open-status-line 'drscheme:check-syntax:mouse-over))))
+                  (send f open-status-line 'drracket:check-syntax:mouse-over))))
             
             ;; syncheck:clear-arrows : -> void
             (define/public (syncheck:clear-arrows)
@@ -409,7 +409,7 @@ If the namespace does not, they are colored the unbound color.
                   (update-docs-background #f)
                   (let ([f (get-top-level-window)])
                     (when f
-                      (send f close-status-line 'drscheme:check-syntax:mouse-over))))))
+                      (send f close-status-line 'drracket:check-syntax:mouse-over))))))
             
             ;; syncheck:add-to-cleanup-texts : (is-a?/c text%) -> void
             (define/public (syncheck:add-to-cleanup-texts txt)
@@ -659,7 +659,7 @@ If the namespace does not, they are colored the unbound color.
                        (set! cursor-eles #f)
                        (let ([f (get-top-level-window)])
                          (when f
-                           (send f update-status-line 'drscheme:check-syntax:mouse-over #f)))
+                           (send f update-status-line 'drracket:check-syntax:mouse-over #f)))
                        (invalidate-bitmap-cache))
                      (super on-event event)]
                     [(or (send event moving?)
@@ -690,7 +690,7 @@ If the namespace does not, they are colored the unbound color.
                           (update-docs-background #f)
                           (let ([f (get-top-level-window)])
                             (when f
-                              (send f update-status-line 'drscheme:check-syntax:mouse-over #f)))
+                              (send f update-status-line 'drracket:check-syntax:mouse-over #f)))
                           (when (or cursor-location cursor-text)
                             (set! cursor-location #f)
                             (set! cursor-text #f)
@@ -785,13 +785,13 @@ If the namespace does not, they are colored the unbound color.
                                (let ([f (get-top-level-window)])
                                  (when f
                                    (send f update-status-line 
-                                         'drscheme:check-syntax:mouse-over 
+                                         'drracket:check-syntax:mouse-over 
                                          ele)))]))
                           eles)
                 (unless has-txt?
                   (let ([f (get-top-level-window)])
                     (when f
-                      (send f update-status-line 'drscheme:check-syntax:mouse-over #f))))))
+                      (send f update-status-line 'drracket:check-syntax:mouse-over #f))))))
             
             (define current-colored-region #f)
             ;; update-docs-background : (or/c false/c (listof any)) -> void
@@ -1037,7 +1037,7 @@ If the namespace does not, they are colored the unbound color.
         (define/public (update-button-visibility/settings settings)
           (let* ([lang (drracket:language-configuration:language-settings-language settings)]
                  [visible? (and (not (is-a? lang drracket:module-language:module-language<%>))
-                                (send lang capability-value 'drscheme:check-syntax-button))])
+                                (send lang capability-value 'drracket:check-syntax-button))])
             (send check-syntax-button-parent-panel change-children
                   (λ (l)
                     (if visible?
@@ -1118,8 +1118,8 @@ If the namespace does not, they are colored the unbound color.
             [() (syncheck:button-callback #f)]
             [(jump-to-id)
              (when (send check-syntax-button is-enabled?)
-               (open-status-line 'drscheme:check-syntax)
-               (update-status-line 'drscheme:check-syntax status-init)
+               (open-status-line 'drracket:check-syntax)
+               (update-status-line 'drracket:check-syntax status-init)
                (ensure-rep-hidden)
                (let-values ([(expanded-expression expansion-completed) (make-traversal)])
                  (let* ([definitions-text (get-definitions-text)]
@@ -1143,7 +1143,7 @@ If the namespace does not, they are colored the unbound color.
                                (send the-tab set-breakables old-break-thread old-custodian)
                                (send the-tab enable-evaluation)
                                (send definitions-text end-edit-sequence)
-                               (close-status-line 'drscheme:check-syntax)
+                               (close-status-line 'drracket:check-syntax)
                                
                                ;; do this with some lag ... not great, but should be okay.
                                (thread
@@ -1186,7 +1186,7 @@ If the namespace does not, they are colored the unbound color.
                                      (λ () ;; =drs=
                                        
                                        ;; a call like this one also happens in 
-                                       ;; drscheme:debug:error-display-handler/stacktrace
+                                       ;; drracket:debug:error-display-handler/stacktrace
                                        ;; but that call won't happen here, because
                                        ;; the rep is not in the current-rep parameter
                                        (send interactions-text highlight-errors/exn exn)
@@ -1207,7 +1207,7 @@ If the namespace does not, they are colored the unbound color.
                                   (λ (exn)
                                     (uncaught-exception-raised)
                                     (oh exn))))
-                               (update-status-line 'drscheme:check-syntax status-expanding-expression)
+                               (update-status-line 'drracket:check-syntax status-expanding-expression)
                                (set! user-custodian (current-custodian))
                                (set! user-directory (current-directory)) ;; set by set-directory above
                                (set! user-namespace (current-namespace)))])
@@ -1242,7 +1242,7 @@ If the namespace does not, they are colored the unbound color.
                                      (cleanup)
                                      (custodian-shutdown-all user-custodian))))]
                                [else
-                                (update-status-line 'drscheme:check-syntax status-eval-compile-time)
+                                (update-status-line 'drracket:check-syntax status-eval-compile-time)
                                 (eval-compile-time-part-of-top-level sexp)
                                 (parameterize ([current-eventspace drs-eventspace])
                                   (queue-callback
@@ -1250,12 +1250,12 @@ If the namespace does not, they are colored the unbound color.
                                      (with-lock/edit-sequence
                                       definitions-text
                                       (λ ()
-                                        (open-status-line 'drscheme:check-syntax)
-                                        (update-status-line 'drscheme:check-syntax status-coloring-program)
+                                        (open-status-line 'drracket:check-syntax)
+                                        (update-status-line 'drracket:check-syntax status-coloring-program)
                                         (parameterize ([currently-processing-definitions-text definitions-text])
                                           (expanded-expression user-namespace user-directory sexp jump-to-id))
-                                        (close-status-line 'drscheme:check-syntax))))))
-                                (update-status-line 'drscheme:check-syntax status-expanding-expression)
+                                        (close-status-line 'drracket:check-syntax))))))
+                                (update-status-line 'drracket:check-syntax status-expanding-expression)
                                 (loop)]))))))))))]))
         
         ;; set-directory : text -> void
@@ -1344,9 +1344,9 @@ If the namespace does not, they are colored the unbound color.
       (send keymap map-function "c:x;n" "jump to next bound occurrence")
       (send keymap map-function "c:x;d" "jump to definition (in other file)"))
     
-    (define lexically-bound-variable-style-pref 'drscheme:check-syntax:lexically-bound)
-    (define imported-variable-style-pref 'drscheme:check-syntax:imported)
-    (define set!d-variable-style-pref 'drscheme:check-syntax:set!d)
+    (define lexically-bound-variable-style-pref 'drracket:check-syntax:lexically-bound)
+    (define imported-variable-style-pref 'drracket:check-syntax:imported)
+    (define set!d-variable-style-pref 'drracket:check-syntax:set!d)
     
     (define lexically-bound-variable-style-name (symbol->string lexically-bound-variable-style-pref))
     (define imported-variable-style-name (symbol->string imported-variable-style-pref))
@@ -2889,7 +2889,7 @@ If the namespace does not, they are colored the unbound color.
     (add-check-syntax-key-bindings (drracket:rep:get-drs-bindings-keymap))
     (fw:color-prefs:add-to-preferences-panel (string-constant check-syntax)
                                              syncheck-add-to-preferences-panel)
-    (drracket:language:register-capability 'drscheme:check-syntax-button (flat-contract boolean?) #t)
+    (drracket:language:register-capability 'drracket:check-syntax-button (flat-contract boolean?) #t)
     (drracket:get/extend:extend-definitions-text make-syncheck-text%)
     (drracket:get/extend:extend-unit-frame unit-frame-mixin #f)
     (drracket:get/extend:extend-tab tab-mixin)))
diff --git a/collects/framework/preferences.rkt b/collects/framework/preferences.rkt
index 1a6d83a088..dbec958481 100644
--- a/collects/framework/preferences.rkt
+++ b/collects/framework/preferences.rkt
@@ -70,8 +70,8 @@ the state transitions / contracts are:
 ;; type pref = (make-pref any)
 (define-struct pref (value))
 
-;; type default  = (make-default any (any -> bool))
-(define-struct default (value checker))
+;; type default  = (make-default any (-> any bool) (listof symbol) (listof (-> any any)))
+(define-struct default (value checker aliases rewrite-aliases))
 
 ;; pref-callback : (make-pref-callback (union (weak-box (sym tst -> void)) (sym tst -> void)))
 ;; this is used as a wrapped to deal with the problem that different procedures might be eq?.
@@ -93,8 +93,7 @@ the state transitions / contracts are:
     ;; it's not there, use the default
     [(pref-default-set? p)
      (let* (;; try to read the preferece from the preferences file
-            [v ((preferences:low-level-get-preference)
-                (add-pref-prefix p) (λ () none))]
+            [v (read-pref-from-file p)]
             [v (if (eq? v none)
                  ;; no value read, take the default value
                  (default-value (hash-ref defaults p))
@@ -109,6 +108,22 @@ the state transitions / contracts are:
       "tried to get a preference but no default set for ~e"
       p)]))
 
+;; read-pref-from-file : symbol -> (or/c any none)
+;; reads the preference saved in the low-level preferences
+;; file, first checking 'p' and then checking the aliases (in order)
+(define (read-pref-from-file p)
+  (let ([defaults (hash-ref defaults p)])
+    (let loop ([syms (cons p (default-aliases defaults))]
+               [rewriters (cons values (default-rewrite-aliases defaults))])
+      (cond
+        [(null? syms) none]
+        [else
+         (let/ec k
+           ((car rewriters)
+            ((preferences:low-level-get-preference)
+             (add-pref-prefix (car syms))
+             (lambda () (k (loop (cdr syms) (cdr rewriters)))))))]))))
+
 ;; set : symbol any -> void
 ;; updates the preference
 ;; exported
@@ -221,15 +236,22 @@ the state transitions / contracts are:
    (λ (p def) (preferences:set p (default-value def)))))
 
 ;; set-default : (sym TST (TST -> boolean) -> void
-(define (preferences:set-default p default-value checker)
+(define (preferences:set-default p default-value checker 
+                                 #:aliases [aliases '()]
+                                 #:rewrite-aliases [rewrite-aliases (map (lambda (x) values) aliases)])
   (cond
     [(and (not (pref-default-set? p))
           (pref-can-init? p))
      (let ([default-okay? (checker default-value)])
        (unless default-okay?
          (error 'set-default "~s: checker (~s) returns ~s for ~s, expected #t~n"
-                p checker default-okay? default-value))
-       (hash-set! defaults p (make-default default-value checker)))]
+                p checker default-okay? default-value)))
+
+     (unless (= (length aliases) (length rewrite-aliases))
+       (error 'preferences:set-default 
+	      "expected equal length lists for the #:aliases and #:rewrite-aliases arguments, got ~e and ~e"
+	      aliases rewrite-aliases))
+     (hash-set! defaults p (make-default default-value checker aliases rewrite-aliases))]
     [(not (pref-can-init? p))
      (error 'preferences:set-default
             "tried to call set-default for preference ~e but it cannot be configured any more"
@@ -351,8 +373,12 @@ the state transitions / contracts are:
     if the preference has not been set.})
  (proc-doc/names
   preferences:set-default
-  (symbol? any/c (any/c . -> . any) . -> . void?)
-  (symbol value test)
+  (->* (symbol? any/c (any/c . -> . any))
+       (#:aliases (listof symbol?)
+        #:rewrite-aliases (listof (-> any/c any)))
+      void?)
+  ((symbol value test)
+   ((aliases '()) (rewrite-aliases (map (lambda (x) (values)) aliases))))
   @{This function must be called every time your application starts up, before
     any call to @scheme[preferences:get] or @scheme[preferences:set]
     (for any given preference).
@@ -364,11 +390,19 @@ the state transitions / contracts are:
     @scheme[value]. If the user has chosen a different setting,
     the user's setting will take precedence over the default value.
     
-    The last argument, @scheme[test] is used as a safeguard. That function is
+    The @scheme[test] argument is used as a safeguard. That function is
     called to determine if a preference read in from a file is a valid
     preference. If @scheme[test] returns @scheme[#t], then the preference is
     treated as valid. If @scheme[test] returns @scheme[#f] then the default is
-    used.})
+    used.
+
+    The @scheme[aliases] and @scheme[rewrite-aliases] arguments aids
+    in renaming preferences. If @scheme[aliases] is present, it is 
+    expected to be a list of symbols that correspond to old versions
+    of the preferences. It defaults to @scheme['()]. If @scheme[rewrite-aliases]
+    is present, it is used to adjust the old values of the preferences
+    when they are present in the saved file.})
+
  (proc-doc/names
   preferences:set-un/marshall
   (symbol? (any/c . -> . printable/c) (printable/c . -> . any/c) . -> . void?)
diff --git a/collects/typed/framework/framework.rkt b/collects/typed/framework/framework.rkt
index ee624fbc61..f5341ed57c 100644
--- a/collects/typed/framework/framework.rkt
+++ b/collects/typed/framework/framework.rkt
@@ -35,7 +35,7 @@
   ((Instance Horizontal-Panel%) ((Instance Button%) (Instance Event%) -> Void) ((Instance Button%) (Instance Event%) -> Void) -> (values Any Any))])
 
 (require/typed/provide "prefs-contract.ss"
-                       [preferences:get-drscheme:large-letters-font (-> (U #f (Pair String Integer)))])
+                       [preferences:get-drracket:large-letters-font (-> (U #f (Pair String Integer)))])
 
 (require (only-in "prefs-contract.ss" preferences:get))
 (provide preferences:get)
diff --git a/collects/typed/framework/prefs-contract.rkt b/collects/typed/framework/prefs-contract.rkt
index dd62fb14d3..9abefcc0c9 100644
--- a/collects/typed/framework/prefs-contract.rkt
+++ b/collects/typed/framework/prefs-contract.rkt
@@ -4,10 +4,10 @@
          framework/framework)
 
 (provide (rename-out [-preferences:get preferences:get])
-         preferences:get-drscheme:large-letters-font)
+         preferences:get-drracket:large-letters-font)
 
-(define (preferences:get-drscheme:large-letters-font)
-  (preferences:get 'drscheme:large-letters-font))
+(define (preferences:get-drracket:large-letters-font)
+  (preferences:get 'drracket:large-letters-font))
 
 (define-syntax (-preferences:get stx)
   (syntax-case stx (quote)