diff --git a/aider/queries/tree-sitter-language-pack/dart-tags.scm b/aider/queries/tree-sitter-language-pack/dart-tags.scm
index 35ebc996c..a11fafcb1 100644
--- a/aider/queries/tree-sitter-language-pack/dart-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/dart-tags.scm
@@ -1,32 +1,32 @@
 
 (class_definition
-  name: (identifier) @name) @definition.class
+  name: (identifier) @name.definition.class) @definition.class
 
 (method_signature
   (function_signature)) @definition.method
 
 (type_alias
-  (type_identifier) @name) @definition.type
+  (type_identifier) @name.definition.type) @definition.type
 
 (method_signature
 (getter_signature
-  name: (identifier) @name)) @definition.method
+  name: (identifier) @name.definition.method)) @definition.method
 
 (method_signature
 (setter_signature
-  name: (identifier) @name)) @definition.method 
+  name: (identifier) @name.definition.method)) @definition.method 
 
 (method_signature
   (function_signature
-  name: (identifier) @name)) @definition.method
+  name: (identifier) @name.definition.method)) @definition.method
 
 (method_signature
   (factory_constructor_signature
-    (identifier) @name)) @definition.method
+    (identifier) @name.definition.method)) @definition.method
 
 (method_signature
   (constructor_signature
-  name: (identifier) @name)) @definition.method
+  name: (identifier) @name.definition.method)) @definition.method
 
 (method_signature
   (operator_signature)) @definition.method
@@ -35,24 +35,24 @@
 
 (mixin_declaration
   (mixin)
-  (identifier) @name) @definition.mixin
+  (identifier) @name.definition.mixin) @definition.mixin
 
 (extension_declaration
-  name: (identifier) @name) @definition.extension
+  name: (identifier) @name.definition.extension) @definition.extension
 
 
 (new_expression
-  (type_identifier) @name) @reference.class
+  (type_identifier) @name.reference.class) @reference.class
 
 (enum_declaration
-  name: (identifier) @name) @definition.enum
+  name: (identifier) @name.definition.enum) @definition.enum
 
 (function_signature
-  name: (identifier) @name) @definition.function 
+  name: (identifier) @name.definition.function) @definition.function 
 
 (initialized_variable_definition
   name: (identifier)
-  value: (identifier) @name 
+  value: (identifier) @name.reference.class 
   value: (selector
 	"!"?
 	(argument_part 
@@ -64,28 +64,28 @@
 		  (identifier)
 		  (unconditional_assignable_selector
 			"."
-			(identifier) @name))) @reference.call
+			(identifier) @name.reference.send))) @reference.call
 
 (assignment_expression
   left: (assignable_expression 
 		  (identifier)
 		  (conditional_assignable_selector
 			"?."
-			(identifier) @name))) @reference.call
+			(identifier) @name.reference.send))) @reference.call
 
-((identifier) @name
+((identifier) @name.reference.send
  (selector
     "!"?
     (conditional_assignable_selector
-      "?." (identifier) @name)?
+      "?." (identifier) @name.reference.send)?
     (unconditional_assignable_selector
-      "."? (identifier) @name)?
+      "."? (identifier) @name.reference.send)?
     (argument_part
       (arguments
         (argument)*))?)*
 	(cascade_section
 	  (cascade_selector
-		(identifier)) @name 
+		(identifier)) @name.reference.send 
 	  (argument_part 
 		(arguments
 		  (argument)*))?)?) @reference.call