diff --git a/rc/modules/VCS/fzf-bzr.kak b/rc/modules/VCS/fzf-bzr.kak
index b594269..ee98886 100644
--- a/rc/modules/VCS/fzf-bzr.kak
+++ b/rc/modules/VCS/fzf-bzr.kak
@@ -17,7 +17,7 @@ Default arguments:
 " \
 str fzf_bzr_command "bzr"
 
-try %{ declare-user-mode fzf }
+try %{ declare-user-mode fzf-vcs }
 map global fzf-vcs -docstring "edit file from GNU Bazaar tree" 'b' '<esc>: fzf-bzr<ret>'
 
 define-command -hidden fzf-bzr %{ evaluate-commands %sh{
diff --git a/rc/modules/VCS/fzf-git.kak b/rc/modules/VCS/fzf-git.kak
index 3480ffb..d43e5d0 100644
--- a/rc/modules/VCS/fzf-git.kak
+++ b/rc/modules/VCS/fzf-git.kak
@@ -17,7 +17,7 @@ Default arguments:
 " \
 str fzf_git_command "git"
 
-try %{ declare-user-mode fzf }
+try %{ declare-user-mode fzf-vcs }
 map global fzf-vcs -docstring "edit file from Git tree" 'g' '<esc>: fzf-git<ret>'
 
 define-command -override -hidden fzf-git %{ evaluate-commands %sh{
diff --git a/rc/modules/VCS/fzf-hg.kak b/rc/modules/VCS/fzf-hg.kak
index a5241be..300f178 100644
--- a/rc/modules/VCS/fzf-hg.kak
+++ b/rc/modules/VCS/fzf-hg.kak
@@ -17,7 +17,7 @@ Default arguments:
 " \
 str fzf_hg_command "hg"
 
-try %{ declare-user-mode fzf }
+try %{ declare-user-mode fzf-vcs }
 map global fzf-vcs -docstring "edit file from mercurial tree" 'h' '<esc>: fzf-hg<ret>'
 
 define-command -hidden fzf-hg %{ evaluate-commands %sh{
diff --git a/rc/modules/VCS/fzf-svn.kak b/rc/modules/VCS/fzf-svn.kak
index 4cbf2a9..965d58f 100644
--- a/rc/modules/VCS/fzf-svn.kak
+++ b/rc/modules/VCS/fzf-svn.kak
@@ -17,7 +17,7 @@ Default arguments:
 " \
 str fzf_svn_command "svn"
 
-try %{ declare-user-mode fzf }
+try %{ declare-user-mode fzf-vcs }
 map global fzf-vcs -docstring "edit file from Subversion tree" 's' '<esc>: fzf-svn<ret>'
 
 define-command -hidden fzf-svn %{ evaluate-commands %sh{
diff --git a/rc/modules/sk-grep.kak b/rc/modules/sk-grep.kak
index c2cf1cb..d95140b 100644
--- a/rc/modules/sk-grep.kak
+++ b/rc/modules/sk-grep.kak
@@ -19,11 +19,11 @@ try %{ declare-user-mode fzf }
 
 evaluate-commands %sh{
     if [ -n "$(command -v sk)" ]; then
-        printf "%s\n" "map global fzf -docstring %{Interactive grep with skim} 'g' '<esc>: fzf-sk-interactive-grep<ret>'"
+        printf "%s\n" "map global fzf -docstring %{Interactive grep with skim} 'g' '<esc>: fzf-sk-grep<ret>'"
     fi
 }
 
-define-command -hidden fzf-sk-interactive-grep %{ evaluate-commands %sh{
+define-command -hidden fzf-sk-grep %{ evaluate-commands %sh{
     if [ -z "$(command -v sk)" ]; then
     	printf "%s\n" "echo -markup %{{Information}skim required to run this command}"
     	exit