diff --git a/src/racket/dynsrc/Makefile.in b/src/racket/dynsrc/Makefile.in
index a7ff2fdb11..91c1c7ebe5 100644
--- a/src/racket/dynsrc/Makefile.in
+++ b/src/racket/dynsrc/Makefile.in
@@ -1,5 +1,5 @@
 #
-# Makefile for mzscheme
+# Makefile for racket
 #
 
 # dynlink is a script that uses the right set of link commands
@@ -33,7 +33,7 @@ HEADERS = $(builddir)/../mzconfig.h \
           $(srcdir)/../include/escheme.h $(srcdir)/../src/stypes.h \
           $(srcdir)/../src/schemex.h $(srcdir)/../src/schemexm.h $(srcdir)/../src/schvers.h
 
-MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/mzscheme.exp
+MZDYNDEP = ../mzdyn.o $(srcdir)/../include/ext.exp $(srcdir)/../include/racket.exp
 
 ../mzdyn.o: $(srcdir)/mzdyn.c $(srcdir)/../src/schvers.h  $(HEADERS)
 	$(PLAIN_CC) @DYN_CFLAGS@ $(CFLAGS) -c $(srcdir)/mzdyn.c -o ../mzdyn.o
@@ -64,23 +64,23 @@ cygwin-install-core:
 	cp $(srcdir)/mzdyn.def mzdynx.def
 	dlltool --def mzdynx.def --output-exp mzdyn.exp
 	cd ../..; mkdir -p $(ILIBDIR)/gcc
-	cd ../..; cp mzscheme/dynsrc/mzdynx.def $(ILIBDIR)/gcc/mzdyn.def
-	cd ../..; cp mzscheme/dynsrc/init.o $(ILIBDIR)/gcc
-	cd ../..; cp mzscheme/dynsrc/fixup.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdynx.def $(ILIBDIR)/gcc/mzdyn.def
+	cd ../..; cp racket/dynsrc/init.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/fixup.o $(ILIBDIR)/gcc
 
 cygwin-install-cgc:
-	cd ../..; cp mzscheme/dynsrc/mzdyn.exp $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdyn.exp $(ILIBDIR)/gcc
 	gcc -c -O2 -I$(builddir)/.. -I$(srcdir)/../include $(srcdir)/mzdyn.c
 	gcc -c -O2 -DAS_MSVC_EXTENSION -I$(builddir)/.. -I$(srcdir)/../include -o mzdynw.o $(srcdir)/mzdyn.c
-	cd ../..; cp mzscheme/dynsrc/mzdyn.o $(ILIBDIR)/gcc
-	cd ../..; cp mzscheme/dynsrc/mzdynw.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdyn.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdynw.o $(ILIBDIR)/gcc
 
 cygwin-install-3m:
-	cd ../..; cp mzscheme/dynsrc/mzdyn.exp $(ILIBDIR)/gcc/mzdyn3m.exp
+	cd ../..; cp racket/dynsrc/mzdyn.exp $(ILIBDIR)/gcc/mzdyn3m.exp
 	gcc -c -O2 -DMZ_PRECISE_GC -I$(builddir)/.. -I$(srcdir)/../include $(srcdir)/mzdyn.c -o mzdyn3m.o
 	gcc -c -O2 -DAS_MSVC_EXTENSION -DMZ_PRECISE_GC -I$(builddir)/.. -I$(srcdir)/../include $(srcdir)/mzdyn.c -o mzdynw3m.o
-	cd ../..; cp mzscheme/dynsrc/mzdyn3m.o $(ILIBDIR)/gcc
-	cd ../..; cp mzscheme/dynsrc/mzdynw3m.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdyn3m.o $(ILIBDIR)/gcc
+	cd ../..; cp racket/dynsrc/mzdynw3m.o $(ILIBDIR)/gcc
 
 clean:
 	/bin/rm -f *.o Makefile.bak
diff --git a/src/racket/dynsrc/dynexmpl.c b/src/racket/dynsrc/dynexmpl.c
index 1366f98192..eeda5c3fec 100644
--- a/src/racket/dynsrc/dynexmpl.c
+++ b/src/racket/dynsrc/dynexmpl.c
@@ -1,5 +1,5 @@
 
-/* Example dynamically-loaded MzScheme extension, but not a good one.
+/* Example dynamically-loaded Racket extension, but not a good one.
 
    For example extensions, see plt/collects/mzscheme/examples. */
 
