renamed some elisp functions