diff --git a/whalesong/examples/whale.rkt b/whalesong/examples/whale.rkt
index cba2858..3c2a821 100644
--- a/whalesong/examples/whale.rkt
+++ b/whalesong/examples/whale.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/world)
-         (planet dyoo/whalesong/image))
+(require whalesong/world
+         whalesong/image)
 
 (define-struct world (x direction))
 
diff --git a/whalesong/examples/window-size.rkt b/whalesong/examples/window-size.rkt
index 2ddf635..1512b79 100644
--- a/whalesong/examples/window-size.rkt
+++ b/whalesong/examples/window-size.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/js))
+(require whalesong/js)
 
 (when (in-javascript-context?)
   (viewport-width))
diff --git a/whalesong/expand-out-images.rkt b/whalesong/expand-out-images.rkt
index e4cff11..327cbf9 100644
--- a/whalesong/expand-out-images.rkt
+++ b/whalesong/expand-out-images.rkt
@@ -12,7 +12,7 @@
 ;; my-image-url: (parameterof stx)
 ;;
 ;; During the dynamic extent of expand-out-images, this will be defined
-;; as the unique name for the image-url function in (planet dyoo/whalesong/image).
+;; as the unique name for the image-url function in whalesong/image.
 (define-runtime-path whalesong/image
   "image.rkt")
 (define my-image-url (make-parameter #f))
@@ -208,4 +208,4 @@
        (define-values-for-syntax ids #,(on-expr #'expr)))]
     
     [else
-     (on-expr stx)]))
\ No newline at end of file
+     (on-expr stx)]))
diff --git a/whalesong/js-assembler/check-valid-module-source.rkt b/whalesong/js-assembler/check-valid-module-source.rkt
index 3e621f2..b5480e4 100644
--- a/whalesong/js-assembler/check-valid-module-source.rkt
+++ b/whalesong/js-assembler/check-valid-module-source.rkt
@@ -55,7 +55,7 @@
   ;; Does it look like something out of moby or js-vm?  Abort early, because if we don't do
   ;; this up front, Racket will try to install the deprecated module, and that's bad.
   (when (looks-like-old-moby-or-js-vm? module-source-path)
-    (fprintf (current-report-port) "ERROR: The program in ~e appears to be written using the deprecated project js-vm or Moby.\n\nPlease change the lang line to:\n\n    #lang planet dyoo/whalesong\n\ninstead.\n"
+    (fprintf (current-report-port) "ERROR: The program in ~e appears to be written using the deprecated project js-vm or Moby.\n\nPlease change the lang line to:\n\n    #lang whalesong\n\ninstead.\n"
             module-source-path)
     (abort-abort))
     
@@ -132,4 +132,4 @@
                     (path-only module-source-path)]
                    [current-directory
                     (path-only module-source-path)])
-      (compile stx))))
\ No newline at end of file
+      (compile stx))))
diff --git a/whalesong/js-assembler/module-knowledge.rkt b/whalesong/js-assembler/module-knowledge.rkt
index bae059f..9a93c87 100644
--- a/whalesong/js-assembler/module-knowledge.rkt
+++ b/whalesong/js-assembler/module-knowledge.rkt
@@ -2,12 +2,14 @@
 
 ;; Provides a mapping of the core bindings in kernel, so that we know statically
 ;; if something is implemented as a primitive or a closure.
-(require planet/util)
+(require syntax/modresolve)
+
+(provide bound-procedure-names)
 
 
 (define ns (make-base-empty-namespace))
 (define bound-procedure-names
-  (let ([path (resolve-planet-path `(planet ,(this-package-version-symbol lang/kernel)))])
+  (let ([path (resolve-module-path 'whalesong/lang/kernel #f)])
     (parameterize ([current-namespace ns])
       (namespace-require path)
       (for/list ([name (namespace-mapped-symbols)]
diff --git a/whalesong/js/world/test-geo.rkt b/whalesong/js/world/test-geo.rkt
index ac593fa..ddad6b3 100644
--- a/whalesong/js/world/test-geo.rkt
+++ b/whalesong/js/world/test-geo.rkt
@@ -1,9 +1,9 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
+(require whalesong/web-world
          "geo.rkt")
 
 
 (big-bang (list 'undefined 'undefined)
           (on-geo (lambda (w v lat lng)
-                    (list lat lng))))
\ No newline at end of file
+                    (list lat lng))))
diff --git a/whalesong/js/world/test.rkt b/whalesong/js/world/test.rkt
index 20060bc..8fc337a 100644
--- a/whalesong/js/world/test.rkt
+++ b/whalesong/js/world/test.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/js/world)
-         (planet dyoo/whalesong/js)
-         (planet dyoo/whalesong/web-world))
+#lang whalesong
+(require whalesong/js/world
+         whalesong/js
+         whalesong/web-world)
 
 ;; Test of getting world events from arbitrary JavaScript function application.
 
diff --git a/whalesong/korean/lang/reader.rkt b/whalesong/korean/lang/reader.rkt
index 7c046ba..4020189 100644
--- a/whalesong/korean/lang/reader.rkt
+++ b/whalesong/korean/lang/reader.rkt
@@ -1,5 +1,2 @@
 #lang s-exp syntax/module-reader
-#:language (lambda ()
-             `(planet ,(this-package-version-symbol lang/korean)))
-
-(require planet/version)
+#:language (lambda () 'whalesong/lang/korean)
diff --git a/whalesong/sandbox/cloth-simulation.rkt b/whalesong/sandbox/cloth-simulation.rkt
index d2caddb..b1173c6 100644
--- a/whalesong/sandbox/cloth-simulation.rkt
+++ b/whalesong/sandbox/cloth-simulation.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 ;; A rewrite of the cloth simulation application from the Codea project
 ;; into world form.
@@ -72,4 +72,4 @@
   (sqrt (sqr (- (point-x p1)
                 (point-x p2)))
         (sqr (- (point-y p1)
-                (point-y p2)))))
\ No newline at end of file
+                (point-y p2)))))
diff --git a/whalesong/sandbox/monty-hall/monty-hall.rkt b/whalesong/sandbox/monty-hall/monty-hall.rkt
index f2f0bc0..2d21f32 100644
--- a/whalesong/sandbox/monty-hall/monty-hall.rkt
+++ b/whalesong/sandbox/monty-hall/monty-hall.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
diff --git a/whalesong/sandbox/sample-run.rkt b/whalesong/sandbox/sample-run.rkt
index 0c3516a..9d03b3c 100644
--- a/whalesong/sandbox/sample-run.rkt
+++ b/whalesong/sandbox/sample-run.rkt
@@ -1,14 +1,14 @@
 #lang racket
