diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index f5b61e172..bc63b9a71 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -210,7 +210,7 @@ compilation database is present in the project.")
     (if (/= (length bins) 2)
         (warn "cc-mode: couldn't find %s, disabling rtags support" bins)
       (add-hook! (c-mode c++-mode) #'rtags-start-process-unless-running)
-      (set! :jump '(c-mode c++-mode)
+      (set! :lookup '(c-mode c++-mode)
         :definition #'rtags-find-symbol-at-point
         :references #'rtags-find-references-at-point)))
 
diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el
index 7e332d5ce..bfcc5818e 100644
--- a/modules/lang/elixir/config.el
+++ b/modules/lang/elixir/config.el
@@ -18,7 +18,7 @@
   :after elixir-mode
   :hook (elixir-mode . alchemist-mode)
   :config
-  (set! :jump 'elixir-mode
+  (set! :lookup 'elixir-mode
     :definition #'alchemist-goto-definition-at-point
     :documentation #'alchemist-help-search-at-point)
   (set! :eval 'elixir-mode #'alchemist-eval-region))
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 5a8692db9..4f1e02586 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -5,7 +5,10 @@
   :config
   (set! :repl 'emacs-lisp-mode #'+emacs-lisp/repl)
   (set! :eval 'emacs-lisp-mode #'+emacs-lisp-eval)
-  (set! :jump 'emacs-lisp-mode :documentation #'describe-symbol)
+
+  ;; An xref backend is set up automatically for emacs-lisp-mode
+  (set! :lookup 'emacs-lisp-mode :documentation #'describe-symbol)
+
   (set! :rotate 'emacs-lisp-mode
     :symbols '(("t" "nil")
                ("let" "let*")
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index 2cb8222a9..a04c1b870 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -12,7 +12,7 @@
     (add-hook! go-mode (add-hook 'before-save-hook #'gofmt-before-save nil t)))
 
   (set! :repl 'go-mode #'gorepl-run)
-  (set! :jump 'go-mode
+  (set! :lookup 'go-mode
     :definition #'go-guru-definition
     :references #'go-guru-referrers
     :documentation #'godoc-at-point)
diff --git a/modules/lang/haskell/+intero.el b/modules/lang/haskell/+intero.el
index 666ef0355..9359f6b8c 100644
--- a/modules/lang/haskell/+intero.el
+++ b/modules/lang/haskell/+intero.el
@@ -11,7 +11,7 @@
   (add-hook! 'intero-mode-hook #'(flycheck-mode eldoc-mode))
 
   (set! :popup "^intero:backend:" :regex t :size 12)
-  (set! :jump 'haskell-mode :definition #'intero-goto-definition))
+  (set! :lookup 'haskell-mode :definition #'intero-goto-definition))
 
 
 (def-package! hindent
diff --git a/modules/lang/java/+eclim.el b/modules/lang/java/+eclim.el
index 8bacaa9d6..f44a4dcba 100644
--- a/modules/lang/java/+eclim.el
+++ b/modules/lang/java/+eclim.el
@@ -6,7 +6,7 @@
 (def-package! eclim
   :hook (java-mode . eclim-mode)
   :config
-  (set! :jump 'java-mode
+  (set! :lookup 'java-mode
     :definition #'eclim-java-find-declaration
     :references #'eclim-java-find-references
     :documentation #'eclim-java-show-documentation-for-current-element)
diff --git a/modules/lang/java/+meghanada.el b/modules/lang/java/+meghanada.el
index 70fc4d404..8ef176d51 100644
--- a/modules/lang/java/+meghanada.el
+++ b/modules/lang/java/+meghanada.el
@@ -10,7 +10,7 @@
         meghanada-use-eldoc t
         meghanada-use-auto-start t)
 
-  (set! :jump 'java-mode
+  (set! :lookup 'java-mode
     :definition #'meghanada-jump-declaration
     :references #'meghanada-reference)
 
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index c775bd034..f3c70e186 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -13,7 +13,7 @@
 
   (set! :repl 'js2-mode #'+javascript/repl)
   (set! :electric 'js2-mode :chars '(?\} ?\) ?.))
-  (set! :jump 'js2-mode :xref-backend #'xref-js2-xref-backend)
+  (set! :lookup 'js2-mode :xref-backend #'xref-js2-xref-backend)
 
   ;; Conform switch-case indentation to js2 normal indent
   (defvaralias 'js-switch-indent-offset 'js2-basic-offset)
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index a87ebf991..82c20f506 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -88,7 +88,7 @@ environment variables."
   :after anaconda-mode
   :config
   (set! :company-backend 'python-mode '(company-anaconda))
-  (set! :jump 'python-mode
+  (set! :lookup 'python-mode
     :definition #'anaconda-mode-find-definitions
     :references #'anaconda-mode-find-references
     :documentation #'anaconda-mode-show-doc)
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index bde7c4602..4faadda6c 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -32,7 +32,7 @@
   (unless (file-exists-p racer-cmd)
     (warn "rust-mode: racer binary can't be found; auto-completion is disabled"))
 
-  (set! :jump 'rust-mode :definition #'racer-find-definition))
+  (set! :lookup 'rust-mode :definition #'racer-find-definition))
 
 
 (def-package! company-racer
diff --git a/modules/lang/typescript/config.el b/modules/lang/typescript/config.el
index 5c42d36e9..526ff0612 100644
--- a/modules/lang/typescript/config.el
+++ b/modules/lang/typescript/config.el
@@ -23,7 +23,7 @@
   :after typescript-mode
   :config
   (set! :company-backend 'typescript-mode '(company-tide))
-  (set! :jump 'typescript-mode
+  (set! :lookup 'typescript-mode
     :definition #'tide-jump-to-definition
     :references #'tide-references
     :documentation #'tide-documentation-at-point)