autoload/lsp/diag.vim                                   | 2 +-
 autoload/lsp/handlers.vim                               | 2 +-
 autoload/lsp/lsp.vim                                    | 2 +-
 autoload/lsp/lspoptions.vim => autoload/lsp/options.vim | 0 
 autoload/lsp/outline.vim                                | 2 +-
 autoload/lsp/signature.vim                              | 2 +-
 autoload/lsp/symbol.vim                                 | 2 +-
 plugin/lsp.vim                                          | 6 +++---

diff --git a/autoload/lsp/diag.vim b/autoload/lsp/diag.vim
index e7696e4c28c63611d83afd724621c09e8c2299d7..9b8c76c8dcc3362b5a49aa3f2dc6602563a00bb2 100644
--- a/autoload/lsp/diag.vim
+++ b/autoload/lsp/diag.vim
@@ -2,7 +2,7 @@ vim9script
 
 # Functions related to handling LSP diagnostics.
 
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 import './util.vim'
 
 # Remove the diagnostics stored for buffer 'bnr'
diff --git a/autoload/lsp/handlers.vim b/autoload/lsp/handlers.vim
index b2f0750eb3ace382c093c338032c0c523fba60f0..5f808a5aa0183ebccc763c10d0f6ea3d6731f66f 100644
--- a/autoload/lsp/handlers.vim
+++ b/autoload/lsp/handlers.vim
@@ -4,7 +4,7 @@ # Handlers for messages from the LSP server
 # Refer to https://microsoft.github.io/language-server-protocol/specification
 # for the Language Server Protocol (LSP) specificaiton.
 
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 import './util.vim'
 import './diag.vim'
 import './outline.vim'
diff --git a/autoload/lsp/lsp.vim b/autoload/lsp/lsp.vim
index f6039aa5fcdc159aac29c7e3c8d70e521bf8da8b..d1e1c0d7329871a77368d5439ffa0eb80302b9a9 100644
--- a/autoload/lsp/lsp.vim
+++ b/autoload/lsp/lsp.vim
@@ -7,7 +7,7 @@ if v:version < 900
   finish
 endif
 
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 import './lspserver.vim' as lserver
 import './util.vim'
 import './buffer.vim' as buf
diff --git a/autoload/lsp/lspoptions.vim b/autoload/lsp/options.vim
rename from autoload/lsp/lspoptions.vim
rename to autoload/lsp/options.vim
diff --git a/autoload/lsp/outline.vim b/autoload/lsp/outline.vim
index 5be07bb62ee3d3ee15c79888839657de3d275167..1469c4b61c608244d1c99a6de8b49cd4177ecdcb 100644
--- a/autoload/lsp/outline.vim
+++ b/autoload/lsp/outline.vim
@@ -1,7 +1,7 @@
 vim9script
 
 import './util.vim'
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 
 # jump to a symbol selected in the outline window
 def OutlineJumpToSymbol()
diff --git a/autoload/lsp/signature.vim b/autoload/lsp/signature.vim
index 60887ff648d6dc380999846cf97624f15a133b85..cc85b3099b6fcd42708816dbb2ba0dd2af6ace8b 100644
--- a/autoload/lsp/signature.vim
+++ b/autoload/lsp/signature.vim
@@ -2,7 +2,7 @@ vim9script
 
 # Functions related to handling LSP symbol signature help.
 
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 import './util.vim'
 import './buffer.vim' as buf
 
diff --git a/autoload/lsp/symbol.vim b/autoload/lsp/symbol.vim
index 7b36488bca80330e74ef147fd5a56f6e00c98a42..57e98092fdd8c22532701e061c676c0a9d3ad734 100644
--- a/autoload/lsp/symbol.vim
+++ b/autoload/lsp/symbol.vim
@@ -6,7 +6,7 @@ #   - show symbol references
 #   - jump to a symbol definition, declaration, type definition or
 #     implementation
 
-import './lspoptions.vim' as opt
+import './options.vim' as opt
 import './util.vim'
 
 # Handle keys pressed when the workspace symbol popup menu is displayed
diff --git a/plugin/lsp.vim b/plugin/lsp.vim
index 3aef1c4d29524ac764438a54bfba6b5eed792ebd..0974a12ffd02ff9b718dfd6e44546bf76588663c 100644
--- a/plugin/lsp.vim
+++ b/plugin/lsp.vim
@@ -7,11 +7,11 @@ vim9script
 
 # Language Server Protocol (LSP) plugin for vim
 
-import autoload '../autoload/lsp/lspoptions.vim'
+import autoload '../autoload/lsp/options.vim'
 import autoload '../autoload/lsp/lsp.vim'
 
 def g:LspOptionsSet(opts: dict<any>)
-  lspoptions.OptionsSet(opts)
+  options.OptionsSet(opts)
 enddef
 
 def g:LspServerTraceEnable()
@@ -32,7 +32,7 @@   autocmd BufNewFile,BufReadPost * lsp.AddFile(expand('<abuf>')->str2nr())
   # Note that when BufWipeOut is invoked, the current buffer may be different
   # from the buffer getting wiped out.
   autocmd BufWipeOut * lsp.RemoveFile(expand('<abuf>')->str2nr())
-  if lspoptions.lspOptions.showDiagOnStatusLine
+  if options.lspOptions.showDiagOnStatusLine
     autocmd CursorMoved * lsp.LspShowCurrentDiagInStatusLine()
   endif
 augroup END