diff --git a/collects/htdp/bsl/reader.rkt b/collects/htdp/bsl/reader.rkt
index ed1cf82b95..5dd9934c8c 100644
--- a/collects/htdp/bsl/reader.rkt
+++ b/collects/htdp/bsl/reader.rkt
@@ -26,9 +26,9 @@
 (define ((make-info options) key default use-default)
   (case key
     [(drscheme:toolbar-buttons)
-     (list (dynamic-require 'stepper/drscheme-button 'stepper-drscheme-button)
-           (dynamic-require 'drscheme/syncheck-drracket-button 'syncheck-drracket-button))]
-    
+     (list (dynamic-require 'stepper/drracket-button 'stepper-drracket-button)
+           (dynamic-require 'drracket/syncheck-drracket-button 'syncheck-drracket-button))]
+
     [(drscheme:opt-out-toolbar-buttons)
      ;; opt-out of all of the extra buttons b/c 
      ;; we don't want anything to confuse in the teaching languages.
diff --git a/collects/meta/props b/collects/meta/props
index 42767d4f6a..6b664454bf 100755
--- a/collects/meta/props
+++ b/collects/meta/props
@@ -1226,7 +1226,7 @@ path/s is either such a string or a list of them.
 "collects/schemeunit/gui.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/scribble" responsible (mflatt eli)
 "collects/scribble/run.rkt" drdr:command-line (mzc *)
-"collects/scribble/tools/drscheme-buttons.rkt" drdr:command-line (gracket-text *)
+"collects/scribble/tools/drracket-buttons.rkt" drdr:command-line (gracket-text *)
 "collects/scribble/tools/private/mk-drs-bitmaps.rkt" drdr:command-line (gracket-text * "skip")
 "collects/scribblings" responsible (mflatt eli robby mathias)
 "collects/scribblings/framework/standard-menus.scrbl" drdr:command-line #f
@@ -1297,7 +1297,7 @@ path/s is either such a string or a list of them.
 "collects/srpersist/main.rkt" drdr:command-line #f
 "collects/srpersist/srpersist.rkt" drdr:command-line #f
 "collects/stepper" responsible (clements)
-"collects/stepper/drscheme-button.rkt" drdr:command-line (gracket-text *)
+"collects/stepper/drracket-button.rkt" drdr:command-line (gracket-text *)
 "collects/stepper/private/display-break-stuff.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/stepper/private/mred-extensions.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/stepper/private/vertical-separator-snip.rkt" drdr:command-line (gracket-text "-t" *)
diff --git a/collects/scribble/base/reader.rkt b/collects/scribble/base/reader.rkt
index 3d1c0d7138..a01f5a51a4 100644
--- a/collects/scribble/base/reader.rkt
+++ b/collects/scribble/base/reader.rkt
@@ -33,7 +33,7 @@
   (lambda (key defval default)
     (case key
       [(drscheme:toolbar-buttons)
-       (dynamic-require 'scribble/tools/drscheme-buttons 'drscheme-buttons)]
+       (dynamic-require 'scribble/tools/drracket-buttons 'drracket-buttons)]
       [else ((scribble-base-reader-info) key defval default)])))
 
 (define (scribble-base-language-info)
diff --git a/collects/scribble/tools/drscheme-buttons.rkt b/collects/scribble/tools/drracket-buttons.rkt
similarity index 97%
rename from collects/scribble/tools/drscheme-buttons.rkt
rename to collects/scribble/tools/drracket-buttons.rkt
index 33d2b0093c..e1a33b954a 100644
--- a/collects/scribble/tools/drscheme-buttons.rkt
+++ b/collects/scribble/tools/drracket-buttons.rkt
@@ -8,7 +8,7 @@
          setup/xref
          net/sendurl)
 
-(provide drscheme-buttons)
+(provide drracket-buttons)
 
 (define-runtime-path pdf-png-path "pdf.png")
 (define-runtime-path html-png-path "html.png")
@@ -45,7 +45,7 @@
              (message-box "Scribble" (get-output-string p) drs-frame))
            (message-box "Not Named" "Cannot render unsaved file"))))))
 
-(define drscheme-buttons
+(define drracket-buttons
   (let ([html-button
          (make-render-button "Scribble HTML" html.png "--html" #".html" 
                              '("++xref-in" "setup/xref" "load-collections-xref"))]
diff --git a/collects/stepper/drscheme-button.rkt b/collects/stepper/drracket-button.rkt
similarity index 77%
rename from collects/stepper/drscheme-button.rkt
rename to collects/stepper/drracket-button.rkt
index 002d1dbc65..67842fecb9 100644
--- a/collects/stepper/drscheme-button.rkt
+++ b/collects/stepper/drracket-button.rkt
@@ -1,10 +1,10 @@
 #lang scheme/base
 (require scheme/class string-constants/string-constant
          (prefix-in x: "private/mred-extensions.ss"))
-(provide stepper-button-callback stepper-drscheme-button)
+(provide stepper-button-callback stepper-drracket-button)
 (define-local-member-name stepper-button-callback)
 
-(define stepper-drscheme-button
+(define stepper-drracket-button
   (list 
    (string-constant stepper-button-label)
    x:foot-img/horizontal
diff --git a/collects/stepper/stepper-tool.rkt b/collects/stepper/stepper-tool.rkt
index c8264a0738..e3cb914388 100644
--- a/collects/stepper/stepper-tool.rkt
+++ b/collects/stepper/stepper-tool.rkt
@@ -13,7 +13,7 @@
          lang/stepper-language-interface
          scheme/pretty
          "xml-sig.ss"
-         "drscheme-button.ss") ;; get the stepper-button-callback private-member-name
+         "drracket-button.ss") ;; get the stepper-button-callback private-member-name
 
 (import drscheme:tool^ xml^ view-controller^)
 (export drscheme:tool-exports^ stepper-frame^)
@@ -213,7 +213,7 @@
              [stretchable-width #f]
              [stretchable-height #f]))
       
-      ;; called from drscheme-button.ss, installed via the #lang htdp/bsl (& co) reader into drscheme
+      ;; called from drracket-button.rkt, installed via the #lang htdp/bsl (& co) reader into drscheme
       (define/public (stepper-button-callback)
         (if stepper-frame
             (send stepper-frame show #t)