Names fixed in emacs