-(require (planet dyoo/whalesong/get-module-bytecode)
-         (planet dyoo/whalesong/parser/parse-bytecode)
-         (planet dyoo/whalesong/compiler/compiler)
-         (planet dyoo/whalesong/compiler/compiler-structs)
-         (planet dyoo/whalesong/js-assembler/assemble))
+(require whalesong/get-module-bytecode
+         whalesong/parser/parse-bytecode
+         whalesong/compiler/compiler
+         whalesong/compiler/compiler-structs
+         whalesong/js-assembler/assemble)
 
 (define bytecode 
   (get-module-bytecode 
    (open-input-string 
-    (string-append "#lang planet dyoo/whalesong\n"
+    (string-append "#lang whalesong\n"
                    "(define (f x)\n"
                    "  (if (= x 0)\n"
                    "      1\n"
@@ -21,4 +21,4 @@
 
 (define op (open-output-string))
 (assemble/write-invoke stmts op)
-(define js-code (get-output-string op))
\ No newline at end of file
+(define js-code (get-output-string op))
diff --git a/whalesong/sandbox/test-storage.rkt b/whalesong/sandbox/test-storage.rkt
index d94d033..a863b34 100644
--- a/whalesong/sandbox/test-storage.rkt
+++ b/whalesong/sandbox/test-storage.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/storage))
+(require whalesong/storage)
 
 (storage-length)
 (storage-ref "whalesong test")
@@ -24,4 +24,4 @@
 (storage-key 0)
 (storage-remove! "name")
 (storage-length)
-(storage-clear!)
\ No newline at end of file
+(storage-clear!)
diff --git a/whalesong/sandbox/todo-storage/todo.rkt b/whalesong/sandbox/todo-storage/todo.rkt
index 3dd5554..88efed3 100644
--- a/whalesong/sandbox/todo-storage/todo.rkt
+++ b/whalesong/sandbox/todo-storage/todo.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource)
-         (planet dyoo/whalesong/storage))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource
+         whalesong/storage)
 
 ;; The world is our TODO list, represented as a list of strings.
 
@@ -84,4 +84,4 @@
 (big-bang (list (new-item "milk")
                 (new-item "eggs"))
           (initial-view the-view)
-          (to-draw draw))
\ No newline at end of file
+          (to-draw draw))
diff --git a/whalesong/scribblings/cs019.scrbl b/whalesong/scribblings/cs019.scrbl
index d663f23..6d90bd9 100644
--- a/whalesong/scribblings/cs019.scrbl
+++ b/whalesong/scribblings/cs019.scrbl
@@ -1,8 +1,5 @@
 #lang scribble/manual
