diff --git a/lang/doclang_raw.rkt b/lang/doclang-raw.rkt
similarity index 100%
rename from lang/doclang_raw.rkt
rename to lang/doclang-raw.rkt
diff --git a/main.rkt b/main.rkt
index 82c3557..00266b8 100644
--- a/main.rkt
+++ b/main.rkt
@@ -5,8 +5,8 @@
 
 (define-syntax-rule (new-module-begin body-exprs ...)
   (#%module-begin
-   (module inner pollen/lang/doclang_raw
-     ;; first three lines are positional arguments for doclang_raw
+   (module inner pollen/lang/doclang-raw
+     ;; first three lines are positional arguments for doclang-raw
      ;; doclang_raw is a version of scribble/doclang with the decoder disabled
      main-raw ; id of export
      (λ(x) x) ; post-process function
@@ -60,7 +60,7 @@
    (define wants-decoder? (member here-ext (map to-string DECODABLE_EXTENSIONS)))
    (define main (apply (cond
                          [(equal? here-ext "ptree") (λ xs (decode (cons PTREE_ROOT_NODE xs)
-                             #:xexpr-elements-proc (λ(xs) (filter (compose1 not (bound/c whitespace?)) xs))))]
+                             #:xexpr-elements-proc (λ(xs) (filter (compose1 not (def/c whitespace?)) xs))))]
                          ;; 'root is the hook for the decoder function.
                          ;; If it's not a defined identifier, it just hits #%top and becomes `(root ,@body ...)
                          [wants-decoder? root]
diff --git a/tests/bound contract/bound.rkt b/tests/bound contract/bound.rkt
deleted file mode 100644
index 36679d2..0000000
--- a/tests/bound contract/bound.rkt	
+++ /dev/null
@@ -1,14 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base))
-
-(provide bound/c (rename-out (top~ #%top)))
-
-(define-syntax-rule (top~ . id)
-   (λ x `(id ,@x)))
-
-(define-syntax (bound/c stx)
-   (syntax-case stx ()
-     [(_ x)
-      (if (identifier-binding #'x )
-          #'x
-          #'(#%top . x))]))
diff --git a/tests/bound contract/test.rkt b/tests/bound contract/test.rkt
deleted file mode 100644
index 1763334..0000000
--- a/tests/bound contract/test.rkt	
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang racket/base
-(require "bound.rkt")
-
-(bar "hello") ; bar is unbound
-((bound/c bar) "hello")
diff --git a/top.rkt b/top.rkt
index d5faa5b..58359be 100644
--- a/top.rkt
+++ b/top.rkt
@@ -37,7 +37,7 @@
     `(id ,@(if (equal? attrs null) null (list (reverse attrs))) ,@body)))
 
 
-(define-syntax (bound/c stx)
+(define-syntax (def/c stx)
   (syntax-case stx ()
     [(_ x)
      (if (identifier-binding #'x )