diff --git a/scribblings/decode.scrbl b/scribblings/decode.scrbl
index 6ba689d..cd27e1d 100644
--- a/scribblings/decode.scrbl
+++ b/scribblings/decode.scrbl
@@ -174,7 +174,7 @@ For instance, earlier we saw how to double elements by using @racket[_txexpr-ele
 (print (decode tx #:inline-txexpr-proc doubler))
 ] 
 
-Caution: when returning list values, it's possible to trip over the unavoidable ambiguity between a @racket[txexpr?] and a list of @racket[txexpr-element?]s that happens to begin with a symbolic entity: 
+Caution: when returning list values, it's possible to trip over the unavoidable ambiguity between a @racket[txexpr?] and a list of @racket[xexpr?]s that happens to begin with a symbolic entity: 
 
 @examples[#:eval my-eval
 (code:comment @#,t{An ambiguous expression})
diff --git a/scribblings/template.scrbl b/scribblings/template.scrbl
index 56ecaf0..7b00201 100644
--- a/scribblings/template.scrbl
+++ b/scribblings/template.scrbl
@@ -79,13 +79,13 @@ Be careful not to pass existing HTML strings into this function, because the ang
 (select
 [key symbolish?]
 [value-source (or/c hash? txexpr? pagenode? pathish?)])
-(or/c #f txexpr-element?)]
+(or/c #f xexpr?)]
 
 @defproc[
 (select*
 [key symbolish?]
 [value-source (or/c hash? txexpr? pagenode? pathish?)])
-(or/c #f (listof txexpr-element?))]
+(or/c #f (listof xexpr?))]
 
 )]
 Find matches for @racket[_key] in @racket[_value-source]. The @racket[_value-source] can be 1) a hashtable of @racket[metas], 2) a tagged X-expression representing a @racket[doc], or 3) a pagenode or path that identifies a source file that provides @racket[metas] and @racket[doc]. In that case, first look for @racket[_key] in @code{metas} (using @racket[select-from-metas]) and then in @code{doc} (using @racket[select-from-doc]). 
@@ -101,7 +101,7 @@ In both cases, you get @racket[#f] if there are no matches.
 (select-from-metas
 [key symbolish?]
 [meta-source (or/c hash? pagenodeish? pathish?)])
-(or/c #f txexpr-element?)]
+(or/c #f xexpr?)]
 Look up the value of @racket[_key] in @racket[_meta-source]. The @racket[_meta-source] argument can be either 1) a hashtable representing @racket[metas] or 2) a pagenode or source path that identifies a source file that provides @racket[metas]. If no value exists for @racket[_key], you get @racket[#f].
 
 @examples[#:eval my-eval
@@ -123,7 +123,7 @@ Look up the value of @racket[_key] in @racket[_meta-source]. The @racket[_meta-s
 (select-from-doc
 [key symbolish?]
 [doc-source (or/c txexpr? pagenodeish? pathish?)])
-(or/c #f (listof txexpr-element?))]
+(or/c #f (listof xexpr?))]
 Look up the value of @racket[_key] in @racket[_doc-source]. The @racket[_doc-source] argument can be either 1) a tagged X-expression representing a @racket[doc] or 2) a pagenode or source path that identifies a source file that provides @racket[doc]. If no value exists for @racket[_key], you get @racket[#f].
 
 @examples[#:eval my-eval