diff --git a/aider/queries/tree-sitter-language-pack/java-tags.scm b/aider/queries/tree-sitter-language-pack/java-tags.scm
index 3f3eb40ae..ae4481e9e 100644
--- a/aider/queries/tree-sitter-language-pack/java-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/java-tags.scm
@@ -1,20 +1,20 @@
 (class_declaration
-  name: (identifier) @name) @definition.class
+  name: (identifier) @name.definition.class) @definition.class
 
 (method_declaration
-  name: (identifier) @name) @definition.method
+  name: (identifier) @name.definition.method) @definition.method
 
 (method_invocation
-  name: (identifier) @name
+  name: (identifier) @name.reference.method
   arguments: (argument_list) @reference.call)
 
 (interface_declaration
-  name: (identifier) @name) @definition.interface
+  name: (identifier) @name.definition.interface) @definition.interface
 
 (type_list
-  (type_identifier) @name) @reference.implementation
+  (type_identifier) @name.reference.interface) @reference.implementation
 
 (object_creation_expression
-  type: (type_identifier) @name) @reference.class
+  type: (type_identifier) @name.reference.class) @reference.class
 
-(superclass (type_identifier) @name) @reference.class
+(superclass (type_identifier) @name.reference.class) @reference.class