diff --git a/autoload/nvim_treesitter.vim b/autoload/nvim_treesitter.vim
index c9f39085e..f24a98d73 100644
--- a/autoload/nvim_treesitter.vim
+++ b/autoload/nvim_treesitter.vim
@@ -7,13 +7,13 @@ function! nvim_treesitter#foldexpr() abort
 endfunction
 
 function! nvim_treesitter#installable_parsers(arglead, cmdline, cursorpos) abort
-  return luaeval("require'nvim-treesitter.parsers'.available_parsers()") + ['all']
+  return join(luaeval("require'nvim-treesitter.parsers'.available_parsers()") + ['all'], "\n")
 endfunction
 
 function! nvim_treesitter#installed_parsers(arglead, cmdline, cursorpos) abort
-  return luaeval("require'nvim-treesitter.info'.installed_parsers()") + ['all']
+  return join(luaeval("require'nvim-treesitter.info'.installed_parsers()") + ['all'], "\n")
 endfunction
 
 function! nvim_treesitter#available_modules(arglead, cmdline, cursorpos) abort
-  return luaeval("require'nvim-treesitter.configs'.available_modules()")
+  return join(luaeval("require'nvim-treesitter.configs'.available_modules()"), "\n")
 endfunction
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index 33e48125e..c37dee04e 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -251,28 +251,28 @@ M.commands = {
     run = enable_module,
     args = {
       "-nargs=1",
-      "-complete=customlist,nvim_treesitter#available_modules",
+      "-complete=custom,nvim_treesitter#available_modules",
     },
   },
   TSBufDisable = {
     run = disable_module,
     args = {
       "-nargs=1",
-      "-complete=customlist,nvim_treesitter#available_modules",
+      "-complete=custom,nvim_treesitter#available_modules",
     },
   },
   TSEnableAll = {
     run = enable_all,
     args = {
       "-nargs=+",
-      "-complete=customlist,nvim_treesitter#available_modules",
+      "-complete=custom,nvim_treesitter#available_modules",
     },
   },
   TSDisableAll = {
     run = disable_all,
     args = {
       "-nargs=+",
-      "-complete=customlist,nvim_treesitter#available_modules",
+      "-complete=custom,nvim_treesitter#available_modules",
     },
   },
 }
diff --git a/lua/nvim-treesitter/info.lua b/lua/nvim-treesitter/info.lua
index 77fd945f3..bfa44b505 100644
--- a/lua/nvim-treesitter/info.lua
+++ b/lua/nvim-treesitter/info.lua
@@ -97,7 +97,7 @@ M.commands = {
     run = module_info,
     args = {
       "-nargs=?",
-      "-complete=customlist,nvim_treesitter#available_modules",
+      "-complete=custom,nvim_treesitter#available_modules",
     },
   },
 }
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 8b4aa7835..02292672f 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -235,28 +235,28 @@ M.commands = {
     run = install(false, true),
     args = {
       "-nargs=+",
-      "-complete=customlist,nvim_treesitter#installable_parsers",
+      "-complete=custom,nvim_treesitter#installable_parsers",
     },
   },
   TSInstallSync = {
     run = install(true, true),
     args = {
       "-nargs=+",
-      "-complete=customlist,nvim_treesitter#installable_parsers",
+      "-complete=custom,nvim_treesitter#installable_parsers",
     },
   },
   TSUpdate = {
     run = M.update,
     args = {
       "-nargs=*",
-      "-complete=customlist,nvim_treesitter#installed_parsers",
+      "-complete=custom,nvim_treesitter#installed_parsers",
     },
   },
   TSUninstall = {
     run = M.uninstall,
     args = {
       "-nargs=+",
-      "-complete=customlist,nvim_treesitter#installed_parsers",
+      "-complete=custom,nvim_treesitter#installed_parsers",
     },
   },
 }