diff --git a/collects/lang/htdp-advanced.ss b/collects/lang/htdp-advanced.ss
index 89beeea203..812ab03cc1 100644
--- a/collects/lang/htdp-advanced.ss
+++ b/collects/lang/htdp-advanced.ss
@@ -39,8 +39,8 @@
 	   (rename advanced-case case)
 	   (rename advanced-delay delay)
 	   (rename advanced-module-begin #%module-begin)
-	   (rename advanced-contract contract)
-	   (rename advanced-define-data define-data)
+	   ;; (rename advanced-contract contract)
+	   ;; (rename advanced-define-data define-data)
 	   #%datum
 	   empty true false)
 
diff --git a/collects/lang/htdp-beginner-abbr.ss b/collects/lang/htdp-beginner-abbr.ss
index 7ba4e9c1bf..b6dcb36775 100644
--- a/collects/lang/htdp-beginner-abbr.ss
+++ b/collects/lang/htdp-beginner-abbr.ss
@@ -7,6 +7,7 @@
 
   ;; Implements the forms:
   (require "private/teach.ss"
+	   "private/contract-forms.ss"
 	   "private/teachprims.ss")
 
   ;; syntax:
@@ -20,11 +21,13 @@
 	   (rename beginner-if if)
 	   (rename beginner-and and)
 	   (rename beginner-or or)
+	   ;; (rename beginner-contract contract)
+	   ;; (rename beginner-define-data define-data)
 	   (rename intermediate-quote quote)
 	   (rename intermediate-quasiquote quasiquote)
 	   (rename intermediate-unquote unquote)
 	   (rename intermediate-unquote-splicing unquote-splicing)
-	   (rename #%plain-module-begin #%module-begin)
+	   (rename beginner-module-begin #%module-begin)
 	   #%datum
 	   empty true false)
 
diff --git a/collects/lang/htdp-beginner.ss b/collects/lang/htdp-beginner.ss
index c1b2908d2d..a19540c1e5 100644
--- a/collects/lang/htdp-beginner.ss
+++ b/collects/lang/htdp-beginner.ss
@@ -25,8 +25,8 @@
 	   (rename beginner-or or)
 	   (rename beginner-quote quote)
 	   (rename beginner-module-begin #%module-begin)
-	   (rename beginner-contract contract)
-	   (rename beginner-define-data define-data)
+	   ; (rename beginner-contract contract)
+	   ; (rename beginner-define-data define-data)
 	   #%datum
 	   empty true false)
   
diff --git a/collects/lang/htdp-intermediate-lambda.ss b/collects/lang/htdp-intermediate-lambda.ss
index 883c76ae18..143e9efb7d 100644
--- a/collects/lang/htdp-intermediate-lambda.ss
+++ b/collects/lang/htdp-intermediate-lambda.ss
@@ -1,6 +1,7 @@
 
 (module htdp-intermediate-lambda mzscheme
   (require "private/teach.ss"
+	   "private/contract-forms.ss"
 	   (lib "etc.ss")
 	   (lib "list.ss")
 	   (lib "docprovide.ss" "syntax"))
@@ -26,7 +27,9 @@
 	   (rename intermediate-unquote unquote)
 	   (rename intermediate-unquote-splicing unquote-splicing)
 	   (rename intermediate-time time)
-	   (rename #%plain-module-begin #%module-begin)
+	   (rename intermediate-module-begin #%module-begin)
+	   ;; (rename intermediate-contract contract)
+	   ;; (rename intermediate-define-data define-data)
 	   #%datum
 	   empty true false)
 
diff --git a/collects/lang/htdp-intermediate.ss b/collects/lang/htdp-intermediate.ss
index d10b6eb059..b344a552c0 100644
--- a/collects/lang/htdp-intermediate.ss
+++ b/collects/lang/htdp-intermediate.ss
@@ -29,8 +29,8 @@
 	   (rename intermediate-unquote-splicing unquote-splicing)
 	   (rename intermediate-time time)
 	   (rename intermediate-module-begin #%module-begin)
-	   (rename intermediate-contract contract)
-	   (rename intermediate-define-data define-data)
+	   ;; (rename intermediate-contract contract)
+	   ;; (rename intermediate-define-data define-data)
 	   #%datum
 	   empty true false)