diff --git a/cyclone.scm b/cyclone.scm
index 1f3de525..f93e0261 100644
--- a/cyclone.scm
+++ b/cyclone.scm
@@ -119,7 +119,7 @@
       ;; Load macros for expansion phase
       (let ((macros (filter 
                       (lambda (v) 
-                        (macro? (Cyc-get-cvar (cdr v))))
+                        (Cyc-macro? (Cyc-get-cvar (cdr v))))
                       (Cyc-global-vars))))
         (set! *defined-macros*
               (append
diff --git a/scheme/cyclone/macros.sld b/scheme/cyclone/macros.sld
index 5adb3aa5..07491673 100644
--- a/scheme/cyclone/macros.sld
+++ b/scheme/cyclone/macros.sld
@@ -52,7 +52,7 @@
     (define (macro:macro? exp defined-macros) (assoc (car exp) defined-macros))
 
     (define (macro:expand exp macro mac-env)
-      (let* ((compiled-macro? (or (macro? (Cyc-get-cvar (cadr macro)))
+      (let* ((compiled-macro? (or (Cyc-macro? (Cyc-get-cvar (cadr macro)))
                                   (procedure? (cadr macro)))))
         ;(newline)
         ;(display "/* ")
diff --git a/scheme/cyclone/transforms.sld b/scheme/cyclone/transforms.sld
index c602b198..fda4a1b2 100644
--- a/scheme/cyclone/transforms.sld
+++ b/scheme/cyclone/transforms.sld
@@ -698,7 +698,7 @@
          (let ((macro (env:lookup name env #f)))
           (cond
             ((and (tagged-list? 'macro macro)
-                  (or (macro? (Cyc-get-cvar (cadr macro)))
+                  (or (Cyc-macro? (Cyc-get-cvar (cadr macro)))
                       (procedure? (cadr macro))))
              (trace:info `(DEBUG compiled macro ,name do not redefine)))
             (else
diff --git a/scheme/eval.sld b/scheme/eval.sld
index 5774de68..0d56cfdb 100644
--- a/scheme/eval.sld
+++ b/scheme/eval.sld
@@ -272,7 +272,6 @@
       (list 'pair? pair?)
       (list 'port? port?)
       (list 'procedure? procedure?)
-      (list 'macro? macro?)
       (list 'Cyc-macro? Cyc-macro?)
       (list 'vector? vector?)
       (list 'bytevector? bytevector?)
@@ -436,7 +435,7 @@
                   #f))
          (expand 
            (lambda (macro-op)
-             (if (macro? macro-op)
+             (if (Cyc-macro? macro-op)
                ;; Compiled macro, call directly
                (analyze (apply macro-op
                               (list (cons (car exp) (operands exp))
@@ -455,7 +454,7 @@
                    a-env))))))
     (cond
       ;; compiled macro
-      ((macro? var)
+      ((Cyc-macro? var)
        (expand var))
       ;; compiled or interpreted macro in compound form
       ((compound-macro? var)