diff --git a/lazy-lock.json b/lazy-lock.json
index 2a93f78..f1a9f4b 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -13,7 +13,7 @@
   "goto-preview": { "branch": "main", "commit": "b428db4d2a5b7c06e149a020e31b2121fbf57a67" },
   "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" },
   "indent-blankline.nvim": { "branch": "master", "commit": "9301e434dd41154ffe5c3d5b8a5c9acd075ebeff" },
-  "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
+  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "22d2186bee730d68f6fd3bb2d19a389784c37a96" },
   "lsp_signature.nvim": { "branch": "master", "commit": "33250c84c7a552daf28ac607d9d9e82f88cd0907" },
   "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 2a30e01..b5093ad 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -35,7 +35,10 @@ return {
     },
 
     -- NOTE: Git
-    "f-person/git-blame.nvim",
+    {
+        "f-person/git-blame.nvim",
+        cmd = "GitBlameToggle"
+    },
 
     {
         "lewis6991/gitsigns.nvim",
diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua
index 044c7cf..faa7019 100644
--- a/lua/plugins/whichkey.lua
+++ b/lua/plugins/whichkey.lua
@@ -35,7 +35,14 @@ local function config()
             l = {
                 name = "LSP",
                 f = { "<cmd>lua vim.lsp.buf.format { async = true }<CR>", "Format" },
-                a = { "<cmd>lua vim.lsp.buf.code_action()<CR>", "Code Action" }
+                a = { "<cmd>lua vim.lsp.buf.code_action()<CR>", "Code Action" },
+                r = { "<cmd>lua vim.lsp.buf.rename()<CR>", "Rename" }
+            },
+
+            -- Spectre
+            r = {
+                name = "Spectre",
+                R = { "<cmd>lua require('spectre').toggle()<CR>", "Replace All" }
             },
 
             -- Misc
@@ -58,10 +65,7 @@ local function config()
         ["<S-TAB>"] = { "<cmd>BufferPrevious<CR>", "Previous buffer" },
 
         -- Find in file
-        ["<C-f>"] = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find in file" },
-
-        -- Text replacer in file
-        ["<C-r>"] = { "<cmd>lua require('spectre').toggle()<CR>", "Replace in file" }
+        ["<C-f>"] = { "<cmd>Telescope current_buffer_fuzzy_find<CR>", "Find in file" }
     })
 end