-@(require planet/scribble
-          planet/version
-          planet/resolver
-          scribble/eval
+@(require scribble/eval
           scribble/bnf
           racket/sandbox
           racket/port
@@ -76,7 +73,7 @@ Run the following to create the @filepath{whalesong} launcher program in
 your current directory.
 @codeblock|{
 #lang racket/base
-(require (planet dyoo/whalesong:1:12/make-launcher))
+(require whalesong/make-launcher)
 }|
 This may take a few minutes, as Racket is compiling Whalesong, its
 dependencies, and its documentation.  When it finally finishes,
@@ -156,8 +153,8 @@ Let's look at a few of them.
 @subsection{Hello world}
 
 Let's try making a simple, standalone executable.  At the moment, the
-program should be written in the base language of @racket[(planet
-dyoo/whalesong/cs019)], as it provides the language features that
+program should be written in the base language of
+@racket[whalesong/cs019], as it provides the language features that
 you've been using in cs019 (@racket[local], @racket[shared], etc...),
 as well as support for the @racketmodname/this-package[web-world]
 package described later in this document.
@@ -166,7 +163,7 @@ package described later in this document.
 Write a @filepath{hello.rkt} with the following content
 @filebox["hello.rkt"]{
 @codeblock{
-    #lang planet dyoo/whalesong/cs019
+    #lang whalesong/cs019
     "hello world"
 }}
 This program is a regular Racket program, and can be executed normally,
@@ -242,7 +239,7 @@ Once we're happy with the statics of our program, we can inject dynamic behavior
 Write a file called @filepath{tick-tock.rkt} with the following content.
 @filebox["tick-tock.rkt"]{
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -299,7 +296,7 @@ Finally, let's look at a program that displays our current geolocation.
 
 @filebox["where-am-i.rkt"]{
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -438,11 +435,11 @@ wants to reset the page.
 ]
 
 These examples are written in a less featureful language level
-(@litchar{#lang planet dyoo/whalesong}), which is why it uses explicit
+(@litchar{#lang whalesong}), which is why it uses explicit
 @racket[require] statements to pull in support for
 @racketmodname/this-package[web-world] and
 @racketmodname/this-package[resource].  As long as you use
-@litchar{#lang planet dyoo/whalesong/cs019}, you shouldn't need to
+@litchar{#lang whalesong/cs019}, you shouldn't need to
 require those particular libraries.
 
 
@@ -768,7 +765,7 @@ can accept the event as an argument.
 
 You can construct events for testing purposes by using @racket[make-event].
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 ;; Synthesizing a location event
 (define my-event (make-event '((latitude 41) 
                                (longitude -71))))
@@ -794,7 +791,7 @@ Get an list of the event's keys.
 We often need to dynamically inject new dom nodes into an existing
 view.  As an example where the UI is entirely in code:
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 ;; tick: world view -> world
 (define (tick world view)
@@ -892,14 +889,14 @@ to the program.
 
 For example,
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 (define-resource my-whale-image-resource "humpback.png")
 }|
 }
 Since the name we're using will often match the filename itself,
 as a convenience, we can also write the following:
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 (define-resource humpback.png)
 }|
 which defines a variable named @racket[humpback.png] whose
@@ -933,7 +930,7 @@ Given a resource, gets its URL.
 
 For example,
 @codeblock|{
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource my-whale-image-resource "humpback.png")
 
diff --git a/whalesong/tests/clipart-test/clipart.rkt b/whalesong/tests/clipart-test/clipart.rkt
index 0172991..b62e159 100644
--- a/whalesong/tests/clipart-test/clipart.rkt
+++ b/whalesong/tests/clipart-test/clipart.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/image)
-         (planet dyoo/whalesong/resource))
+#lang whalesong/base
+(require whalesong/image
+         whalesong/resource)
 
 
 ;; color-near? : Color Color Number -> Boolean
diff --git a/whalesong/tests/coersing/fact.rkt b/whalesong/tests/coersing/fact.rkt
index daa6c20..042ccd9 100644
--- a/whalesong/tests/coersing/fact.rkt
+++ b/whalesong/tests/coersing/fact.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (provide fact)
 (define (fact x)
   (cond
@@ -8,4 +8,4 @@
     (* x (fact (sub1 x)))]))
 
 
-;;(printf "test: ~s\n" (fact 4))
\ No newline at end of file
+;;(printf "test: ~s\n" (fact 4))
diff --git a/whalesong/tests/more-tests/basics-cs019.rkt b/whalesong/tests/more-tests/basics-cs019.rkt
index e91172b..54b7047 100644
--- a/whalesong/tests/more-tests/basics-cs019.rkt
+++ b/whalesong/tests/more-tests/basics-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-struct f (x))
 (define-struct g (a b))
diff --git a/whalesong/tests/more-tests/booleans-cs019.rkt b/whalesong/tests/more-tests/booleans-cs019.rkt
index 9c0f10c..fe62145 100644
--- a/whalesong/tests/more-tests/booleans-cs019.rkt
+++ b/whalesong/tests/more-tests/booleans-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 
 (boolean? "t")
@@ -20,4 +20,4 @@
 true
 false
 (false? true)
-(false? false)
\ No newline at end of file
+(false? false)
diff --git a/whalesong/tests/more-tests/booleans-cs019.rkt~ b/whalesong/tests/more-tests/booleans-cs019.rkt~
deleted file mode 100644
index 9a9274b..0000000
--- a/whalesong/tests/more-tests/booleans-cs019.rkt~
+++ /dev/null
@@ -1,23 +0,0 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/lang/bool))
-
-(boolean? "t")
-(boolean? #t)
-(boolean? 0)
-(boolean? #\t)
-
-(char? "t")
-(char? #t)
-(char? 0)
-(char? #\t)
-
-(char=? #\a #\b)
-(char=? #\a #\a)
-(char=? #\a #\a #\b)
-(char=? #\a #\b #\a)
-(char=? #\a #\a #\a)
-
-true
-false
-(false? true)
-(false? false)
\ No newline at end of file
diff --git a/whalesong/tests/more-tests/booleans.rkt b/whalesong/tests/more-tests/booleans.rkt
index 9a9274b..e872b51 100644
--- a/whalesong/tests/more-tests/booleans.rkt
+++ b/whalesong/tests/more-tests/booleans.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/lang/bool))
+#lang whalesong/base
+(require whalesong/lang/bool)
 
 (boolean? "t")
 (boolean? #t)
@@ -20,4 +20,4 @@
 true
 false
 (false? true)
-(false? false)
\ No newline at end of file
+(false? false)
diff --git a/whalesong/tests/more-tests/chars.rkt b/whalesong/tests/more-tests/chars.rkt
index 375f5b2..860a0bc 100644
--- a/whalesong/tests/more-tests/chars.rkt
+++ b/whalesong/tests/more-tests/chars.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (char-upcase #\a)
 (char-upcase #\b)
diff --git a/whalesong/tests/more-tests/checking-cs019.rkt b/whalesong/tests/more-tests/checking-cs019.rkt
index b4ad9bc..faf67c6 100644
--- a/whalesong/tests/more-tests/checking-cs019.rkt
+++ b/whalesong/tests/more-tests/checking-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define (greet name)
   (string-append "hello " name))
diff --git a/whalesong/tests/more-tests/checking.rkt b/whalesong/tests/more-tests/checking.rkt
index f8e7482..1b2ad89 100644
--- a/whalesong/tests/more-tests/checking.rkt
+++ b/whalesong/tests/more-tests/checking.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define (greet name)
   (string-append "hello " name))
diff --git a/whalesong/tests/more-tests/colors.rkt b/whalesong/tests/more-tests/colors.rkt
index d02ed7b..f126248 100644
--- a/whalesong/tests/more-tests/colors.rkt
+++ b/whalesong/tests/more-tests/colors.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
-(require (planet dyoo/whalesong/image))
+(require whalesong/image)
 (color 3 4 5 0)
 (make-color 3 5 7 0)
 
@@ -9,4 +9,4 @@
 (color-red c1)
 (color-green c1)
 (color-blue c1)
-(color-alpha c1)
\ No newline at end of file
+(color-alpha c1)
diff --git a/whalesong/tests/more-tests/conform.rkt b/whalesong/tests/more-tests/conform.rkt
index c7cb524..6549d18 100644
--- a/whalesong/tests/more-tests/conform.rkt
+++ b/whalesong/tests/more-tests/conform.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (let ()
 
 ;; (define (caar l)
@@ -515,4 +515,4 @@
       (newline))))
 
 
-(void ((letrec ((loop (lambda (n) (if (zero? n) 'done (begin (go) (loop (- n '1))))))) loop) 1)))
\ No newline at end of file
+(void ((letrec ((loop (lambda (n) (if (zero? n) 'done (begin (go) (loop (- n '1))))))) loop) 1)))
diff --git a/whalesong/tests/more-tests/cont-marks-1.rkt b/whalesong/tests/more-tests/cont-marks-1.rkt
index f897e54..12ffae7 100644
--- a/whalesong/tests/more-tests/cont-marks-1.rkt
+++ b/whalesong/tests/more-tests/cont-marks-1.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define (puzzle n)
   (if (= n 0)
diff --git a/whalesong/tests/more-tests/cont-marks-2.rkt b/whalesong/tests/more-tests/cont-marks-2.rkt
index a33cd1d..9ca3cb4 100644
--- a/whalesong/tests/more-tests/cont-marks-2.rkt
+++ b/whalesong/tests/more-tests/cont-marks-2.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (define (puzzle n)
   (if (= n 0)
diff --git a/whalesong/tests/more-tests/dots-should-be-syntax-error.rkt b/whalesong/tests/more-tests/dots-should-be-syntax-error.rkt
index 990de08..c9eeb54 100644
--- a/whalesong/tests/more-tests/dots-should-be-syntax-error.rkt
+++ b/whalesong/tests/more-tests/dots-should-be-syntax-error.rkt
@@ -1,3 +1,3 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 .. ;; should raise a teaching syntax error
diff --git a/whalesong/tests/more-tests/earley.rkt b/whalesong/tests/more-tests/earley.rkt
index 55aeffe..7ae1998 100644
--- a/whalesong/tests/more-tests/earley.rkt
+++ b/whalesong/tests/more-tests/earley.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (begin
    (define make-parser
      (lambda (grammar lexer)
diff --git a/whalesong/tests/more-tests/fact.rkt b/whalesong/tests/more-tests/fact.rkt
index 5b879b7..c2d4ae7 100644
--- a/whalesong/tests/more-tests/fact.rkt
+++ b/whalesong/tests/more-tests/fact.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (define (fact x)
   (cond
    [(= x 0)
diff --git a/whalesong/tests/more-tests/fft.rkt b/whalesong/tests/more-tests/fft.rkt
index 1c85d7d..6d84069 100644
--- a/whalesong/tests/more-tests/fft.rkt
+++ b/whalesong/tests/more-tests/fft.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; File:         fft.cl
 ; Description:  FFT benchmark from the Gabriel tests.
diff --git a/whalesong/tests/more-tests/fringe.rkt b/whalesong/tests/more-tests/fringe.rkt
index 3f8703f..62561dd 100644
--- a/whalesong/tests/more-tests/fringe.rkt
+++ b/whalesong/tests/more-tests/fringe.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; A tree is either a symbol or a node.
 (define-struct node (l r))
diff --git a/whalesong/tests/more-tests/graphs.rkt b/whalesong/tests/more-tests/graphs.rkt
index 4c6276a..5a3fb34 100644
--- a/whalesong/tests/more-tests/graphs.rkt
+++ b/whalesong/tests/more-tests/graphs.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ; Modified 2 March 1997 by Will Clinger to add graphs-benchmark
 ; and to expand the four macros below.
 ; Modified 11 June 1997 by Will Clinger to eliminate assertions
@@ -640,4 +640,4 @@
 (fold-over-rdg 5 ;;(if input 6 1)
                2 
                cons
-               '())
\ No newline at end of file
+               '())
diff --git a/whalesong/tests/more-tests/hash-code.rkt b/whalesong/tests/more-tests/hash-code.rkt
index 5265c76..de32011 100644
--- a/whalesong/tests/more-tests/hash-code.rkt
+++ b/whalesong/tests/more-tests/hash-code.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/lang/private/shared))
+#lang whalesong/base
+(require whalesong/lang/private/shared)
 
 ;; boxes
 "boxes"
diff --git a/whalesong/tests/more-tests/hashes.rkt b/whalesong/tests/more-tests/hashes.rkt
index 1a31e53..ac04f8a 100644
--- a/whalesong/tests/more-tests/hashes.rkt
+++ b/whalesong/tests/more-tests/hashes.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (hash? 1)
 (hash? "potatoes")
diff --git a/whalesong/tests/more-tests/hello-bf.rkt b/whalesong/tests/more-tests/hello-bf.rkt
index 4f6fc6d..ac05cab 100644
--- a/whalesong/tests/more-tests/hello-bf.rkt
+++ b/whalesong/tests/more-tests/hello-bf.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/bf
+#lang whalesong/bf
 +++++ +++++ [ > +++++ ++ > +++++ +++++ > +++ > + <<<< - ] > ++ .  > +
 .  +++++ ++ .  .  +++ .  > ++ .  << +++++ +++++ +++++ .  > .  +++ .
 ----- - .  ----- --- .  > + .  > .
diff --git a/whalesong/tests/more-tests/hello.rkt b/whalesong/tests/more-tests/hello.rkt
index 9c5e421..ec236e1 100644
--- a/whalesong/tests/more-tests/hello.rkt
+++ b/whalesong/tests/more-tests/hello.rkt
@@ -1,8 +1,8 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (displayln "hello world")
 
 
 (displayln (format "hello ~a" "again"))
 
 (printf "hello")
-(printf "world\n")
\ No newline at end of file
+(printf "world\n")
diff --git a/whalesong/tests/more-tests/images.rkt b/whalesong/tests/more-tests/images.rkt
index d27c817..570e5c9 100644
--- a/whalesong/tests/more-tests/images.rkt
+++ b/whalesong/tests/more-tests/images.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong/base
-(require (planet dyoo/whalesong/image))
+#lang whalesong/base
+(require whalesong/image)
 
 (image-color? "red")
 (image-color? "blue")
diff --git a/whalesong/tests/more-tests/isolating-bug.rkt b/whalesong/tests/more-tests/isolating-bug.rkt
index a7cc443..9f837bd 100644
--- a/whalesong/tests/more-tests/isolating-bug.rkt
+++ b/whalesong/tests/more-tests/isolating-bug.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (require (for-syntax racket/base
                      syntax/struct))
 
diff --git a/whalesong/tests/more-tests/js-binding.rkt b/whalesong/tests/more-tests/js-binding.rkt
index e1491cd..466c3d6 100644
--- a/whalesong/tests/more-tests/js-binding.rkt
+++ b/whalesong/tests/more-tests/js-binding.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/js))
+#lang whalesong
+(require whalesong/js)
 
 (define js-plus
   (js-function->procedure "function(x, y) { return x + y; }"))
diff --git a/whalesong/tests/more-tests/lists-cs019.rkt b/whalesong/tests/more-tests/lists-cs019.rkt
index 012b3f5..684d1ff 100644
--- a/whalesong/tests/more-tests/lists-cs019.rkt
+++ b/whalesong/tests/more-tests/lists-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define web-colors
  (shared ([W (cons "white" G)]
diff --git a/whalesong/tests/more-tests/lists.rkt b/whalesong/tests/more-tests/lists.rkt
index fc56698..82adf32 100644
--- a/whalesong/tests/more-tests/lists.rkt
+++ b/whalesong/tests/more-tests/lists.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 '(1 2 3)
 (list "hello" "world")
diff --git a/whalesong/tests/more-tests/man-vs-boy.rkt b/whalesong/tests/more-tests/man-vs-boy.rkt
index 5af98d9..8169021 100644
--- a/whalesong/tests/more-tests/man-vs-boy.rkt
+++ b/whalesong/tests/more-tests/man-vs-boy.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; Knuth's Man-or-boy-test.
 ;; http://rosettacode.org/wiki/Man_or_boy_test
diff --git a/whalesong/tests/more-tests/map.rkt b/whalesong/tests/more-tests/map.rkt
index 45ebce8..ec2ec9c 100644
--- a/whalesong/tests/more-tests/map.rkt
+++ b/whalesong/tests/more-tests/map.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (map (lambda (x y) (+ x y)) (list 1 2 3) (list 4 5 6))
 (map + (list 1 2 3) (list 4 5 6))
diff --git a/whalesong/tests/more-tests/module-scoping-helper.rkt b/whalesong/tests/more-tests/module-scoping-helper.rkt
index 4ec3eeb..468a02d 100644
--- a/whalesong/tests/more-tests/module-scoping-helper.rkt
+++ b/whalesong/tests/more-tests/module-scoping-helper.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (require (for-syntax racket/base))
 (provide x x++ x+1 x=0 get-x)
 (define x 0)
@@ -19,4 +19,4 @@
   (set! x (add1 x)))
 
 (define-syntax (x=0 stx)
-  #'(set-x 0))
\ No newline at end of file
+  #'(set-x 0))
diff --git a/whalesong/tests/more-tests/module-scoping.rkt b/whalesong/tests/more-tests/module-scoping.rkt
index a408ed0..a84b3ed 100644
--- a/whalesong/tests/more-tests/module-scoping.rkt
+++ b/whalesong/tests/more-tests/module-scoping.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (require "module-scoping-helper.rkt")
 x             ;; 0
 (get-x)       ;; 0
@@ -24,4 +24,4 @@ x
 
 x+1
 x
-(get-x)
\ No newline at end of file
+(get-x)
diff --git a/whalesong/tests/more-tests/nestedloop.rkt b/whalesong/tests/more-tests/nestedloop.rkt
index e6c1714..3bf0488 100644
--- a/whalesong/tests/more-tests/nestedloop.rkt
+++ b/whalesong/tests/more-tests/nestedloop.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 ;; Imperative body:
 (define (loops n)
diff --git a/whalesong/tests/more-tests/nqueens.rkt b/whalesong/tests/more-tests/nqueens.rkt
index e03f76f..599ae07 100644
--- a/whalesong/tests/more-tests/nqueens.rkt
+++ b/whalesong/tests/more-tests/nqueens.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 ;;; NQUEENS -- Compute number of solutions to 8-queens problem.
 ;; 2006/08 -- renamed `try' to `try-it' to avoid Bigloo collision (mflatt)
 ;; 2010/04 -- got rid of the one-armed id (stamourv)
diff --git a/whalesong/tests/more-tests/nucleic2.rkt b/whalesong/tests/more-tests/nucleic2.rkt
index 97152c7..2a23f6f 100644
--- a/whalesong/tests/more-tests/nucleic2.rkt
+++ b/whalesong/tests/more-tests/nucleic2.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (require (for-syntax racket/base))
 
 ; File: "nucleic2.scm"
diff --git a/whalesong/tests/more-tests/numbers.rkt b/whalesong/tests/more-tests/numbers.rkt
index 98d7e27..f3b7d1f 100644
--- a/whalesong/tests/more-tests/numbers.rkt
+++ b/whalesong/tests/more-tests/numbers.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 
 (number? 0)
@@ -35,4 +35,4 @@
 (positive? (expt 2 100))
 (negative? (expt 2 100))
 (positive? (expt -2 91))
-(negative? (expt -2 91))
\ No newline at end of file
+(negative? (expt -2 91))
diff --git a/whalesong/tests/more-tests/printing.rkt b/whalesong/tests/more-tests/printing.rkt
index 39a6f3e..cdc0b4b 100644
--- a/whalesong/tests/more-tests/printing.rkt
+++ b/whalesong/tests/more-tests/printing.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (current-print-mode "constructor")
 
@@ -23,4 +23,4 @@
 ;; This is slightly broken: we should follow DrRacket shared printing
 ;; notation.
 (shared ([a (cons 1 a)])
-  a)
\ No newline at end of file
+  a)
diff --git a/whalesong/tests/more-tests/quasi.rkt b/whalesong/tests/more-tests/quasi.rkt
index 4c674a8..ddc904f 100644
--- a/whalesong/tests/more-tests/quasi.rkt
+++ b/whalesong/tests/more-tests/quasi.rkt
@@ -1,2 +1,2 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 `(0 ,@(list 1 2) 4)
diff --git a/whalesong/tests/more-tests/ramanujan-pi.rkt b/whalesong/tests/more-tests/ramanujan-pi.rkt
index 38262c0..5daae0d 100644
--- a/whalesong/tests/more-tests/ramanujan-pi.rkt
+++ b/whalesong/tests/more-tests/ramanujan-pi.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 ;; Srinivasa Ramanujan's infinite series for approximating pi.
 
 (define (sum f a b)
@@ -32,4 +32,4 @@
   (/ 1 (1/pi-approx n)))
 
 
-(pi-approx 10)
\ No newline at end of file
+(pi-approx 10)
diff --git a/whalesong/tests/more-tests/scheme-whalesong.rkt b/whalesong/tests/more-tests/scheme-whalesong.rkt
index a91ec79..7f258b1 100644
--- a/whalesong/tests/more-tests/scheme-whalesong.rkt
+++ b/whalesong/tests/more-tests/scheme-whalesong.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 ;;; SCHEME -- A Scheme interpreter evaluating a sort, written by Marc Feeley.
 
 ; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1072,4 +1072,4 @@
 
 
 
-(scheme-eval expr1)
\ No newline at end of file
+(scheme-eval expr1)
diff --git a/whalesong/tests/more-tests/sharing-cs019.rkt b/whalesong/tests/more-tests/sharing-cs019.rkt
index ce1a54b..b018773 100644
--- a/whalesong/tests/more-tests/sharing-cs019.rkt
+++ b/whalesong/tests/more-tests/sharing-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define infinite-ones
   (shared ([a (cons 1 a)])
diff --git a/whalesong/tests/more-tests/sharing.rkt b/whalesong/tests/more-tests/sharing.rkt
index 5e64e1a..2e0d422 100644
--- a/whalesong/tests/more-tests/sharing.rkt
+++ b/whalesong/tests/more-tests/sharing.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
 (define infinite-ones
   (shared ([a (cons 1 a)])
diff --git a/whalesong/tests/more-tests/sigs-cs019.rkt b/whalesong/tests/more-tests/sigs-cs019.rkt
index 76dfa6f..d3b0969 100644
--- a/whalesong/tests/more-tests/sigs-cs019.rkt
+++ b/whalesong/tests/more-tests/sigs-cs019.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 
 (define: x : Number$ 3)
diff --git a/whalesong/tests/more-tests/simple-apply.rkt b/whalesong/tests/more-tests/simple-apply.rkt
index 3006e29..13e35fa 100644
--- a/whalesong/tests/more-tests/simple-apply.rkt
+++ b/whalesong/tests/more-tests/simple-apply.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (apply + 2 3 4 5 '())
 (apply + 2 3 4 '(5))
diff --git a/whalesong/tests/more-tests/simple-functions.rkt b/whalesong/tests/more-tests/simple-functions.rkt
index f4345b6..d593033 100644
--- a/whalesong/tests/more-tests/simple-functions.rkt
+++ b/whalesong/tests/more-tests/simple-functions.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (provide (all-defined-out))
 
@@ -10,4 +10,4 @@
 
 (f 1)
 (g 1)
-(+ (f 2) (f (g (g 2))))
\ No newline at end of file
+(+ (f 2) (f (g (g 2))))
diff --git a/whalesong/tests/more-tests/simple-loop.rkt b/whalesong/tests/more-tests/simple-loop.rkt
index 53d1bf1..63c3f0b 100644
--- a/whalesong/tests/more-tests/simple-loop.rkt
+++ b/whalesong/tests/more-tests/simple-loop.rkt
@@ -1,8 +1,8 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (let myloop ([i 0] [acc 0])
   (cond
    [(< i 100)
     (myloop (add1 i) (+ acc i))]
    [else
-    acc]))
\ No newline at end of file
+    acc]))
diff --git a/whalesong/tests/more-tests/simple-structs.rkt b/whalesong/tests/more-tests/simple-structs.rkt
index 200edc6..fa2e952 100644
--- a/whalesong/tests/more-tests/simple-structs.rkt
+++ b/whalesong/tests/more-tests/simple-structs.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (define-struct pair (f r))
 (define-struct color (r g b))
@@ -14,4 +14,4 @@
 
 (color-r (make-color 3 4 5))
 (color-g (make-color 3 4 5))
-(color-b (make-color 3 4 5))
\ No newline at end of file
+(color-b (make-color 3 4 5))
diff --git a/whalesong/tests/more-tests/simple.rkt b/whalesong/tests/more-tests/simple.rkt
index abc0e22..c8b3151 100644
--- a/whalesong/tests/more-tests/simple.rkt
+++ b/whalesong/tests/more-tests/simple.rkt
@@ -1,5 +1,5 @@
- #lang planet dyoo/whalesong
+#lang whalesong
 ;; This should invoke the use of inline-variant from 5.2.1
 (provide f)
 (define (f x) x)
-(f 2)
\ No newline at end of file
+(f 2)
diff --git a/whalesong/tests/more-tests/sk-generator-2.rkt b/whalesong/tests/more-tests/sk-generator-2.rkt
index 949c08e..d7aa510 100644
--- a/whalesong/tests/more-tests/sk-generator-2.rkt
+++ b/whalesong/tests/more-tests/sk-generator-2.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (define (make-gen gen)
  (let ([cont (box #f)])
    (lambda ()
@@ -29,4 +29,4 @@
 
 (g2)
 (g2)
-(g2)
\ No newline at end of file
+(g2)
diff --git a/whalesong/tests/more-tests/sk-generator.rkt b/whalesong/tests/more-tests/sk-generator.rkt
index 44e73bd..603fb4b 100644
--- a/whalesong/tests/more-tests/sk-generator.rkt
+++ b/whalesong/tests/more-tests/sk-generator.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 (define (make-gen gen)
  (let ([cont #f])
    (lambda ()
diff --git a/whalesong/tests/more-tests/string-tests.rkt b/whalesong/tests/more-tests/string-tests.rkt
index 8bb7147..370cb91 100644
--- a/whalesong/tests/more-tests/string-tests.rkt
+++ b/whalesong/tests/more-tests/string-tests.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/base
+#lang whalesong/base
 
 (substring "hello world" 0)
 (substring "hello world" 1)
diff --git a/whalesong/tests/more-tests/view.rkt b/whalesong/tests/more-tests/view.rkt
index e6521be..c236c9c 100644
--- a/whalesong/tests/more-tests/view.rkt
+++ b/whalesong/tests/more-tests/view.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world))
+(require whalesong/web-world)
 
 (define view (->view (xexp->dom `(html (head)
                                        (body (p "hello world, this is a test")
diff --git a/whalesong/tests/more-tests/weird-cc.rkt b/whalesong/tests/more-tests/weird-cc.rkt
index 291900d..68a4590 100644
--- a/whalesong/tests/more-tests/weird-cc.rkt
+++ b/whalesong/tests/more-tests/weird-cc.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 (define program (lambda () (let ((y (call/cc (lambda (c) c)))) (display 1) (call/cc (lambda (c) (y c))) (display 2) (call/cc (lambda (c) (y c))) (display 3))))
 
 (program)
-(newline)
\ No newline at end of file
+(newline)
diff --git a/whalesong/web-world/DESIGN b/whalesong/web-world/DESIGN
index 7b78bd2..df367bf 100644
--- a/whalesong/web-world/DESIGN
+++ b/whalesong/web-world/DESIGN
@@ -57,8 +57,8 @@ then it should be trivial to make a program that just shows
 that page:
 
 
-    #lang planet dyoo/whalesong
-    (require (planet dyoo/whalesong/web-world))
+    #lang whalesong
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -106,8 +106,8 @@ such as:
 
 and then, in the programming language, add behavior:
 
-    #lang planet dyoo/whalesong
-    (require (planet dyoo/whalesong/web-world))
+    #lang whalesong
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -181,8 +181,8 @@ If index.html contains:
 with some appropriate CSS to make the DIV look good, then the program
 will be:
 
-    #lang planet dyoo/whalesong
-    (require (planet dyoo/whalesong/web-world))
+    #lang whalesong
+    (require whalesong/web-world)
 
     (define-resource index.html)
 
@@ -236,8 +236,8 @@ handler takes, not only the world, but the current view.
 
 
 
-    #lang planet dyoo/whalesong
-    (require (planet dyoo/whalesong/web-world))
+    #lang whalesong
+    (require whalesong/web-world)
 
     (define-resource index.html)
     (define-resource style.css)
@@ -290,8 +290,8 @@ hide.
     </html>
 
 
-    #lang planet dyoo/whalesong
-    (require (planet dyoo/whalesong/web-world))
+    #lang whalesong
+    (require whalesong/web-world)
     (define-resource index.html)
 
     ;; make-item: string -> view
diff --git a/whalesong/web-world/examples/attr-animation/attr-animation.rkt b/whalesong/web-world/examples/attr-animation/attr-animation.rkt
index 4e8463b..16e582d 100644
--- a/whalesong/web-world/examples/attr-animation/attr-animation.rkt
+++ b/whalesong/web-world/examples/attr-animation/attr-animation.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
-         (planet dyoo/whalesong/web-world))
+(require whalesong/resource
+         whalesong/web-world)
 
 (define-resource index.html)
 (define-resource style.css)
diff --git a/whalesong/web-world/examples/attr-animation/index.html b/whalesong/web-world/examples/attr-animation/index.html
index b10f59b..1e8bfc7 100644
--- a/whalesong/web-world/examples/attr-animation/index.html
+++ b/whalesong/web-world/examples/attr-animation/index.html
@@ -24,10 +24,10 @@ This should be animating:
 The program for this is:
 <blockquote>
 <pre>
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
-         (planet dyoo/whalesong/web-world))
+(require whalesong/resource
+         whalesong/web-world)
 
 (define-resource index.html)
 (define-resource style.css)
diff --git a/whalesong/web-world/examples/boid/boid.rkt b/whalesong/web-world/examples/boid/boid.rkt
index 1aa45b2..513ea1f 100644
--- a/whalesong/web-world/examples/boid/boid.rkt
+++ b/whalesong/web-world/examples/boid/boid.rkt
@@ -1,9 +1,9 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/js)
-         (planet dyoo/whalesong/image)
-         (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+(require whalesong/js
+         whalesong/image
+         whalesong/web-world
+         whalesong/resource)
          
 
 (define-resource index.html)
@@ -354,4 +354,4 @@
             (to-draw draw)))
 
 
-(visualize)
\ No newline at end of file
+(visualize)
diff --git a/whalesong/web-world/examples/color-buttons/color-buttons.rkt b/whalesong/web-world/examples/color-buttons/color-buttons.rkt
index c7eb490..2bdd3b5 100644
--- a/whalesong/web-world/examples/color-buttons/color-buttons.rkt
+++ b/whalesong/web-world/examples/color-buttons/color-buttons.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+(require whalesong/web-world
+         whalesong/resource)
 
 ;; The world is a string, the current color.
 (define-resource view.html)
diff --git a/whalesong/web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt b/whalesong/web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt
index de7dddf..927ba75 100644
--- a/whalesong/web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt
+++ b/whalesong/web-world/examples/dwarves-with-remove/dwarves-with-remove.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 (define-resource index.html)
 
 ;; The world is the set of dwarfs.
diff --git a/whalesong/web-world/examples/dwarves/dwarves.rkt b/whalesong/web-world/examples/dwarves/dwarves.rkt
index f02f65b..b5e3ee6 100644
--- a/whalesong/web-world/examples/dwarves/dwarves.rkt
+++ b/whalesong/web-world/examples/dwarves/dwarves.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 (define-resource index.html)
 
 ;; The world is the set of dwarfs.
diff --git a/whalesong/web-world/examples/field/field.rkt b/whalesong/web-world/examples/field/field.rkt
index 023bf3e..9e765da 100644
--- a/whalesong/web-world/examples/field/field.rkt
+++ b/whalesong/web-world/examples/field/field.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -28,4 +28,4 @@
 
 (big-bang "Jane Doe"
           (initial-view my-view)
-          (to-draw draw))
\ No newline at end of file
+          (to-draw draw))
diff --git a/whalesong/web-world/examples/field2/field2.rkt b/whalesong/web-world/examples/field2/field2.rkt
index 8456753..90defe7 100644
--- a/whalesong/web-world/examples/field2/field2.rkt
+++ b/whalesong/web-world/examples/field2/field2.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -43,4 +43,4 @@
 (big-bang (make-world "Jane Doe" 0)
           (initial-view my-view)
           (to-draw draw)
-          (on-tick tick 1))
\ No newline at end of file
+          (on-tick tick 1))
diff --git a/whalesong/web-world/examples/forward-backward/forward-backward.rkt b/whalesong/web-world/examples/forward-backward/forward-backward.rkt
index fc7c086..a78e521 100644
--- a/whalesong/web-world/examples/forward-backward/forward-backward.rkt
+++ b/whalesong/web-world/examples/forward-backward/forward-backward.rkt
@@ -1,7 +1,7 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/resource)
-         (planet dyoo/whalesong/web-world))
+(require whalesong/resource
+         whalesong/web-world)
 
 (define-resource index.html)
 
@@ -65,4 +65,4 @@
 
 (big-bang 0
           (initial-view my-initial-view)
-          (to-draw draw))
\ No newline at end of file
+          (to-draw draw))
diff --git a/whalesong/web-world/examples/hello/hello.rkt b/whalesong/web-world/examples/hello/hello.rkt
index 0db4add..3c8c8a2 100644
--- a/whalesong/web-world/examples/hello/hello.rkt
+++ b/whalesong/web-world/examples/hello/hello.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 (define-resource style.css)
diff --git a/whalesong/web-world/examples/hello2/hello2.rkt b/whalesong/web-world/examples/hello2/hello2.rkt
index 1a9494e..004f62b 100644
--- a/whalesong/web-world/examples/hello2/hello2.rkt
+++ b/whalesong/web-world/examples/hello2/hello2.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
+#lang whalesong
 
-(require (planet dyoo/whalesong/web-world))
+(require whalesong/web-world)
 
-(big-bang 0 (initial-view "hello world"))
\ No newline at end of file
+(big-bang 0 (initial-view "hello world"))
diff --git a/whalesong/web-world/examples/hot-cross-buns/hot-cross-buns.rkt b/whalesong/web-world/examples/hot-cross-buns/hot-cross-buns.rkt
index d232623..e9550fc 100644
--- a/whalesong/web-world/examples/hot-cross-buns/hot-cross-buns.rkt
+++ b/whalesong/web-world/examples/hot-cross-buns/hot-cross-buns.rkt
@@ -1,4 +1,4 @@
-#lang planet dyoo/whalesong/cs019
+#lang whalesong/cs019
 
 (define-resource index.html)
 
@@ -58,4 +58,4 @@
 
 (big-bang '()
           (initial-view view-with-buttons-and-reset)
-          (to-draw draw))
\ No newline at end of file
+          (to-draw draw))
diff --git a/whalesong/web-world/examples/phases/phases.rkt b/whalesong/web-world/examples/phases/phases.rkt
index 9dd3b7e..8975209 100644
--- a/whalesong/web-world/examples/phases/phases.rkt
+++ b/whalesong/web-world/examples/phases/phases.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index1.html)
 (define-resource index2.html)