diff --git a/src/racket/dynsrc/fixup.c b/src/racket/dynsrc/fixup.c
index 73f7d8fdc0..45ab37f01f 100644
--- a/src/racket/dynsrc/fixup.c
+++ b/src/racket/dynsrc/fixup.c
@@ -1,4 +1,4 @@
-/* Link this file to gcc-compiled Win32 MzScheme extensions. */
+/* Link this file to gcc-compiled Win32 Racket extensions. */
 /* It must be the last file in the link list. */
 
 /* This is needed to terminate the list of inport stuff */
diff --git a/src/racket/dynsrc/init.cc b/src/racket/dynsrc/init.cc
index ba5dc4b90e..0b3f319f70 100644
--- a/src/racket/dynsrc/init.cc
+++ b/src/racket/dynsrc/init.cc
@@ -1,4 +1,4 @@
-/* Link this file to gcc-compiled Win32 MzScheme extensions */
+/* Link this file to gcc-compiled Win32 Racket extensions */
 
 /* init.cc for WIN32.   Copyright 1996 Cygnus Solutions
 This program is free software; you can redistribute it and/or modify
diff --git a/src/racket/dynsrc/mzdyn.c b/src/racket/dynsrc/mzdyn.c
index ff7f7efd95..b3a854d87b 100644
--- a/src/racket/dynsrc/mzdyn.c
+++ b/src/racket/dynsrc/mzdyn.c
@@ -1,5 +1,5 @@
 /*
-  MzScheme
+  Racket
   Copyright (c) 2004-2010 PLT Scheme Inc.
   Copyright (c) 1995 Matthew Flatt
   All rights reserved.
@@ -11,7 +11,7 @@
   All rights reserved.
 */
 
-/* This file should be linked with any MzScheme extension dynamic
+/* This file should be linked with any Racket extension dynamic
    object. */
 
 #include "escheme.h"
diff --git a/src/racket/dynsrc/start.c b/src/racket/dynsrc/start.c
index ec28a729c7..3f5efc6a90 100644
--- a/src/racket/dynsrc/start.c
+++ b/src/racket/dynsrc/start.c
@@ -1,6 +1,6 @@
 /* Launcher program for Windows. */
-/* Builds a MzScheme starter if MZSTART is defined. */
-/* Builds a MrEd starter if MRSTART is defined. */
+/* Builds a Racket starter if MZSTART is defined. */
+/* Builds a GRacket starter if MRSTART is defined. */
 /* If neither is defined, MZSTART is auto-defined. */
 
 #include <windows.h>
@@ -19,15 +19,15 @@
 
 #ifdef MRSTART
 # define GOSUBDIR L"\\"
-# define GOEXE L"mred"
-# define sGOEXE "mred"
+# define GOEXE L"gracket"
+# define sGOEXE "gracket"
 # define WAITTILDONE 0
 #endif
 
 #ifdef MZSTART
 # define GOSUBDIR L"\\"
-# define GOEXE L"mzscheme"
-# define sGOEXE "mzscheme"
+# define GOEXE L"racket"
+# define sGOEXE "racket"
 # define WAITTILDONE 1
 #endif
 
diff --git a/src/racket/dynsrc/ustart.c b/src/racket/dynsrc/ustart.c
index 97f6721e05..12d2d6c6f6 100644
--- a/src/racket/dynsrc/ustart.c
+++ b/src/racket/dynsrc/ustart.c
@@ -1,7 +1,7 @@
 
 /* "Embedding" program for Unix/X11, to be used as
-   an alternative to embedding in the actual MzScheme
-   or MrEd binary. */
+   an alternative to embedding in the actual Racket
+   or GRacket binary. */
 
 #include <sys/types.h>
 #include <sys/uio.h>
@@ -18,7 +18,7 @@
     prog_end - offset; start to prog_end is the program region
     end - offset; prog_end to end is the command region
     count - number of cmdline args in command region
-    x11? - non-zero => launches MrEd for X
+    x11? - non-zero => launches GRacket for X
 
     In the command region, the format is a sequence of NUL-terminated strings:
      exe_path - program to start (relative is w.r.t. executable)
@@ -29,8 +29,8 @@ char *config = "cOnFiG:[***************************";
 
 char *binary_type_hack = "bINARy tYPe:ezic";
 
-/* This path list is used instead of the one in the MzScheme/MrEd
-   binary. That way, the same MzScheme/MrEd binary can be shared
+/* This path list is used instead of the one in the Racket/GRacket
+   binary. That way, the same Racket/GRacket binary can be shared
    among embedding exectuables that have different collection
    paths. */
 char *_coldir = "coLLECTs dIRECTORy:" /* <- this tag stays, so we can find it again */