diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index ca547d2..4555434 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -594,13 +594,15 @@ return {
         ["<C-a>a"] = { function() vim.lsp.buf.code_action() end, desc = "LSP Code Action" },
         ["<C-a>c"] = { _G.Claude_toggle, desc = "Claude Toggle" },
         ["<C-a>h"] = { function() vim.lsp.buf.hover() end, desc = "LSP Hover" },
-        ["<C-a>d"] = {
-          function() require("snacks").picker.lsp_definitions() end,
-          desc = "Find LSP definitions",
-        },
         ["<C-a>r"] = {
-          function() require("snacks").picker.lsp_references() end,
-          desc = "Find LSP references",
+          function() return ":IncRename " .. vim.fn.expand "<cword>" end,
+          expr = true,
+          desc = "Rename current symbol",
+          cond = "textDocument/rename",
+        },
+        ["<C-a>d"] = {
+          function() require("snacks").picker.diagnostics() end,
+          desc = "Find LSP diagnostics",
         },
         ["<C-a>s"] = {
           function() require("snacks").picker.lsp_symbols() end,
diff --git a/lua/polish.lua b/lua/polish.lua
index 244f2a4..6ad474b 100644
--- a/lua/polish.lua
+++ b/lua/polish.lua
@@ -99,3 +99,7 @@ if ok_overseer then
     end,
   }
 end
+
+require("inc_rename").setup {
+  input_buffer_type = "snacks",
+}