                    "Eval function at point and goto next")
 
   (zomp-add-seperator zomp-sep-1)
-  (zomp-add-action zomp-tl-exit [(control c)(control q)] "Exit toplevel")
-  (zomp-add-action zomp-start-or-show-toplevel
+  (zomp-add-action zomp-tl-exit [(control c)(control q)] "Exit Zomp shell")
+  (zomp-add-action zomp-start-or-show-shell
                    [(control c)(control s)]
-                   "Start toplevel")
+                   "Start Zomp shell")
   (zomp-add-action zomp-request-execution-abort
                    [(control c)(control k)]
                    "Request app to pause")

  (if confirm-msg
      `(defun ,name () (interactive)
         (when (y-or-n-p ,confirm-msg)
           (zomp-tl-do ,command)))
    `(defun ,name () (interactive) (zomp-tl-do ,command))))

(zomp-dofun zomp-tl-exit "!exit" "Really quit running toplevel? ")
(zomp-dofun zomp-tl-list-all-bindings "!bindings")
(zomp-dofun zomp-tl-help "!help")
(zomp-dofun zomp-tl-toggle-llvm-printing "!llvm")

(defun zomp-tl-sexpr-syntax ()
  "Use indentation based syntax"
  (interactive)
  (zomp-shell-do "!")
  (zomp-shell-do "!syntax indent"))
(defun zomp-tl-indent-syntax ()
  "Use sepxr based syntax (deprecated)"
  (interactive)
  (zomp-shell-do "!")
  (zomp-shell-do "!syntax sexpr"))

(defmacro zomp-add-action (command key caption &rest path)
  `(list (local-set-key ,key (quote ,command))
