diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 07198e8090..382311e204 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -1421,8 +1421,8 @@ fn test_language_config_at(cx: &mut MutableAppContext) {
         )
         .with_override_query(
             r#"
-                (jsx_element) @override.element
-                (string) @override.string
+                (jsx_element) @element
+                (string) @string
             "#,
         )
         .unwrap();
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 766e181671..e926a776bd 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -829,10 +829,10 @@ impl Language {
 
         let mut values = HashMap::default();
         for (ix, name) in query.capture_names().iter().enumerate() {
-            if let Some(override_name) = name.strip_prefix("override.") {
-                let value = self.config.overrides.remove(override_name).ok_or_else(|| {
+            if !name.starts_with('_') {
+                let value = self.config.overrides.remove(name).ok_or_else(|| {
                     anyhow!(
-                        "language {:?} has override in query but not in config: {override_name:?}",
+                        "language {:?} has override in query but not in config: {name:?}",
                         self.config.name
                     )
                 })?;
diff --git a/crates/zed/src/languages/c/overrides.scm b/crates/zed/src/languages/c/overrides.scm
index 0d14e6c205..178355c67c 100644
--- a/crates/zed/src/languages/c/overrides.scm
+++ b/crates/zed/src/languages/c/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_literal) @override.string
+(comment) @comment
+(string_literal) @string
diff --git a/crates/zed/src/languages/cpp/overrides.scm b/crates/zed/src/languages/cpp/overrides.scm
index 0d14e6c205..178355c67c 100644
--- a/crates/zed/src/languages/cpp/overrides.scm
+++ b/crates/zed/src/languages/cpp/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_literal) @override.string
+(comment) @comment
+(string_literal) @string
diff --git a/crates/zed/src/languages/css/overrides.scm b/crates/zed/src/languages/css/overrides.scm
index 9617249d3c..c0db9fe327 100644
--- a/crates/zed/src/languages/css/overrides.scm
+++ b/crates/zed/src/languages/css/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string_value) @override.string
+(comment) @comment
+(string_value) @string
diff --git a/crates/zed/src/languages/elixir/overrides.scm b/crates/zed/src/languages/elixir/overrides.scm
index ed1b20d44b..1812540181 100644
--- a/crates/zed/src/languages/elixir/overrides.scm
+++ b/crates/zed/src/languages/elixir/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-[(string) (charlist)] @override.string
+(comment) @comment
+[(string) (charlist)] @string
diff --git a/crates/zed/src/languages/go/overrides.scm b/crates/zed/src/languages/go/overrides.scm
index fc32c47f68..9eb287df3f 100644
--- a/crates/zed/src/languages/go/overrides.scm
+++ b/crates/zed/src/languages/go/overrides.scm
@@ -1,6 +1,6 @@
-(comment) @override.comment
+(comment) @comment
 [
   (interpreted_string_literal)
   (raw_string_literal)
   (rune_literal)
-] @override.string
+] @string
diff --git a/crates/zed/src/languages/html/overrides.scm b/crates/zed/src/languages/html/overrides.scm
index 8f6a1f9eea..97accffd67 100644
--- a/crates/zed/src/languages/html/overrides.scm
+++ b/crates/zed/src/languages/html/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(quoted_attribute_value) @override.string
\ No newline at end of file
+(comment) @comment
+(quoted_attribute_value) @string
\ No newline at end of file
diff --git a/crates/zed/src/languages/javascript/overrides.scm b/crates/zed/src/languages/javascript/overrides.scm
index f19c1d9203..5e43c4a94a 100644
--- a/crates/zed/src/languages/javascript/overrides.scm
+++ b/crates/zed/src/languages/javascript/overrides.scm
@@ -1,9 +1,9 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string
 
 [
   (jsx_element)
   (jsx_fragment)
   (jsx_self_closing_element)
   (jsx_expression)
-] @override.element
+] @element
diff --git a/crates/zed/src/languages/json/overrides.scm b/crates/zed/src/languages/json/overrides.scm
index 83911ae4a5..746dbc5cd9 100644
--- a/crates/zed/src/languages/json/overrides.scm
+++ b/crates/zed/src/languages/json/overrides.scm
@@ -1,2 +1 @@
-(comment) @comment
-(string) @override.string
\ No newline at end of file
+(string) @string
\ No newline at end of file
diff --git a/crates/zed/src/languages/python/overrides.scm b/crates/zed/src/languages/python/overrides.scm
index 3a7ad5f035..8a58e304e5 100644
--- a/crates/zed/src/languages/python/overrides.scm
+++ b/crates/zed/src/languages/python/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string
diff --git a/crates/zed/src/languages/ruby/overrides.scm b/crates/zed/src/languages/ruby/overrides.scm
index 3a7ad5f035..8a58e304e5 100644
--- a/crates/zed/src/languages/ruby/overrides.scm
+++ b/crates/zed/src/languages/ruby/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string
diff --git a/crates/zed/src/languages/rust/overrides.scm b/crates/zed/src/languages/rust/overrides.scm
index 29128d98e7..216a395147 100644
--- a/crates/zed/src/languages/rust/overrides.scm
+++ b/crates/zed/src/languages/rust/overrides.scm
@@ -1,8 +1,8 @@
 [
   (string_literal)
   (raw_string_literal)
-] @override.string
+] @string
 [
   (line_comment)
   (block_comment)
-] @override.comment
+] @comment
diff --git a/crates/zed/src/languages/scheme/overrides.scm b/crates/zed/src/languages/scheme/overrides.scm
index 28a8a569df..8c0d41b046 100644
--- a/crates/zed/src/languages/scheme/overrides.scm
+++ b/crates/zed/src/languages/scheme/overrides.scm
@@ -2,5 +2,5 @@
     (comment)
     (block_comment)
     (directive)
-] @override.comment
-(string) @override.string
+] @comment
+(string) @string
diff --git a/crates/zed/src/languages/toml/overrides.scm b/crates/zed/src/languages/toml/overrides.scm
index 3a7ad5f035..8a58e304e5 100644
--- a/crates/zed/src/languages/toml/overrides.scm
+++ b/crates/zed/src/languages/toml/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string
diff --git a/crates/zed/src/languages/tsx/overrides.scm b/crates/zed/src/languages/tsx/overrides.scm
index 183f7b4f98..d86186a903 100644
--- a/crates/zed/src/languages/tsx/overrides.scm
+++ b/crates/zed/src/languages/tsx/overrides.scm
@@ -3,5 +3,5 @@
   (jsx_fragment)
   (jsx_self_closing_element)
   (jsx_expression)
-] @override.element
-(string) @override.string
+] @element
+(string) @string
diff --git a/crates/zed/src/languages/typescript/overrides.scm b/crates/zed/src/languages/typescript/overrides.scm
index 3a7ad5f035..8a58e304e5 100644
--- a/crates/zed/src/languages/typescript/overrides.scm
+++ b/crates/zed/src/languages/typescript/overrides.scm
@@ -1,2 +1,2 @@
-(comment) @override.comment
-(string) @override.string
+(comment) @comment
+(string) @string