diff --git a/.gitmodules b/.gitmodules
index ad100a00..d5bd61c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -170,7 +170,7 @@
 	path = helix-syntax/languages/tree-sitter-fish
 	url = https://github.com/ram02z/tree-sitter-fish
 	shallow = true
-[submodule "helix-syntax/languages/tree-sitter-gitcommit"]
-	path = helix-syntax/languages/tree-sitter-gitcommit
-	url = https://github.com/the-mikedavis/tree-sitter-gitcommit.git
+[submodule "helix-syntax/languages/tree-sitter-git-commit"]
+	path = helix-syntax/languages/tree-sitter-git-commit
+	url = https://github.com/the-mikedavis/tree-sitter-git-commit.git
 	shallow = true
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index d6e0d9af..9c42005b 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -11,7 +11,7 @@
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | elixir | ✓ |  |  | `elixir-ls` |
 | fish | ✓ | ✓ | ✓ |  |
-| gitcommit | ✓ |  |  |  |
+| git-commit | ✓ |  |  |  |
 | glsl | ✓ |  | ✓ |  |
 | go | ✓ | ✓ | ✓ | `gopls` |
 | html | ✓ |  |  |  |
diff --git a/helix-syntax/languages/tree-sitter-git-commit b/helix-syntax/languages/tree-sitter-git-commit
new file mode 160000
index 00000000..5cd4776c
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-git-commit
@@ -0,0 +1 @@
+Subproject commit 5cd4776c86c82d9d6afdc8c73a47a08057aef618
diff --git a/helix-syntax/languages/tree-sitter-gitcommit b/helix-syntax/languages/tree-sitter-gitcommit
deleted file mode 160000
index 6a2ddbec..00000000
--- a/helix-syntax/languages/tree-sitter-gitcommit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a2ddbecd49fa8e7e1fda24d43e363cfd9171ca0
diff --git a/languages.toml b/languages.toml
index f73011c8..616ef234 100644
--- a/languages.toml
+++ b/languages.toml
@@ -475,7 +475,7 @@ indent = { tab-width = 2, unit = "  " }
 language-server = { command = "docker-langserver", args = ["--stdio"] }
 
 [[language]]
-name = "gitcommit"
+name = "git-commit"
 scope = "git.commitmsg"
 roots = []
 file-types = ["COMMIT_EDITMSG"]
diff --git a/runtime/queries/gitcommit/highlights.scm b/runtime/queries/git-commit/highlights.scm
similarity index 100%
rename from runtime/queries/gitcommit/highlights.scm
rename to runtime/queries/git-commit/highlights.scm
diff --git a/runtime/queries/gitcommit/injections.scm b/runtime/queries/git-commit/injections.scm
similarity index 100%
rename from runtime/queries/gitcommit/injections.scm
rename to runtime/queries/git-commit/injections.scm