diff --git a/racket/lib/collects/ffi/examples/use-sndfile.rkt b/racket/lib/collects/ffi/examples/use-sndfile.rkt
index e3dafa821c..03908da908 100755
--- a/racket/lib/collects/ffi/examples/use-sndfile.rkt
+++ b/racket/lib/collects/ffi/examples/use-sndfile.rkt
@@ -30,7 +30,7 @@
                   ;(append data (reverse data))
                   (append data (reverse (map reverse data)))
                   `((artist "Eli") (comment "Comment") (title "Title")
-                                   (date "1/1/1999") (software "mzscheme")
+                                   (date "1/1/1999") (software "Racket")
                                    ,@meta))))
 
 
diff --git a/racket/lib/collects/planet/private/resolver.rkt b/racket/lib/collects/planet/private/resolver.rkt
index 028e35f176..1fe32feac7 100644
--- a/racket/lib/collects/planet/private/resolver.rkt
+++ b/racket/lib/collects/planet/private/resolver.rkt
@@ -449,7 +449,7 @@ See the scribble documentation on the planet/resolver module.
 
 ;; get/uninstalled-cache : pkg-getter
 ;; note: this does not yet work with minimum-required-version specifiers if you
-;; install a package and then use an older mzscheme
+;; install a package and then use an older racket
 (define (get/uninstalled-cache _ pkg-spec load? success-k failure-k)
   (let ([p (lookup-package pkg-spec (UNINSTALLED-PACKAGE-CACHE))])
     (if (and p (file-exists? (build-path (pkg-path p)
diff --git a/racket/lib/collects/racket/private/map.rkt b/racket/lib/collects/racket/private/map.rkt
index ed84d6a407..89c02a500f 100644
--- a/racket/lib/collects/racket/private/map.rkt
+++ b/racket/lib/collects/racket/private/map.rkt
@@ -3,7 +3,7 @@
 ;;  but the JIT generates faster code, especially for the common cases.
 
 (module map '#%kernel
-  (#%require '#%utils ; built into mzscheme
+  (#%require '#%utils ; built into racket
              "small-scheme.rkt" "define.rkt"
              "performance-hint.rkt")
 
diff --git a/racket/lib/collects/srfi/1/cons.rkt b/racket/lib/collects/srfi/1/cons.rkt
index e598b1a5f1..2a8b4b0929 100644
--- a/racket/lib/collects/srfi/1/cons.rkt
+++ b/racket/lib/collects/srfi/1/cons.rkt
@@ -56,7 +56,7 @@
 ;;
 ;; (cons first (unfold not-pair? car cdr rest values))
 
-;; reprovided as mzscheme's list*
+;; reprovided as racket's list*
 ;; (define (cons* first . rest)
 ;;   (let recur ((x first) (rest rest))
 ;;     (if (pair? rest)
diff --git a/racket/lib/collects/srfi/1/list.rkt b/racket/lib/collects/srfi/1/list.rkt
index d648d68af5..e43fed8182 100644
--- a/racket/lib/collects/srfi/1/list.rkt
+++ b/racket/lib/collects/srfi/1/list.rkt
@@ -212,7 +212,7 @@
 ;;; The SRFI discussion record contains more discussion on this topic.
 
 ;; JBC, 2003-10-20: some of the names provided by list.rkt are prefixed
-;; with an s: to avoid colliding with mzscheme.  The wrapper 1.rkt
+;; with an s: to avoid colliding with racket.  The wrapper 1.rkt
 ;; changes their names back to the non-prefixed form.
 
 #lang scheme/base
diff --git a/racket/lib/collects/syntax/free-vars.rkt b/racket/lib/collects/syntax/free-vars.rkt
index 54def7bc91..2202985932 100644
--- a/racket/lib/collects/syntax/free-vars.rkt
+++ b/racket/lib/collects/syntax/free-vars.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-;; this finds the free variables of fully-expanded mzscheme expressions
+;; this finds the free variables of fully-expanded racket expressions
 ;; adapted from code by mflatt
 
 (require syntax/kerncase
diff --git a/racket/lib/collects/unstable/struct.rkt b/racket/lib/collects/unstable/struct.rkt
index 7c51ca7ca1..7048c395a6 100644
--- a/racket/lib/collects/unstable/struct.rkt
+++ b/racket/lib/collects/unstable/struct.rkt
@@ -47,7 +47,7 @@
 ;; Eli: You give a good point for this, but I'd prefer if the optimizer would
 ;;   detect these, so you'd get the same warnings for constructors too when you
 ;;   use `-W warning'.  (And then, if you really want these things to be
