Rename a couple lisp functions