diff --git a/plugins/lsp/language-servers/default.nix b/plugins/lsp/language-servers/default.nix
index 47883c43..8aad6f15 100644
--- a/plugins/lsp/language-servers/default.nix
+++ b/plugins/lsp/language-servers/default.nix
@@ -136,9 +136,10 @@ let
       package = pkgs.elmPackages.elm-language-server;
     }
     {
-      name = "emmet_ls";
+      name = "emmet-ls";
       description = "emmet_ls, emmet support based on LSP";
       package = pkgs.emmet-ls;
+      serverName = "emmet_ls";
     }
     {
       name = "eslint";
@@ -302,10 +303,11 @@ let
       serverName = "nginx_language_server";
     }
     {
-      name = "nil_ls";
+      name = "nil-ls";
       description = "nil for Nix";
       package = pkgs.nil;
-      settingsOptions = import ./nil_ls-settings.nix { inherit lib helpers; };
+      serverName = "nil_ls";
+      settingsOptions = import ./nil-ls-settings.nix { inherit lib helpers; };
       settings = cfg: { nil = cfg; };
     }
     {
@@ -401,9 +403,10 @@ let
       package = pkgs.perlPackages.PLS;
     }
     {
-      name = "pest_ls";
+      name = "pest-ls";
       description = "pest_ls for pest";
       package = pkgs.pest-ide-tools;
+      serverName = "pest_ls";
     }
     {
       name = "phpactor";
diff --git a/plugins/lsp/language-servers/nil_ls-settings.nix b/plugins/lsp/language-servers/nil-ls-settings.nix
similarity index 100%
rename from plugins/lsp/language-servers/nil_ls-settings.nix
rename to plugins/lsp/language-servers/nil-ls-settings.nix
diff --git a/tests/test-sources/plugins/lsp/_lsp.nix b/tests/test-sources/plugins/lsp/_lsp.nix
index 739aba6b..f12d5ed5 100644
--- a/tests/test-sources/plugins/lsp/_lsp.nix
+++ b/tests/test-sources/plugins/lsp/_lsp.nix
@@ -66,7 +66,7 @@
           enable = true;
           package = null;
         };
-        nil_ls.enable = true;
+        nil-ls.enable = true;
         rust-analyzer = {
           enable = true;
           installCargo = true;
@@ -125,7 +125,7 @@
             dockerls.enable = true;
             efm.enable = true;
             elmls.enable = true;
-            emmet_ls.enable = true;
+            emmet-ls.enable = true;
             eslint.enable = true;
             elixirls.enable = true;
             fortls.enable = true;
@@ -152,7 +152,7 @@
             marksman.enable = true;
             metals.enable = true;
             nginx-language-server.enable = true;
-            nil_ls.enable = true;
+            nil-ls.enable = true;
             nimls.enable = true;
             nixd.enable = true;
             nushell.enable = true;
@@ -167,7 +167,7 @@
             # TODO: re-enable this test when fixed
             omnisharp.enable = !pkgs.stdenv.isDarwin;
             perlpls.enable = true;
-            pest_ls.enable = true;
+            pest-ls.enable = true;
             prismals.enable = true;
             prolog-ls.enable = true;
             purescriptls.enable = true;
diff --git a/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix b/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix
index 51bd3765..59852165 100644
--- a/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix
+++ b/tests/test-sources/plugins/lsp/language-servers/nil-ls.nix
@@ -3,7 +3,7 @@
     plugins.lsp = {
       enable = true;
 
-      servers.nil_ls = {
+      servers.nil-ls = {
         enable = true;
 
         settings = {