Change defun name
Fix missing with-eval-after-load