diff --git a/plugs/editor/editor.plug.yaml b/plugs/editor/editor.plug.yaml
index 03c1a53..88671e3 100644
--- a/plugs/editor/editor.plug.yaml
+++ b/plugs/editor/editor.plug.yaml
@@ -25,14 +25,14 @@ functions:
   openPageNavigator:
     path: editor.ts:openPageNavigator
     command:
-      name: "Page Navigator"
+      name: "Navigate: Page Picker"
       key: "Ctrl-k"
       mac: "Cmd-k"
 
   openTemplateNavigator:
     path: editor.ts:openTemplateNavigator
     command:
-      name: "Template Picker"
+      name: "Navigate: Template Picker"
       key: "Ctrl-Shift-t"
       mac: "Cmd-Shift-t"
 
diff --git a/website/CHANGELOG.md b/website/CHANGELOG.md
index 15fa6e4..14b7699 100644
--- a/website/CHANGELOG.md
+++ b/website/CHANGELOG.md
@@ -18,7 +18,7 @@ _Not yet released, this will likely become 0.6.0. To try this out now, check out
   * Reload your page 2-3x to be sure you have the latest front-end code running
   * Run the {[Library: Import]} command in your space, and enter the following federation URL: `!silverbullet.md/Library/` This will import both the [[Library/Core]] and [[Library/Journal]] libraries into your space, which will bring you roughly on par with 0.5.x versions in terms of functionality (this will include the daily note, weekly note, various slash commands etc.)
 * A **quick FAQ** on the template system
-  * **Where did my templates go!?** They have now moved to the [[Template Picker]], run {[Template Picker]} (or press `Cmd-Shift-t` on Mac or `Ctrl-Shift-t` on Windows/Linux). Yeah, that’s new!
+  * **Where did my templates go!?** They have now moved to the [[Template Picker]], run {[Navigate: Page Picker]} (or press `Cmd-Shift-t` on Mac or `Ctrl-Shift-t` on Windows/Linux). Yeah, that’s new!
   * **Where did all my slash commands go?!** They are now distributed via [[Libraries]]. Yep, Libraries are here, enabling an easier way to distribute templates and pages. Read [[Libraries]] for more info.
   * **But, what about slash templates etc.?!** Yeah, we did some rebranding and changed how these are defined. Slash templates are now [[Snippets]] and cannot _just_ be instantiated via [[Slash Commands]], but through [[Commands]] and custom keybindings as well. Awesomeness.
   * **And my page templates broke!?** Yeah, same story as with [[Snippets]]: the format for defining these changed a bit, but should be easy to update to the new format: check [[Page Templates]].