diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70280e780..32368a19d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -215,7 +215,7 @@ Possible scope values are:
 
 ### Folds
 
-You can define folds for a given language by adding a `fold.scm` query :
+You can define folds for a given language by adding a `folds.scm` query :
 
 ```
 @fold
diff --git a/lua/nvim-treesitter/fold.lua b/lua/nvim-treesitter/fold.lua
index 30ae288fb..b3bdb35ab 100644
--- a/lua/nvim-treesitter/fold.lua
+++ b/lua/nvim-treesitter/fold.lua
@@ -13,7 +13,7 @@ local folds_levels = utils.memoize_by_buf_tick(function(bufnr)
 
   local matches
   if query.has_fold(lang) then
-    matches = query.get_capture_matches(bufnr, "@fold", "fold")
+    matches = query.get_capture_matches(bufnr, "@fold", "folds")
   elseif query.has_locals(lang) then
     matches = query.get_capture_matches(bufnr, "@scope", "locals")
   else
diff --git a/lua/nvim-treesitter/query.lua b/lua/nvim-treesitter/query.lua
index ca991dcab..d308e59b9 100644
--- a/lua/nvim-treesitter/query.lua
+++ b/lua/nvim-treesitter/query.lua
@@ -17,7 +17,7 @@ M.base_language_map = {
   tsx = {'typescript', 'javascript', 'jsx'},
 }
 
-M.built_in_query_groups = {'highlights', 'locals', 'textobjects', 'fold'}
+M.built_in_query_groups = {'highlights', 'locals', 'textobjects', 'folds'}
 
 -- Creates a function that checks whether a certain query exists
 -- for a specific language.
diff --git a/queries/c/fold.scm b/queries/c/folds.scm
similarity index 100%
rename from queries/c/fold.scm
rename to queries/c/folds.scm
diff --git a/queries/cpp/fold.scm b/queries/cpp/folds.scm
similarity index 100%
rename from queries/cpp/fold.scm
rename to queries/cpp/folds.scm
diff --git a/queries/javascript/fold.scm b/queries/javascript/folds.scm
similarity index 100%
rename from queries/javascript/fold.scm
rename to queries/javascript/folds.scm
diff --git a/queries/lua/fold.scm b/queries/lua/folds.scm
similarity index 100%
rename from queries/lua/fold.scm
rename to queries/lua/folds.scm
diff --git a/queries/php/fold.scm b/queries/php/folds.scm
similarity index 100%
rename from queries/php/fold.scm
rename to queries/php/folds.scm
diff --git a/queries/python/fold.scm b/queries/python/folds.scm
similarity index 100%
rename from queries/python/fold.scm
rename to queries/python/folds.scm
diff --git a/queries/typescript/fold.scm b/queries/typescript/folds.scm
similarity index 100%
rename from queries/typescript/fold.scm
rename to queries/typescript/folds.scm