diff --git a/prospect-monolithic/core.rkt b/prospect-monolithic/core.rkt
index 05aeac2..7cacd58 100644
--- a/prospect-monolithic/core.rkt
+++ b/prospect-monolithic/core.rkt
@@ -243,7 +243,9 @@
   (syntax-rules ()
     [(_ #:name name-exp behavior-exp initial-state-exp initial-action-tree-exp)
      (spawn (lambda ()
-              (list (procedure-rename behavior-exp name-exp)
+              (list (let ((name name-exp)
+                          (beh behavior-exp))
+                      (if name (procedure-rename beh name) beh))
                     (transition initial-state-exp initial-action-tree-exp))))]
     [(_ behavior-exp initial-state-exp initial-action-tree-exp)
      (spawn (lambda ()
diff --git a/prospect/core.rkt b/prospect/core.rkt
index 4266391..49ef0b2 100644
--- a/prospect/core.rkt
+++ b/prospect/core.rkt
@@ -238,7 +238,9 @@
   (syntax-rules ()
     [(_ #:name name-exp behavior-exp initial-state-exp initial-action-tree-exp)
      (spawn (lambda ()
-              (list (procedure-rename behavior-exp name-exp)
+              (list (let ((name name-exp)
+                          (beh behavior-exp))
+                      (if name (procedure-rename beh name) beh))
                     (transition initial-state-exp initial-action-tree-exp))))]
     [(_ behavior-exp initial-state-exp initial-action-tree-exp)
      (spawn (lambda ()