diff --git a/helpers/efmls-configs/extract.py b/helpers/efmls-configs/extract.py
index 63de4d4e..d88f97e9 100755
--- a/helpers/efmls-configs/extract.py
+++ b/helpers/efmls-configs/extract.py
@@ -11,6 +11,62 @@ tools = {
     "formatters": {},
 }
 
+identity_langs = [
+    "bash",
+    "c",
+    "clojure",
+    "cmake",
+    "crystal",
+    "csh",
+    "css",
+    "d",
+    "dart",
+    "fish",
+    "gitcommit",
+    "go",
+    "haskell",
+    "html",
+    "java",
+    "javascript",
+    "json",
+    "ksh",
+    "less",
+    "lua",
+    "markdown",
+    "nix",
+    "pawn",
+    "php",
+    "python",
+    "roslyn",
+    "ruby",
+    "rust",
+    "sass",
+    "scss",
+    "sh",
+    "slim",
+    "sml",
+    "solidity",
+    "toml",
+    "typescript",
+    "vala",
+    "vim",
+    "yaml",
+    "zsh",
+    "misc",
+]
+
+lang_map = {
+    "c#": "cs",
+    "c++": "cpp",
+    "docker": "dockerfile",
+    "objective-c": "objc",
+    "objective-c++": "objcpp",
+    "terraform": "tf",
+}
+
+for lang in identity_langs:
+    lang_map[lang] = lang
+
 for kind in ["linters", "formatters"]:
     for file in os.listdir(tool_path + "/" + kind):
         tool_name = file.removesuffix(".lua")
@@ -19,7 +75,8 @@ for kind in ["linters", "formatters"]:
             for line in f.readlines():
                 if line.startswith("-- languages:"):
                     languages = [
-                        l.strip() for l in line.split(":")[1].strip().split(",")
+                        lang_map[l.strip()]
+                        for l in line.split(":")[1].strip().split(",")
                     ]
                     break
         tools[kind][tool_name] = languages
diff --git a/plugins/lsp/language-servers/efmls-configs-tools.json b/plugins/lsp/language-servers/efmls-configs-tools.json
index eeac60e1..3679aa30 100644
--- a/plugins/lsp/language-servers/efmls-configs-tools.json
+++ b/plugins/lsp/language-servers/efmls-configs-tools.json
@@ -5,7 +5,7 @@
         ],
         "astyle": [
             "c",
-            "c++"
+            "cpp"
         ],
         "autopep8": [
             "python"
@@ -25,11 +25,11 @@
         ],
         "clang_format": [
             "c",
-            "c++"
+            "cpp"
         ],
         "clang_tidy": [
             "c",
-            "c++"
+            "cpp"
         ],
         "dartfmt": [
             "dart"
@@ -38,7 +38,7 @@
             "d"
         ],
         "dotnet_format": [
-            "c#"
+            "cs"
         ],
         "dprint": [
             "javascript",
@@ -153,16 +153,16 @@
             "lua"
         ],
         "terraform_fmt": [
-            "terraform"
+            "tf"
         ],
         "uncrustify": [
             "c",
-            "c++",
-            "c#",
+            "cpp",
+            "cs",
             "d",
             "java",
-            "objective-c",
-            "objective-c++",
+            "objc",
+            "objcpp",
             "pawn",
             "vala"
         ],
@@ -192,21 +192,21 @@
         ],
         "clang_tidy": [
             "c",
-            "c++"
+            "cpp"
         ],
         "clazy": [
-            "c++"
+            "cpp"
         ],
         "clj_kondo": [
             "clojure"
         ],
         "cppcheck": [
             "c",
-            "c++"
+            "cpp"
         ],
         "cpplint": [
             "c",
-            "c++"
+            "cpp"
         ],
         "dartanalyzer": [
             "dart"
@@ -245,7 +245,7 @@
         ],
         "gcc": [
             "c",
-            "c++"
+            "cpp"
         ],
         "gitlint": [
             "gitcommit"
@@ -260,7 +260,7 @@
             "go"
         ],
         "hadolint": [
-            "docker"
+            "dockerfile"
         ],
         "joker": [
             "clojure"
@@ -278,7 +278,7 @@
             "lua"
         ],
         "mcs": [
-            "c#"
+            "cs"
         ],
         "mypy": [
             "python"