diff --git a/aider/queries/tree-sitter-language-pack/tree-sitter-javascript-tags.scm b/aider/queries/tree-sitter-language-pack/javascript-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-language-pack/tree-sitter-javascript-tags.scm
rename to aider/queries/tree-sitter-language-pack/javascript-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-c-tags.scm b/aider/queries/tree-sitter-languages/c-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-c-tags.scm
rename to aider/queries/tree-sitter-languages/c-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-c_sharp-tags.scm b/aider/queries/tree-sitter-languages/c_sharp-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-c_sharp-tags.scm
rename to aider/queries/tree-sitter-languages/c_sharp-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-cpp-tags.scm b/aider/queries/tree-sitter-languages/cpp-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-cpp-tags.scm
rename to aider/queries/tree-sitter-languages/cpp-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-dart-tags.scm b/aider/queries/tree-sitter-languages/dart-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-dart-tags.scm
rename to aider/queries/tree-sitter-languages/dart-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-elisp-tags.scm b/aider/queries/tree-sitter-languages/elisp-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-elisp-tags.scm
rename to aider/queries/tree-sitter-languages/elisp-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-elixir-tags.scm b/aider/queries/tree-sitter-languages/elixir-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-elixir-tags.scm
rename to aider/queries/tree-sitter-languages/elixir-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-elm-tags.scm b/aider/queries/tree-sitter-languages/elm-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-elm-tags.scm
rename to aider/queries/tree-sitter-languages/elm-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-go-tags.scm b/aider/queries/tree-sitter-languages/go-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-go-tags.scm
rename to aider/queries/tree-sitter-languages/go-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-hcl-tags.scm b/aider/queries/tree-sitter-languages/hcl-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-hcl-tags.scm
rename to aider/queries/tree-sitter-languages/hcl-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-java-tags.scm b/aider/queries/tree-sitter-languages/java-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-java-tags.scm
rename to aider/queries/tree-sitter-languages/java-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-javascript-tags.scm b/aider/queries/tree-sitter-languages/javascript-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-javascript-tags.scm
rename to aider/queries/tree-sitter-languages/javascript-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-kotlin-tags.scm b/aider/queries/tree-sitter-languages/kotlin-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-kotlin-tags.scm
rename to aider/queries/tree-sitter-languages/kotlin-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-ocaml-tags.scm b/aider/queries/tree-sitter-languages/ocaml-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-ocaml-tags.scm
rename to aider/queries/tree-sitter-languages/ocaml-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-php-tags.scm b/aider/queries/tree-sitter-languages/php-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-php-tags.scm
rename to aider/queries/tree-sitter-languages/php-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-python-tags.scm b/aider/queries/tree-sitter-languages/python-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-python-tags.scm
rename to aider/queries/tree-sitter-languages/python-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-ql-tags.scm b/aider/queries/tree-sitter-languages/ql-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-ql-tags.scm
rename to aider/queries/tree-sitter-languages/ql-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-ruby-tags.scm b/aider/queries/tree-sitter-languages/ruby-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-ruby-tags.scm
rename to aider/queries/tree-sitter-languages/ruby-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-rust-tags.scm b/aider/queries/tree-sitter-languages/rust-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-rust-tags.scm
rename to aider/queries/tree-sitter-languages/rust-tags.scm
diff --git a/aider/queries/tree-sitter-languages/tree-sitter-typescript-tags.scm b/aider/queries/tree-sitter-languages/typescript-tags.scm
similarity index 100%
rename from aider/queries/tree-sitter-languages/tree-sitter-typescript-tags.scm
rename to aider/queries/tree-sitter-languages/typescript-tags.scm
diff --git a/aider/repomap.py b/aider/repomap.py
index cdf047936..4379cc0af 100644
--- a/aider/repomap.py
+++ b/aider/repomap.py
@@ -739,7 +739,7 @@ def get_scm_fname(lang):
             path = resources.files(__package__).joinpath(
                 "queries",
                 subdir,
-                f"tree-sitter-{lang}-tags.scm",
+                f"{lang}-tags.scm",
             )
             if path.exists():
                 return path
@@ -752,7 +752,7 @@ def get_scm_fname(lang):
         return resources.files(__package__).joinpath(
             "queries",
             subdir,
-            f"tree-sitter-{lang}-tags.scm",
+            f"{lang}-tags.scm",
         )
     except KeyError:
         return