Moved to leiningen and updated some names