diff --git a/contrib/keybind.conf b/contrib/keybind.conf
index 3dded9c0..a5270c38 100644
--- a/contrib/keybind.conf
+++ b/contrib/keybind.conf
@@ -4,12 +4,12 @@
 # "elinks.conf" to include it.
 
 # vi-like navigation keys
-bind "main" "j" = "down"
-bind "main" "k" = "up"
-bind "main" "h" = "back"
-bind "main" "l" = "enter"
-bind "main" "g" = "home"
-bind "main" "G" = "end"
+bind "main" "j" = "move-link-next"
+bind "main" "k" = "move-link-prev"
+bind "main" "h" = "history-move-back"
+bind "main" "l" = "link-follow"
+bind "main" "g" = "move-document-start"
+bind "main" "G" = "move-document-end"
 
 # Keys close to the above
 bind "main" "i" = "scroll-up"
@@ -22,8 +22,8 @@ bind "main" "Alt-o" = "goto-url"
 
 # Emacs-like paging keys
 # Ctrl prefixed keys must be capital :-(
-bind "main" "Alt-v" = "page-up"
-bind "main" "Ctrl-V" = "page-down"
+bind "main" "Alt-v" = "move-page-up"
+bind "main" "Ctrl-V" = "move-page-down"
 
 # Emacs-like editing keys
 bind "edit" "Ctrl-B" = "left"