diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 0eeb605..2e5f5f7 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -166,23 +166,22 @@ return {
           require("actions-preview").code_actions, opts)
 
         -- Goto mappings
-        vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
         vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+        vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
         vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
-        vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
-
-        -- Get references to symbol under cursor, store in quickfix window
-        vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+        vim.keymap.set('n', 'go', vim.lsp.buf.type_definition, opts)
+        vim.keymap.set('n', 'gr', ':Telescope lsp_references<CR>', opts)
+        vim.keymap.set('n', 'gs', ':Telescope lsp_document_symbols<CR>', opts)
 
         -- Refactoring mappings
         vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
 
-        -- Format whole buffer mapping
-        vim.keymap.set('n', '<leader>gq', vim.lsp.buf.format, opts)
-
         -- Help mappings
         vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
         vim.keymap.set('i', '<C-h>', vim.lsp.buf.signature_help, opts)
+
+        -- Format whole buffer mapping
+        vim.keymap.set('n', '<leader>gq', vim.lsp.buf.format, opts)
       end
     })
 
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 1fb472c..3e1cee4 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -37,8 +37,6 @@ return {
     vim.keymap.set('n', '<leader>rg', ':Telescope grep_string<CR>', opts)
     vim.keymap.set('n', '<leader>gb', ':Telescope buffers<CR>', opts)
     vim.keymap.set('n', '<leader>gh', ':Telescope help_tags<CR>', opts)
-    vim.keymap.set('n', '<leader>gs', ':Telescope lsp_document_symbols<CR>', opts)
-    vim.keymap.set('n', '<leader>gr', ':Telescope lsp_references<CR>', opts)
 
     require('easypick').setup({
       pickers = { },