diff --git a/rc/base/lint.kak b/rc/base/lint.kak
index 604a3f2b9..b5df16bed 100644
--- a/rc/base/lint.kak
+++ b/rc/base/lint.kak
@@ -81,7 +81,7 @@ def lint-disable -docstring "Disable automatic diagnostics of the code" %{
     remove-hooks window lint-diagnostics
 }
 
-def lint-next -docstring "Jump to the next line that contains an error" %{
+def lint-next-error -docstring "Jump to the next line that contains an error" %{
     update-option buffer lint_errors
     %sh{
         printf '%s\n' "$kak_opt_lint_errors" | sed -e 's/\([^\\]\):/\1\n/g' | tail -n +2 | {
@@ -102,7 +102,7 @@ def lint-next -docstring "Jump to the next line that contains an error" %{
         }
     }}
 
-def lint-prev -docstring "Jump to the previous line that contains an error" %{
+def lint-previous-error -docstring "Jump to the previous line that contains an error" %{
     update-option buffer lint_errors
     %sh{
         printf '%s\n' "$kak_opt_lint_errors" | sed -e 's/\([^\\]\):/\1\n/g' | tail -n +2 | sort -t. -k1,1 -rn | {
diff --git a/rc/core/grep.kak b/rc/core/grep.kak
index 6f3ea3219..414b9bdba 100644
--- a/rc/core/grep.kak
+++ b/rc/core/grep.kak
@@ -57,7 +57,7 @@ def -hidden grep-jump %{
     }
 }
 
-def grep-next -docstring 'Jump to the next grep match' %{
+def grep-next-match -docstring 'Jump to the next grep match' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*grep*'
         exec "%opt{grep_current_line}g<a-l>/^[^:]+:\d+:<ret>"
@@ -66,7 +66,7 @@ def grep-next -docstring 'Jump to the next grep match' %{
     try %{ eval -client %opt{toolsclient} %{ exec %opt{grep_current_line}g } }
 }
 
-def grep-prev -docstring 'Jump to the previous grep match' %{
+def grep-previous-match -docstring 'Jump to the previous grep match' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*grep*'
         exec "%opt{grep_current_line}g<a-/>^[^:]+:\d+:<ret>"
diff --git a/rc/core/make.kak b/rc/core/make.kak
index eb689f308..09821e4e2 100644
--- a/rc/core/make.kak
+++ b/rc/core/make.kak
@@ -62,7 +62,7 @@ def -hidden make-jump %{
     }
 }
 
-def make-next -docstring 'Jump to the next make error' %{
+def make-next-error -docstring 'Jump to the next make error' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*make*'
         exec "%opt{make_current_error_line}ggl" "/^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"
@@ -71,7 +71,7 @@ def make-next -docstring 'Jump to the next make error' %{
     try %{ eval -client %opt{toolsclient} %{ exec %opt{make_current_error_line}g } }
 }
 
-def make-prev -docstring 'Jump to the previous make error' %{
+def make-previous-error -docstring 'Jump to the previous make error' %{
     eval -collapse-jumps -try-client %opt{jumpclient} %{
         buffer '*make*'
         exec "%opt{make_current_error_line}g" "<a-/>^(?:\w:)?[^:\n]+:\d+:(?:\d+:)?%opt{make_error_pattern}<ret>"