diff --git a/collects/games/chat-noir/chat-noir-literate.rkt b/collects/games/chat-noir/chat-noir-literate.rkt
index 20ad06b9c2..4711e0f666 100644
--- a/collects/games/chat-noir/chat-noir-literate.rkt
+++ b/collects/games/chat-noir/chat-noir-literate.rkt
@@ -1,7 +1,7 @@
 #lang scribble/lp
 
-@(require (for-label scheme/math) ;; for 'pi' below
-          scheme/math
+@(require (for-label racket/math) ;; for 'pi' below
+          racket/math
           games/scribblings/common)
 
 @gametitle*["Chat Noir" "chat-noir" "Puzzle Game" #:style '(toc)]
@@ -50,9 +50,9 @@ code that handles drawing of the world, code that handles user input,
 and some code that builds an initial world and starts the game.
 
 @chunk[<main>
-       (require scheme/list scheme/math
-                (for-syntax scheme/base))
-       (require 2htdp/universe htdp/image lang/posn scheme/contract)
+       (require racket/list racket/math
+                (for-syntax racket/base))
+       (require 2htdp/universe htdp/image lang/posn racket/contract)
        <world>
        <breadth-first-search>
        <board->graph>
@@ -402,7 +402,7 @@ and a @racket[dist-table] that records the same information as a
 @racket[distance-map], but in an immutable hash-table. The
 @racket[dist-map] is an accumulator, recording the distances
 to all of the nodes that have already been visited in the graph,
-and is used here to speed up the compuation. The queue is
+and is used here to speed up the computation. The queue is
 represented as a list of vectors of length two. Each element
 in the queue contains a @racket[posn], or the symbol @racket['boundary]
 and that @racket[posn]'s  distance.
diff --git a/collects/games/chat-noir/chat-noir-unit.rkt b/collects/games/chat-noir/chat-noir-unit.rkt
index 0e804e8c95..345be793f0 100644
--- a/collects/games/chat-noir/chat-noir-unit.rkt
+++ b/collects/games/chat-noir/chat-noir-unit.rkt
@@ -1,8 +1,8 @@
-#lang scheme/base
-(require scheme/unit
-         scheme/runtime-path
-         scheme/gui/base
-         scheme/class
+#lang racket/base
+(require racket/unit
+         racket/runtime-path
+         racket/gui/base
+         racket/class
          "../show-scribbling.rkt"
          string-constants/string-constant
          (prefix-in x: lang/htdp-intermediate-lambda)
@@ -66,7 +66,6 @@
   
   (parameterize ([current-custodian sub-custodian])
     (parameterize ([current-namespace (make-base-namespace)])
-      (namespace-attach-module orig-namespace '(lib "mred.rkt" "mred"))
-      (namespace-attach-module orig-namespace '(lib "class.rkt" "scheme"))
+      (namespace-attach-module orig-namespace 'mred/mred)
+      (namespace-attach-module orig-namespace 'racket/class)
       ((dynamic-require chat-noir 'main)))))
-
diff --git a/collects/scribble/lp/lang/reader.rkt b/collects/scribble/lp/lang/reader.rkt
index 70493a1ca3..bc2e2f8b57 100644
--- a/collects/scribble/lp/lang/reader.rkt
+++ b/collects/scribble/lp/lang/reader.rkt
@@ -8,10 +8,10 @@ scribble/lp/lang/lang
 ;; don't use scribble-base-info for the #:info arg, since
 ;; scribble/lp files are not directly scribble'able.
 #:language-info (scribble-base-language-info)
-
+#:info (scribble-base-reader-info)
 (require scribble/reader
          (only-in scribble/base/reader
-                  scribble-base-info
+                  scribble-base-reader-info
                   scribble-base-language-info))