diff --git a/boon-colemak.el b/boon-colemak.el
index f04a540..a8ff672 100644
--- a/boon-colemak.el
+++ b/boon-colemak.el
@@ -62,8 +62,8 @@
 
 ;; w,f
 ;; where is? find?
-(define-key boon-moves-map "w" '("where was?" . boon-backward-search-map))
-(define-key boon-moves-map "f" '("find forward" . boon-forward-search-map))
+(define-key boon-moves-map "w" '("where was?" . boon-navigate-backward))
+(define-key boon-moves-map "f" '("find forward" . boon-navigate-forward))
 
 (define-key boon-moves-map "W"  'boon-qsearch-previous)
 (define-key boon-moves-map "F"  'boon-qsearch-next)
diff --git a/boon-keys.el b/boon-keys.el
index 815b8d4..047b052 100644
--- a/boon-keys.el
+++ b/boon-keys.el
@@ -9,9 +9,6 @@
 
 (require 'boon-core)
 
-(defalias 'boon-backward-search-map 'boon-navigate-backward)
-(defalias 'boon-forward-search-map 'boon-navigate-forward)
-
 (define-prefix-command 'boon-goto-map)
 (set-keymap-parent boon-goto-map goto-map)
 (set-keymap-parent boon-goto-map goto-map)
diff --git a/boon-qwerty.el b/boon-qwerty.el
index 76af9e9..077a7f3 100644
--- a/boon-qwerty.el
+++ b/boon-qwerty.el
@@ -59,8 +59,8 @@
 
 ;; w,e
 ;; where is? elsewhere?
-(define-key boon-moves-map "w" '("where was?" . boon-backward-search-map))
-(define-key boon-moves-map "e" '("elsewhere?" . boon-forward-search-map))
+(define-key boon-moves-map "w" '("where was?" . boon-navigate-backward))
+(define-key boon-moves-map "e" '("elsewhere?" . boon-navigate-forward))
 
 (define-key boon-moves-map "W"  'boon-qsearch-previous)
 (define-key boon-moves-map "E"  'boon-qsearch-next)
diff --git a/boon-qwertz.el b/boon-qwertz.el
index 4c52882..e8a2712 100644
--- a/boon-qwertz.el
+++ b/boon-qwertz.el
@@ -59,8 +59,8 @@
 
 ;; w,e
 ;; where is? elsewhere?
-(define-key boon-moves-map "w" '("where was?" . boon-backward-search-map))
-(define-key boon-moves-map "e" '("elsewhere?" . boon-forward-search-map))
+(define-key boon-moves-map "w" '("where was?" . boon-navigate-backward))
+(define-key boon-moves-map "e" '("elsewhere?" . boon-navigate-forward))
 
 (define-key boon-moves-map "W"  'boon-qsearch-previous)
 (define-key boon-moves-map "E"  'boon-qsearch-next)
diff --git a/boon-tutorial.el b/boon-tutorial.el
index 53c0234..ea689d4 100644
--- a/boon-tutorial.el
+++ b/boon-tutorial.el
@@ -592,20 +592,20 @@ Searching for all occurences of a string is bound to the key
 
 Once you have completed a search you can quickly navigate
 through the list of searches using the keys
-`\\[boon-backward-search-map]' " (boon-mnemonic 'boon-backward-search-map) " and `\\[boon-forward-search-map]' "(boon-mnemonic 'boon-forward-search-map)".
+`\\[boon-navigate-backward]' " (boon-mnemonic 'boon-navigate-backward) " and `\\[boon-navigate-forward]' "(boon-mnemonic 'boon-navigate-forward)".
 
 >> Type `\\[occur]' navig <Return>
->> Examine some of the occurences in the buffer using `\\[boon-backward-search-map]' and `\\[boon-forward-search-map]'.
+>> Examine some of the occurences in the buffer using `\\[boon-navigate-backward]' and `\\[boon-navigate-forward]'.
 
 >> Type `\\[isearch-forward]' navig <Return>
 >> Examine some more of the occurences in the buffer. 
 
-The keys `\\[boon-backward-search-map]' and `\\[boon-forward-search-map]' will perform by default `previous-error' and
+The keys `\\[boon-navigate-backward]' and `\\[boon-navigate-forward]' will perform by default `previous-error' and
 `next-error', which are in fact versatile navigation commands in
 Emacs, allowing you to browse not only errors but `occur' or grep
 occurences and many other things depending on context.  However, additionally, if you
 have performed a search using `isearch', `swiper' or
-\\[boon-qsearch-next-at-point] and \\[boon-qsearch-previous-at-point], then `\\[boon-backward-search-map]' (backward) and `\\[boon-forward-search-map]'
+\\[boon-qsearch-next-at-point] and \\[boon-qsearch-previous-at-point], then `\\[boon-navigate-backward]' (backward) and `\\[boon-navigate-forward]'
 will navigate through the matches. Finally, the same keys will
 cycle through multiple cursors when they are active.
 (Use \\[boon-quit] to exit such contexts.)
diff --git a/boon-workman.el b/boon-workman.el
index fc7f991..edc4030 100644
--- a/boon-workman.el
+++ b/boon-workman.el
@@ -53,8 +53,8 @@
 
 ;; w,f
 ;; where is? find?
-(define-key boon-moves-map "d" 'boon-backward-search-map)
-(define-key boon-moves-map "r" 'boon-forward-search-map)
+(define-key boon-moves-map "d" 'boon-navigate-backward)
+(define-key boon-moves-map "r" 'boon-navigate-forward)
 
 (define-key boon-moves-map (kbd "D")  'boon-qsearch-previous)
 (define-key boon-moves-map (kbd "R")  'boon-qsearch-next)