diff --git a/syndicate/event-expander.rkt b/syndicate/event-expander.rkt
index ada38e4..ddfee62 100644
--- a/syndicate/event-expander.rkt
+++ b/syndicate/event-expander.rkt
@@ -13,7 +13,7 @@
   #:macro-definer-name define-event-expander
   #:introducer-parameter-name current-event-expander-introducer
   #:local-introduce-name syntax-local-event-expander-introduce
-  #:expander-id-predicate-name event-expander-id?
+  #:expander-form-predicate-name event-expander-form?
   #:expander-transform-name event-expander-transform)
 
 (provide (for-syntax
@@ -21,6 +21,6 @@
           event-expander?
           event-expander-proc
           syntax-local-event-expander-introduce
-          event-expander-id?
+          event-expander-form?
           event-expander-transform)
          define-event-expander)
diff --git a/syndicate/pattern-expander.rkt b/syndicate/pattern-expander.rkt
index 14eedeb..780c707 100644
--- a/syndicate/pattern-expander.rkt
+++ b/syndicate/pattern-expander.rkt
@@ -13,7 +13,7 @@
   #:macro-definer-name define-pattern-expander
   #:introducer-parameter-name current-pattern-expander-introducer
   #:local-introduce-name syntax-local-pattern-expander-introduce
-  #:expander-id-predicate-name pattern-expander-id?
+  #:expander-form-predicate-name pattern-expander-form?
   #:expander-transform-name pattern-expander-transform)
 
 (provide (for-syntax
@@ -21,6 +21,6 @@
           pattern-expander?
           pattern-expander-proc
           syntax-local-pattern-expander-introduce
-          pattern-expander-id?
+          pattern-expander-form?
           pattern-expander-transform)
          define-pattern-expander)
diff --git a/syndicate/pattern.rkt b/syndicate/pattern.rkt
index 7720752..6c315da 100644
--- a/syndicate/pattern.rkt
+++ b/syndicate/pattern.rkt
@@ -122,8 +122,8 @@
     (let walk ((stx stx))
       (define disarmed-stx (syntax-disarm stx orig-insp))
       (syntax-case disarmed-stx ($ quasiquote unquote quote)
-        [(expander args ...)
-         (pattern-expander-id? #'expander)
+        [expander
+         (pattern-expander-form? #'expander)
          (pattern-expander-transform disarmed-stx
                                      (lambda (result) (walk (syntax-rearm result stx))))]
 
@@ -187,8 +187,8 @@
     (let walk ((stx stx))
       (define disarmed-stx (syntax-disarm stx orig-insp))
       (syntax-case disarmed-stx ($ quasiquote unquote quote)
-        [(expander args ...)
-         (pattern-expander-id? #'expander)
+        [expander
+         (pattern-expander-form? #'expander)
          (pattern-expander-transform disarmed-stx
                                      (lambda (result) (walk (syntax-rearm result stx))))]
 
@@ -246,8 +246,8 @@
     (let walk ((stx stx))
       (define disarmed-stx (syntax-disarm stx orig-insp))
       (syntax-case disarmed-stx ($ quasiquote unquote quote)
-        [(expander args ...)
-         (pattern-expander-id? #'expander)
+        [expander
+         (pattern-expander-form? #'expander)
          (pattern-expander-transform disarmed-stx
                                      (lambda (result) (walk (syntax-rearm result stx))))]
 
diff --git a/syndicate/syntax.rkt b/syndicate/syntax.rkt
index c5edc8d..54644d3 100644
--- a/syndicate/syntax.rkt
+++ b/syndicate/syntax.rkt
@@ -366,7 +366,7 @@
                                              (hash-ref assertion-map handle))
                                            (hash-remove! assertion-map handle)
                                            expr ...)))))))]
-      [(_ (expander args ...) body ...) #:when (event-expander-id? #'expander)
+      [(_ (expander args ...) body ...) #:when (event-expander-form? #'(expander args ...))
        (event-expander-transform #'(expander [args ...] body ...) (lambda (r) (syntax-rearm r stx)))]
       [_
        (raise-syntax-error #f "Invalid event pattern")])))