diff --git a/data/core/commands/core.lua b/data/core/commands/core.lua
index e30fe90a..dbe08a41 100644
--- a/data/core/commands/core.lua
+++ b/data/core/commands/core.lua
@@ -35,7 +35,7 @@ command.add(nil, {
     end)
   end,
 
-  ["core:command-finder"] = function()
+  ["core:find-command"] = function()
     local commands = command.get_all_valid()
     core.command_view:enter("Do Command", function(text, item)
       if item then
@@ -54,7 +54,7 @@ command.add(nil, {
     end)
   end,
 
-  ["core:file-finder"] = function()
+  ["core:find-file"] = function()
     core.command_view:enter("Open File From Project", function(text, item)
       text = item and item.text or text
       core.root_view:open_doc(core.open_doc(text))
diff --git a/data/core/keymap.lua b/data/core/keymap.lua
index 6b5180a1..19c2fdd8 100644
--- a/data/core/keymap.lua
+++ b/data/core/keymap.lua
@@ -84,8 +84,8 @@ end
 
 
 keymap.add {
-  ["ctrl+shift+p"] = "core:command-finder",
-  ["ctrl+p"] = "core:file-finder",
+  ["ctrl+shift+p"] = "core:find-command",
+  ["ctrl+p"] = "core:find-file",
   ["ctrl+o"] = "core:open-file",
   ["ctrl+n"] = "core:new-doc",
   ["alt+return"] = "core:toggle-fullscreen",
diff --git a/data/core/rootview.lua b/data/core/rootview.lua
index 3266ace9..5a978695 100644
--- a/data/core/rootview.lua
+++ b/data/core/rootview.lua
@@ -15,8 +15,8 @@ function EmptyView:draw()
   local x, y, w, h = pos.x, pos.y, self.size.x, self.size.y
   local _, y = common.draw_text(style.big_font, style.dim, "lite", "center", x, y, w, h)
   local lines = {
-    { fmt = "%s to run a command", cmd = "core:command-finder" },
-    { fmt = "%s to open a file from the project", cmd = "core:file-finder" },
+    { fmt = "%s to run a command", cmd = "core:find-command" },
+    { fmt = "%s to open a file from the project", cmd = "core:find-file" },
   }
   local th = style.font:get_height()
   for _, line in ipairs(lines) do