@@ -27,4 +27,4 @@
           (on-tick tick 1)
           (stop-when (lambda (w v)
                        (> w 10))))
-(printf "After the big bang\n")
\ No newline at end of file
+(printf "After the big bang\n")
diff --git a/whalesong/web-world/examples/redirected/redirected.rkt b/whalesong/web-world/examples/redirected/redirected.rkt
index 4dc7b81..aa0da72 100644
--- a/whalesong/web-world/examples/redirected/redirected.rkt
+++ b/whalesong/web-world/examples/redirected/redirected.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
diff --git a/whalesong/web-world/examples/tick-tock-2/tick-tock-2.rkt b/whalesong/web-world/examples/tick-tock-2/tick-tock-2.rkt
index 135d8c0..6eebc91 100644
--- a/whalesong/web-world/examples/tick-tock-2/tick-tock-2.rkt
+++ b/whalesong/web-world/examples/tick-tock-2/tick-tock-2.rkt
@@ -1,5 +1,5 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world))
+#lang whalesong
+(require whalesong/web-world)
 
 ;; tick: world view -> world
 (define (tick world view)
diff --git a/whalesong/web-world/examples/tick-tock/tick-tock.rkt b/whalesong/web-world/examples/tick-tock/tick-tock.rkt
index d64c7ea..7b225bf 100644
--- a/whalesong/web-world/examples/tick-tock/tick-tock.rkt
+++ b/whalesong/web-world/examples/tick-tock/tick-tock.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
diff --git a/whalesong/web-world/examples/todo/todo.rkt b/whalesong/web-world/examples/todo/todo.rkt
index d7999ca..374e0a8 100644
--- a/whalesong/web-world/examples/todo/todo.rkt
+++ b/whalesong/web-world/examples/todo/todo.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 ;; The world is our TODO list, represented as a list of strings.
 
@@ -83,4 +83,4 @@
 (big-bang (list (new-item "milk")
                 (new-item "eggs"))
           (initial-view the-view)
-          (to-draw draw))
\ No newline at end of file
+          (to-draw draw))
diff --git a/whalesong/web-world/examples/where-am-i/where-am-i.rkt b/whalesong/web-world/examples/where-am-i/where-am-i.rkt
index 7f551ea..50154a4 100644
--- a/whalesong/web-world/examples/where-am-i/where-am-i.rkt
+++ b/whalesong/web-world/examples/where-am-i/where-am-i.rkt
@@ -1,6 +1,6 @@
-#lang planet dyoo/whalesong
-(require (planet dyoo/whalesong/web-world)
-         (planet dyoo/whalesong/resource))
+#lang whalesong
+(require whalesong/web-world
+         whalesong/resource)
 
 (define-resource index.html)
 
