                                        [:namespaces ns :macro-aliases (symbol sym-ns)])]
                 (ns-resolve full-ns (symbol (name sym)))
                 (ns-resolve (symbol sym-ns) (symbol (name sym))))
-              (get-in (env/deref-env) [:namespaces ns :mcacro-mappings sym]))]
+              (get-in (env/deref-env) [:namespaces ns :macro-mappings sym]))]
     (when (:macro (meta var))
       var)))
 

(declare analyze-ns)
(defn ensure-loaded [ns env]
  (or (-> (env/deref-env) :namespaces ns)
      (analyze-ns ns env)))

(defn populate-env
  [{:keys [import require require-macros refer-clojure]} ns-name env]

  ([form env opts]
     (prewalk (analyze form env opts) cleanup)))

(defn analyze-ns [ns]
  (env/ensure (global-env)
    (let [res (ns-resource ns)]
      (assert res (str "Can't find " ns " in classpath"))
