Renaming to clojure convention