@@ -42,4 +42,4 @@
           (initial-view index.html)
           (to-draw draw)
           (on-location-change location-change)
-          (on-mock-location-change mock-location-change))
\ No newline at end of file
+          (on-mock-location-change mock-location-change))
diff --git a/whalesong/whalesong-helpers.rkt b/whalesong/whalesong-helpers.rkt
index 3f3ca9e..70d0d8b 100644
--- a/whalesong/whalesong-helpers.rkt
+++ b/whalesong/whalesong-helpers.rkt
@@ -16,7 +16,6 @@
          "logger.rkt"
          "parameters.rkt"
          "js-assembler/check-valid-module-source.rkt"
-         planet/version
          (for-syntax racket/base))
 
 (provide (all-defined-out))
@@ -284,4 +283,4 @@
 
 
 (define (print-version)
-  (fprintf (current-report-port) "~a\n" (this-package-version)))
\ No newline at end of file
+  (fprintf (current-report-port) "~a\n" (this-package-version)))
diff --git a/whalesong/whalesong.rkt b/whalesong/whalesong.rkt
index 99890d2..a83191b 100755
--- a/whalesong/whalesong.rkt
+++ b/whalesong/whalesong.rkt
@@ -3,13 +3,13 @@
 
 (require racket/runtime-path
          racket/path
-         planet/util)
+         syntax/modresolve)
 
 ;; We do things this way to ensure that we're using the latest
 ;; version of whalesong that's installed, and that the load-relative
 ;; path is in terms of the normalized paths, to avoid a very strange
 ;; low-level bug.
 (define whalesong.cmd
-  (resolve-planet-path '(planet dyoo/whalesong/whalesong-cmd)))
+  (resolve-module-path 'whalesong/whalesong-cmd #f))
 
-(dynamic-require (normalize-path whalesong.cmd) #f)
\ No newline at end of file
+(dynamic-require (normalize-path whalesong.cmd) #f)