diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt
index ee384e07..cf209f17 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/info.rkt
@@ -2,17 +2,14 @@
 
 (define collection 'multi)
 
-(define deps '("scheme-lib"
-               "srfi-lite-lib"
+(define deps '("srfi-lite-lib"
                "base"
 	       "net-lib"
                "draw-lib"
                "rackunit-lib"
                "rackunit-gui"
                "typed-racket-lib"
-               "typed-racket-compatibility"
                "gui-lib"))
-(define build-deps '("scribble-lib"))
 
 (define pkg-desc "Types for various libraries")
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt
index 9abefcc0..db52f5d7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/framework/prefs-contract.rkt
@@ -1,6 +1,6 @@
-#lang scheme/base
+#lang racket/base
 
-(require (for-syntax scheme/base)
+(require (for-syntax racket/base)
          framework/framework)
 
 (provide (rename-out [-preferences:get preferences:get])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt
index 2fa0519e..d7002cd9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/mred/mred.rkt
@@ -1,4 +1,4 @@
-#lang typed/scheme/base
+#lang typed/racket/base
 
 (require typed/private/utils)
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt
index 9e11fb7a..1965c9d4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/gui.rkt
@@ -1,4 +1,4 @@
-#lang typed/scheme
+#lang typed/racket
 (require typed/rackunit
          typed/private/utils)
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt
index 22285a57..cf4d8395 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/main.rkt
@@ -1,4 +1,4 @@
-#lang typed/scheme
+#lang typed/racket
 (require typed/private/utils
          typed/private/rewriter
          "type-env-ext.rkt")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt
index 4a24dbb3..81a88f81 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/text-ui.rkt
@@ -1,4 +1,4 @@
-#lang typed/scheme
+#lang typed/racket
 (require typed/rackunit
          typed/private/utils)
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt
index c77616b6..c73a0780 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-more/typed/rackunit/type-env-ext.rkt
@@ -1,9 +1,9 @@
-#lang scheme/base
+#lang racket/base
 
 (require typed-racket/utils/utils
          (prefix-in ru: (combine-in rackunit rackunit/private/test-case rackunit/private/check))
          (for-syntax
-          scheme/base syntax/parse
+          racket/base syntax/parse
           (utils tc-utils)
           (env init-envs)
           (except-in (rep filter-rep object-rep type-rep) make-arr)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt
index ab8a53ea..354220f9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/info.rkt
@@ -13,7 +13,8 @@
                      "htdp-lib"
                      "sandbox-lib"
                      "unstable-flonum-lib"
-                     "unstable"))
+                     "unstable"
+                     "scribble-lib"))
 
 (define pkg-desc "tests for \"typed-racket\"")
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed/tests/test-docs-complete.rkt
similarity index 100%
rename from pkgs/typed-racket-pkgs/typed-racket-more/typed/tests/test-docs-complete.rkt
rename to pkgs/typed-racket-pkgs/typed-racket-test/tests/typed/tests/test-docs-complete.rkt