diff --git a/collects/unstable/automata/nfa-ep.rkt b/collects/unstable/automata/nfa-ep.rkt
index 78bfd0a47a..20c690a2aa 100644
--- a/collects/unstable/automata/nfa-ep.rkt
+++ b/collects/unstable/automata/nfa-ep.rkt
@@ -1,8 +1,8 @@
 #lang racket/base
 (require "nfa.rkt"
          (for-syntax syntax/parse
+                     syntax/stx
                      racket/syntax
-                     unstable/syntax
                      syntax/id-table
                      racket/dict
                      racket/list
@@ -34,13 +34,13 @@
             (list* state (append-map state->epsilons es)))))
     (with-syntax*
         ([((start* ...) ...)
-          (syntax-map state->epsilons #'(start ...))]
+          (stx-map state->epsilons #'(start ...))]
          [((((next-state* ...) ...) ...) ...)
-          (syntax-map (λ (ns*)
-                        (syntax-map (λ (ns)
-                                      (syntax-map state->epsilons ns))
-                                    ns*))
-                      #'(((next-state ...) ...) ...))])
+          (stx-map (λ (ns*)
+                     (stx-map (λ (ns)
+                                (stx-map state->epsilons ns))
+                              ns*))
+                   #'(((next-state ...) ...) ...))])
       (syntax/loc stx
         (nfa (start* ... ...)
              (end ...)
diff --git a/collects/unstable/automata/nfa.rkt b/collects/unstable/automata/nfa.rkt
index eaed7cace0..2a22afc90a 100644
--- a/collects/unstable/automata/nfa.rkt
+++ b/collects/unstable/automata/nfa.rkt
@@ -7,9 +7,9 @@
          racket/set
          racket/list
          (for-syntax syntax/parse
+                     syntax/stx
                      syntax/id-table
                      racket/syntax
-                     unstable/syntax
                      racket/dict
                      racket/list
                      racket/base))
@@ -45,7 +45,7 @@
          [start-set start-set]
          [((next-state_n ...) ...)
           (for/list ([states (in-list (syntax->list #'(((next-state ...) ...) ...)))])
-            (syntax-map set->num states))]
+            (stx-map set->num states))]
          ; Use optimized version if there are not too many states
          [op= (if is-fixnum? #'unsafe-fx= #'=)]
          [bit-shift (if is-fixnum? #'unsafe-fxlshift #'arithmetic-shift)]