Rename nvim_lsp to lspconfig

58 files changed, 126 insertions, 126 deletions

diff --git a/lua/nvim_lsp.lua b/lua/lspconfig.lua
index 2b9154ad..cc9b38bc 100644
--- a/lua/nvim_lsp.lua
+++ b/lua/lspconfig.lua
@@ -1,7 +1,7 @@
-local configs = require 'nvim_lsp/configs'
+local configs = require 'lspconfig/configs'
 
 local M = {
-  util = require 'nvim_lsp/util';
+  util = require 'lspconfig/util';
 }
 
 function M.available_servers()
@@ -17,14 +17,14 @@ function M.installable_servers()
 end
 
 M._root = {}
--- Called from plugin/nvim_lsp.vim because it requires knowing that the last
--- script in scriptnames to be executed is nvim_lsp.
+-- Called from plugin/lspconfig.vim because it requires knowing that the last
+-- script in scriptnames to be executed is lspconfig.
 function M._root._setup()
   M._root.commands = {
     LspInstall = {
       function(name)
         if configs[name] == nil then
-          pcall(require('nvim_lsp/'..name))
+          pcall(require('lspconfig/'..name))
         end
         local config = configs[name]
         if not config then
@@ -40,7 +40,7 @@ function M._root._setup()
       end;
       "-nargs=1";
       "-complete=custom,v:lua.lsp_complete_installable_servers";
-      description = '`:LspInstall {name}` installs a server under stdpath("cache")/nvim_lsp/{name}';
+      description = '`:LspInstall {name}` installs a server under stdpath("cache")/lspconfig/{name}';
     };
     LspInstallInfo = {
       function(name)
@@ -54,7 +54,7 @@ function M._root._setup()
           return print(vim.inspect(res))
         end
         if configs[name] == nil then
-          pcall(require('nvim_lsp/'..name))
+          pcall(require('lspconfig/'..name))
         end
         local config = configs[name]
         if not config then
@@ -74,7 +74,7 @@ end
 local mt = {}
 function mt:__index(k)
   if configs[k] == nil then
-    require('nvim_lsp/'..k)
+    require('lspconfig/'..k)
   end
   return configs[k]
 end
diff --git a/lua/nvim_lsp/als.lua b/lua/lspconfig/als.lua
index 60605718..c5c4a116 100755
--- a/lua/nvim_lsp/als.lua
+++ b/lua/lspconfig/als.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local server_name = 'als'
 local bin_name = 'ada_language_server'
 
@@ -83,7 +83,7 @@ Ada language server. Use `LspInstall als` to install it.
 Can be configured by passing a "settings" object to `als.setup{}`:
 
 ```lua
-require('nvim_lsp').als.setup{
+require('lspconfig').als.setup{
     settings = {
       ada = {
         projectFile = "project.gpr";
diff --git a/lua/nvim_lsp/angularls.lua b/lua/lspconfig/angularls.lua
index 88006f62..f579909f 100644
--- a/lua/nvim_lsp/angularls.lua
+++ b/lua/lspconfig/angularls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = 'angularls'
 local bin_name = server_name
diff --git a/lua/nvim_lsp/bashls.lua b/lua/lspconfig/bashls.lua
index 0bc9604c..59b21079 100644
--- a/lua/nvim_lsp/bashls.lua
+++ b/lua/lspconfig/bashls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "bashls"
 local bin_name = "bash-language-server"
diff --git a/lua/nvim_lsp/ccls.lua b/lua/lspconfig/ccls.lua
index 32cc30e9..d167249d 100644
--- a/lua/nvim_lsp/ccls.lua
+++ b/lua/lspconfig/ccls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.ccls = {
   default_config = {
diff --git a/lua/nvim_lsp/clangd.lua b/lua/lspconfig/clangd.lua
index f369febb..d165edbb 100644
--- a/lua/nvim_lsp/clangd.lua
+++ b/lua/lspconfig/clangd.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 -- https://clangd.llvm.org/extensions.html#switch-between-sourceheader
 local function switch_source_header(bufnr)
diff --git a/lua/nvim_lsp/clojure_lsp.lua b/lua/lspconfig/clojure_lsp.lua
index f314b309..f1ec6932 100644
--- a/lua/nvim_lsp/clojure_lsp.lua
+++ b/lua/lspconfig/clojure_lsp.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.clojure_lsp = {
   default_config = {
diff --git a/lua/nvim_lsp/cmake.lua b/lua/lspconfig/cmake.lua
index b47d23a2..9dbcf717 100755
--- a/lua/nvim_lsp/cmake.lua
+++ b/lua/lspconfig/cmake.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.cmake = {
   default_config = {
diff --git a/lua/nvim_lsp/codeqlls.lua b/lua/lspconfig/codeqlls.lua
index 613d551e..ffe08df4 100644
--- a/lua/nvim_lsp/codeqlls.lua
+++ b/lua/lspconfig/codeqlls.lua
@@ -1,5 +1,5 @@
-local configs = require "nvim_lsp/configs"
-local util = require "nvim_lsp/util"
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "codeqlls"
 
diff --git a/lua/nvim_lsp/configs.lua b/lua/lspconfig/configs.lua
index deca856e..16ef9949 100644
--- a/lua/nvim_lsp/configs.lua
+++ b/lua/lspconfig/configs.lua
@@ -1,4 +1,4 @@
-local util = require 'nvim_lsp/util'
+local util = require 'lspconfig/util'
 local api, validate, lsp = vim.api, vim.validate, vim.lsp
 local tbl_extend = vim.tbl_extend
 
@@ -99,7 +99,7 @@ function configs.__newindex(t, config_name, config_def)
       trigger = "BufReadPost *"
     end
     api.nvim_command(string.format(
-        "autocmd %s lua require'nvim_lsp'[%q].manager.try_add()"
+        "autocmd %s lua require'lspconfig'[%q].manager.try_add()"
         , trigger
         , config.name
         ))
@@ -154,7 +154,7 @@ function configs.__newindex(t, config_name, config_def)
           M._setup_buffer(client.id)
         else
           api.nvim_command(string.format(
-              "autocmd BufEnter <buffer=%d> ++once lua require'nvim_lsp'[%q]._setup_buffer(%d)"
+              "autocmd BufEnter <buffer=%d> ++once lua require'lspconfig'[%q]._setup_buffer(%d)"
               , bufnr
               , config_name
               , client.id
diff --git a/lua/nvim_lsp/cssls.lua b/lua/lspconfig/cssls.lua
index 5517e7a1..7b50950a 100644
--- a/lua/nvim_lsp/cssls.lua
+++ b/lua/lspconfig/cssls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "cssls"
 local bin_name = "css-languageserver"
diff --git a/lua/nvim_lsp/dartls.lua b/lua/lspconfig/dartls.lua
index 182204cf..1baf05d6 100644
--- a/lua/nvim_lsp/dartls.lua
+++ b/lua/lspconfig/dartls.lua
@@ -1,5 +1,5 @@
-local nvim_lsp = require 'nvim_lsp'
-local configs = require 'nvim_lsp/configs'
+local util = require 'lspconfig/util'
+local configs = require 'lspconfig/configs'
 
 local server_name = "dartls"
 local bin_name = "dart"
@@ -31,7 +31,7 @@ configs[server_name] = {
   default_config = {
     cmd = {bin_name, analysis_server_snapshot_path(), "--lsp"};
     filetypes = {"dart"};
-    root_dir = nvim_lsp.util.root_pattern("pubspec.yaml");
+    root_dir = util.root_pattern("pubspec.yaml");
     init_options = {
       onlyAnalyzeProjectsWithOpenFiles = "false",
       suggestFromUnimportedLibraries = "true",
diff --git a/lua/nvim_lsp/diagnosticls.lua b/lua/lspconfig/diagnosticls.lua
index 4bdd5226..c4f26220 100644
--- a/lua/nvim_lsp/diagnosticls.lua
+++ b/lua/lspconfig/diagnosticls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "diagnosticls"
 local bin_name = "diagnostic-languageserver"
diff --git a/lua/nvim_lsp/dockerls.lua b/lua/lspconfig/dockerls.lua
index 941d2c84..572e4701 100644
--- a/lua/nvim_lsp/dockerls.lua
+++ b/lua/lspconfig/dockerls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "dockerls"
 local bin_name = "docker-langserver"
diff --git a/lua/nvim_lsp/efm.lua b/lua/lspconfig/efm.lua
index 621d2be1..d4fc88ac 100644
--- a/lua/nvim_lsp/efm.lua
+++ b/lua/lspconfig/efm.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "efm"
 local bin_name = "efm-langserver"
diff --git a/lua/nvim_lsp/elixirls.lua b/lua/lspconfig/elixirls.lua
index d0a2fbd6..fcd91a04 100644
--- a/lua/nvim_lsp/elixirls.lua
+++ b/lua/lspconfig/elixirls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "elixirls"
 local bin_name = "elixir-ls"
@@ -90,7 +90,7 @@ This language server does not provide a global binary, but must be installed man
 Fetching the elixir-ls repository from GitHub, compiling it and then installing it.
 
 ```lua
-require'nvim_lsp'.elixirls.setup{
+require'lspconfig'.elixirls.setup{
     -- Unix
     cmd = { "path/to/language_server.sh" };
     -- Windows
diff --git a/lua/nvim_lsp/elmls.lua b/lua/lspconfig/elmls.lua
index 94e1b25d..c35824c4 100644
--- a/lua/nvim_lsp/elmls.lua
+++ b/lua/lspconfig/elmls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local lsp = vim.lsp
 local api = vim.api
 
diff --git a/lua/nvim_lsp/flow.lua b/lua/lspconfig/flow.lua
index 998ecb89..5e0abab3 100644
--- a/lua/nvim_lsp/flow.lua
+++ b/lua/lspconfig/flow.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.flow = {
   default_config = {
diff --git a/lua/nvim_lsp/fortls.lua b/lua/lspconfig/fortls.lua
index a94e4dd3..7a66c703 100644
--- a/lua/nvim_lsp/fortls.lua
+++ b/lua/lspconfig/fortls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.fortls = {
   default_config = {
diff --git a/lua/nvim_lsp/gdscript.lua b/lua/lspconfig/gdscript.lua
index e4dfb5c3..ecd3288f 100644
--- a/lua/nvim_lsp/gdscript.lua
+++ b/lua/lspconfig/gdscript.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.gdscript = {
   default_config = {
diff --git a/lua/nvim_lsp/ghcide.lua b/lua/lspconfig/ghcide.lua
index ee801de6..c427d599 100644
--- a/lua/nvim_lsp/ghcide.lua
+++ b/lua/lspconfig/ghcide.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.ghcide = {
   default_config = {
diff --git a/lua/nvim_lsp/gopls.lua b/lua/lspconfig/gopls.lua
index 53638e5f..08eacc15 100644
--- a/lua/nvim_lsp/gopls.lua
+++ b/lua/lspconfig/gopls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.gopls = {
   default_config = {
diff --git a/lua/nvim_lsp/health.lua b/lua/lspconfig/health.lua
index d0e5820e..3abab080 100644
--- a/lua/nvim_lsp/health.lua
+++ b/lua/lspconfig/health.lua
@@ -1,6 +1,6 @@
 local M = {}
 function M.check_health()
-  local configs = require 'nvim_lsp/configs'
+  local configs = require 'lspconfig/configs'
 
   for _, top_level_config in pairs(configs) do
     -- If users execute `:LspInstall` or `:LspInstallInfo`,
diff --git a/lua/nvim_lsp/hie.lua b/lua/lspconfig/hie.lua
index ef3b0d92..f57326dc 100644
--- a/lua/nvim_lsp/hie.lua
+++ b/lua/lspconfig/hie.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.hie = {
   default_config = {
diff --git a/lua/nvim_lsp/hls.lua b/lua/lspconfig/hls.lua
index a55294dc..9c29b82c 100644
--- a/lua/nvim_lsp/hls.lua
+++ b/lua/lspconfig/hls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.hls = {
   default_config = {
diff --git a/lua/nvim_lsp/html.lua b/lua/lspconfig/html.lua
index e8ccc0ac..a9636222 100644
--- a/lua/nvim_lsp/html.lua
+++ b/lua/lspconfig/html.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "html"
 local bin_name = "html-languageserver"
diff --git a/lua/nvim_lsp/intelephense.lua b/lua/lspconfig/intelephense.lua
index 07d7eb09..7e381349 100644
--- a/lua/nvim_lsp/intelephense.lua
+++ b/lua/lspconfig/intelephense.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "intelephense"
 local bin_name = "intelephense"
diff --git a/lua/nvim_lsp/jdtls.lua b/lua/lspconfig/jdtls.lua
index ed0f022d..be9ba6e8 100644
--- a/lua/nvim_lsp/jdtls.lua
+++ b/lua/lspconfig/jdtls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local callbacks = require 'vim.lsp.callbacks'
 local path = util.path
 
diff --git a/lua/nvim_lsp/jedi_language_server.lua b/lua/lspconfig/jedi_language_server.lua
index e077bbbd..5fd6cbfc 100644
--- a/lua/nvim_lsp/jedi_language_server.lua
+++ b/lua/lspconfig/jedi_language_server.lua
@@ -1,4 +1,4 @@
-local configs = require 'nvim_lsp/configs'
+local configs = require 'lspconfig/configs'
 
 configs.jedi_language_server = {
   default_config = {
diff --git a/lua/nvim_lsp/jsonls.lua b/lua/lspconfig/jsonls.lua
index f384c0d9..616a0bbe 100644
--- a/lua/nvim_lsp/jsonls.lua
+++ b/lua/lspconfig/jsonls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "jsonls"
 local bin_name = "vscode-json-languageserver"
diff --git a/lua/nvim_lsp/julials.lua b/lua/lspconfig/julials.lua
index 6c30e8bd..f74ce7b7 100644
--- a/lua/nvim_lsp/julials.lua
+++ b/lua/lspconfig/julials.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local environment_directory = util.path.join(util.base_install_dir, "julials")
 
@@ -36,7 +36,7 @@ julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("Langua
 ```
 If you want to install the LanguageServer manually, you will have to ensure that the Julia environment is stored in this location:
 ```vim
-:lua print(require'nvim_lsp'.util.path.join(require'nvim_lsp'.util.base_install_dir, "julials"))
+:lua print(require'lspconfig'.util.path.join(require'lspconfig'.util.base_install_dir, "julials"))
 ```
     ]];
   };
diff --git a/lua/nvim_lsp/kotlin_language_server.lua b/lua/lspconfig/kotlin_language_server.lua
index 15fb995a..373c782c 100644
--- a/lua/nvim_lsp/kotlin_language_server.lua
+++ b/lua/lspconfig/kotlin_language_server.lua
@@ -6,8 +6,8 @@
 --- 	https://github.com/udalov/kotlin-vim (recommended)
 --- 	Note that there is no LICENSE specified yet.
 
-local util = require 'nvim_lsp/util'
-local configs = require 'nvim_lsp/configs'
+local util = require 'lspconfig/util'
+local configs = require 'lspconfig/configs'
 
 configs.kotlin_language_server = {
   default_config = {
diff --git a/lua/nvim_lsp/leanls.lua b/lua/lspconfig/leanls.lua
index 894f318b..cd6f4644 100644
--- a/lua/nvim_lsp/leanls.lua
+++ b/lua/lspconfig/leanls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.leanls = {
   default_config = {
diff --git a/lua/nvim_lsp/metals.lua b/lua/lspconfig/metals.lua
index 35b1fe5b..12e244bb 100644
--- a/lua/nvim_lsp/metals.lua
+++ b/lua/lspconfig/metals.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local server_name = "metals"
 local bin_name = "metals"
 
diff --git a/lua/nvim_lsp/nimls.lua b/lua/lspconfig/nimls.lua
index 5e91c760..f71c60f9 100644
--- a/lua/nvim_lsp/nimls.lua
+++ b/lua/lspconfig/nimls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.nimls = {
   default_config = {
diff --git a/lua/nvim_lsp/ocamlls.lua b/lua/lspconfig/ocamlls.lua
index 417529fa..05e71992 100644
--- a/lua/nvim_lsp/ocamlls.lua
+++ b/lua/lspconfig/ocamlls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "ocamlls"
 local bin_name = "ocaml-language-server"
diff --git a/lua/nvim_lsp/ocamllsp.lua b/lua/lspconfig/ocamllsp.lua
index c029e427..9efc59b4 100644
--- a/lua/nvim_lsp/ocamllsp.lua
+++ b/lua/lspconfig/ocamllsp.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.ocamllsp = {
   default_config = {
diff --git a/lua/nvim_lsp/omnisharp.lua b/lua/lspconfig/omnisharp.lua
index 4d874952..a608537d 100644
--- a/lua/nvim_lsp/omnisharp.lua
+++ b/lua/lspconfig/omnisharp.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local server_name = 'omnisharp'
 local bin_name = 'run'
 
diff --git a/lua/nvim_lsp/purescriptls.lua b/lua/lspconfig/purescriptls.lua
index 6a00caae..14465d5b 100644
--- a/lua/nvim_lsp/purescriptls.lua
+++ b/lua/lspconfig/purescriptls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "purescriptls"
 local bin_name = "purescript-language-server"
diff --git a/lua/nvim_lsp/pyls.lua b/lua/lspconfig/pyls.lua
index 6d4aeb56..fef0749d 100644
--- a/lua/nvim_lsp/pyls.lua
+++ b/lua/lspconfig/pyls.lua
@@ -1,4 +1,4 @@
-local configs = require 'nvim_lsp/configs'
+local configs = require 'lspconfig/configs'
 
 configs.pyls = {
   default_config = {
diff --git a/lua/nvim_lsp/pyls_ms.lua b/lua/lspconfig/pyls_ms.lua
index 6b66a600..a1a8b687 100644
--- a/lua/nvim_lsp/pyls_ms.lua
+++ b/lua/lspconfig/pyls_ms.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local name = "pyls_ms"
 
diff --git a/lua/nvim_lsp/r_language_server.lua b/lua/lspconfig/r_language_server.lua
index 91c619c2..d75da11f 100644
--- a/lua/nvim_lsp/r_language_server.lua
+++ b/lua/lspconfig/r_language_server.lua
@@ -1,5 +1,5 @@
-local util = require 'nvim_lsp/util'
-local configs = require 'nvim_lsp/configs'
+local util = require 'lspconfig/util'
+local configs = require 'lspconfig/configs'
 
 configs.r_language_server = {
   default_config = {
diff --git a/lua/nvim_lsp/rls.lua b/lua/lspconfig/rls.lua
index bf02986b..a1b15d9f 100644
--- a/lua/nvim_lsp/rls.lua
+++ b/lua/lspconfig/rls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.rls = {
   default_config = {
diff --git a/lua/nvim_lsp/rnix.lua b/lua/lspconfig/rnix.lua
index 50acc2ec..deaeac98 100644
--- a/lua/nvim_lsp/rnix.lua
+++ b/lua/lspconfig/rnix.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local name = "rnix"
 
diff --git a/lua/nvim_lsp/rome.lua b/lua/lspconfig/rome.lua
index 504a8bde..a8d813f2 100644
--- a/lua/nvim_lsp/rome.lua
+++ b/lua/lspconfig/rome.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.rome = {
   default_config = {
diff --git a/lua/nvim_lsp/rust_analyzer.lua b/lua/lspconfig/rust_analyzer.lua
index f5f48f01..2d545517 100644
--- a/lua/nvim_lsp/rust_analyzer.lua
+++ b/lua/lspconfig/rust_analyzer.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.rust_analyzer = {
   default_config = {
diff --git a/lua/nvim_lsp/scry.lua b/lua/lspconfig/scry.lua
index 6080f6c3..d2b5164e 100644
--- a/lua/nvim_lsp/scry.lua
+++ b/lua/lspconfig/scry.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.scry = {
   default_config = {
diff --git a/lua/nvim_lsp/solargraph.lua b/lua/lspconfig/solargraph.lua
index ee023a1c..5aa2ec17 100644
--- a/lua/nvim_lsp/solargraph.lua
+++ b/lua/lspconfig/solargraph.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local bin_name = "solargraph"
 if vim.fn.has('win32') == 1 then
diff --git a/lua/nvim_lsp/sourcekit.lua b/lua/lspconfig/sourcekit.lua
index e4dc0042..4b80b085 100644
--- a/lua/nvim_lsp/sourcekit.lua
+++ b/lua/lspconfig/sourcekit.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.sourcekit = {
   default_config = {
diff --git a/lua/nvim_lsp/sqlls.lua b/lua/lspconfig/sqlls.lua
index b17bcbc6..aced4e02 100644
--- a/lua/nvim_lsp/sqlls.lua
+++ b/lua/lspconfig/sqlls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "sqlls"
 local bin_name = "sql-language-server"
@@ -35,7 +35,7 @@ https://github.com/joe-re/sql-language-server
 `cmd` value is **not set** by default. An installer is provided via the `:LspInstall` command that uses the *nvm_lsp node_modules* directory to find the sql-language-server executable. The `cmd` value can be overriden in the `setup` table;
 
 ```lua
-require'nvim_lsp'.sqlls.setup{
+require'lspconfig'.sqlls.setup{
   cmd = {"path/to/command", "up", "--method", "stdio"};
   ...
 }
diff --git a/lua/nvim_lsp/sumneko_lua.lua b/lua/lspconfig/sumneko_lua.lua
index 129ad35f..3faca644 100644
--- a/lua/nvim_lsp/sumneko_lua.lua
+++ b/lua/lspconfig/sumneko_lua.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local name = "sumneko_lua"
 local bin_name = "lua-language-server"
@@ -114,7 +114,7 @@ guide](https://github.com/sumneko/lua-language-server/wiki/Build-and-Run-(Standa
 So you should set `cmd` yourself like this.
 
 ```lua
-require'nvim_lsp'.sumneko_lua.setup{
+require'lspconfig'.sumneko_lua.setup{
   cmd = {"path", "to", "cmd"};
   ...
 }
diff --git a/lua/nvim_lsp/terraformls.lua b/lua/lspconfig/terraformls.lua
index 76b2c2d0..7d551e5c 100644
--- a/lua/nvim_lsp/terraformls.lua
+++ b/lua/lspconfig/terraformls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 configs.terraformls = {
   default_config = {
diff --git a/lua/nvim_lsp/texlab.lua b/lua/lspconfig/texlab.lua
index 695cdaaf..b6e08927 100644
--- a/lua/nvim_lsp/texlab.lua
+++ b/lua/lspconfig/texlab.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 local lsp = vim.lsp
 
 local texlab_build_status = vim.tbl_add_reverse_lookup {
diff --git a/lua/nvim_lsp/tsserver.lua b/lua/lspconfig/tsserver.lua
index 1bfc65f4..4afc6077 100644
--- a/lua/nvim_lsp/tsserver.lua
+++ b/lua/lspconfig/tsserver.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "tsserver"
 local bin_name = "typescript-language-server"
diff --git a/lua/nvim_lsp/util.lua b/lua/lspconfig/util.lua
index 7bff215f..14eee811 100644
--- a/lua/nvim_lsp/util.lua
+++ b/lua/lspconfig/util.lua
@@ -111,7 +111,7 @@ function M.create_module_commands(module_name, commands)
     table.insert(parts, command_name)
     -- The command definition.
     table.insert(parts,
-        string.format("lua require'nvim_lsp'[%q].commands[%q][1](<f-args>)", module_name, command_name))
+        string.format("lua require'lspconfig'[%q].commands[%q][1](<f-args>)", module_name, command_name))
     api.nvim_command(table.concat(parts, " "))
   end
 end
@@ -343,7 +343,7 @@ local function zip_lists_to_map(a, b)
   return res
 end
 
-local base_install_dir = M.path.join(fn.stdpath("cache"), "nvim_lsp")
+local base_install_dir = M.path.join(fn.stdpath("cache"), "lspconfig")
 M.base_install_dir = base_install_dir
 function M.npm_installer(config)
   validate {
diff --git a/lua/nvim_lsp/vimls.lua b/lua/lspconfig/vimls.lua
index 9f715289..15e5fed1 100644
--- a/lua/nvim_lsp/vimls.lua
+++ b/lua/lspconfig/vimls.lua
@@ -1,5 +1,5 @@
-local configs = require "nvim_lsp/configs"
-local util = require "nvim_lsp/util"
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "vimls"
 local bin_name = "vim-language-server"
diff --git a/lua/nvim_lsp/vuels.lua b/lua/lspconfig/vuels.lua
index 0118e3fd..4a8774bd 100644
--- a/lua/nvim_lsp/vuels.lua
+++ b/lua/lspconfig/vuels.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "vuels"
 local bin_name = "vls"
diff --git a/lua/nvim_lsp/yamlls.lua b/lua/lspconfig/yamlls.lua
index dcdb3ac3..787e8df3 100644
--- a/lua/nvim_lsp/yamlls.lua
+++ b/lua/lspconfig/yamlls.lua
@@ -1,5 +1,5 @@
-local configs = require 'nvim_lsp/configs'
-local util = require 'nvim_lsp/util'
+local configs = require 'lspconfig/configs'
+local util = require 'lspconfig/util'
 
 local server_name = "yamlls"
 local bin_name = "yaml-language-server"