-;;   errors, then perhaps something at the mzscheme level should make it throw
+;;   errors, then perhaps something at the racket level should make it throw
 ;;   errors instead of warnings.)
 
 (define dummy-value (box 'dummy))
diff --git a/racket/lib/collects/version/utils.rkt b/racket/lib/collects/version/utils.rkt
index 58a77e51e8..001e2e2b68 100644
--- a/racket/lib/collects/version/utils.rkt
+++ b/racket/lib/collects/version/utils.rkt
@@ -15,7 +15,7 @@
 
 ;; the following functions assume valid version string inputs
 
-;; returns a list of 4 integers (see src/mzscheme/src/schvers.h)
+;; returns a list of 4 integers (see src/racket/src/schvers.h)
 (define (version->list str)
   (define ver (map string->number (regexp-split #rx"[.]" str)))
   (case (length ver)
diff --git a/racket/src/foreign/foreign.c b/racket/src/foreign/foreign.c
index 2b7f85d80e..f5ab2c46bd 100644
--- a/racket/src/foreign/foreign.c
+++ b/racket/src/foreign/foreign.c
@@ -491,7 +491,7 @@ static Scheme_Object *foreign_ffi_obj_name(int argc, Scheme_Object *argv[])
 
 /* These will make sense in Racket when longs are longer than ints (needed
  * for libffi's int32 types).  There is no need to deal with bignums because
- * mzscheme's fixnums are longs. */
+ * racket's fixnums are longs. */
 XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v)
 {
   if (SCHEME_INTP(o)) {
diff --git a/racket/src/foreign/foreign.rktc b/racket/src/foreign/foreign.rktc
index d62f5aa383..4205c86fd3 100755
--- a/racket/src/foreign/foreign.rktc
+++ b/racket/src/foreign/foreign.rktc
@@ -408,7 +408,7 @@ static uintptr_t adjustment;
 
 /* These will make sense in Racket when longs are longer than ints (needed
  * for libffi's int32 types).  There is no need to deal with bignums because
- * mzscheme's fixnums are longs. */
+ * racket's fixnums are longs. */
 XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v)
 {
   if (SCHEME_INTP(o)) {
diff --git a/racket/src/racket/dynsrc/dynexmpl.c b/racket/src/racket/dynsrc/dynexmpl.c
index eeda5c3fec..6dbf27c29a 100644
--- a/racket/src/racket/dynsrc/dynexmpl.c
+++ b/racket/src/racket/dynsrc/dynexmpl.c
@@ -1,7 +1,7 @@
 
 /* Example dynamically-loaded Racket extension, but not a good one.
 
-   For example extensions, see plt/collects/mzscheme/examples. */
+   For example extensions, see plt/pkgs/mzscheme/mzscheme/examples. */
 
 #include "escheme.h"
 #include <time.h>
diff --git a/racket/src/racket/mkincludes.rkt b/racket/src/racket/mkincludes.rkt
index 64830d3928..dc08f8628d 100644
--- a/racket/src/racket/mkincludes.rkt
+++ b/racket/src/racket/mkincludes.rkt
@@ -2,7 +2,7 @@
 
 ;; Should be called with three command-line arguments:
 ;; 1. The include directory that should be created,
-;; 2. The location of the src/mzscheme directory,
+;; 2. The location of the src/racket directory,
 ;; 3. The location of mzconfig.
 
 ;; written in #%kernel because it's loaded with -c (ie, no compiled files)
diff --git a/racket/src/racket/src/mk-uchar.rkt b/racket/src/racket/src/mk-uchar.rkt
index 86844f4cd2..03925e9fcf 100644
--- a/racket/src/racket/src/mk-uchar.rkt
+++ b/racket/src/racket/src/mk-uchar.rkt
@@ -7,7 +7,7 @@
 ;; is used for string operations.
 
 ;; Run as
-;;   mzscheme mk-uchar.rkt
+;;   racket mk-uchar.rkt
 ;; in the script's directory, and have a copy of UnicodeData.txt, etc.
 ;; in the "Unicode" directory. The file schuchar.inc will be
 ;; overwritten.