diff --git a/aider/queries/tree-sitter-language-pack/solidity-tags.scm b/aider/queries/tree-sitter-language-pack/solidity-tags.scm
index 852e285f0..d56bc19a0 100644
--- a/aider/queries/tree-sitter-language-pack/solidity-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/solidity-tags.scm
@@ -1,43 +1,43 @@
 ;; Method and Function declarations
 (contract_declaration (_
     (function_definition
-        name: (identifier) @name) @definition.method))
+        name: (identifier) @name.definition.function) @definition.method))
 
 (source_file
     (function_definition
-        name: (identifier) @name) @definition.function)
+        name: (identifier) @name.definition.function) @definition.function)
 
 ;; Contract, struct, enum and interface declarations
 (contract_declaration
-  name: (identifier) @name) @definition.class
+  name: (identifier) @name.definition.class) @definition.class
 
 (interface_declaration
-  name: (identifier) @name) @definition.interface
+  name: (identifier) @name.definition.interface) @definition.interface
 
 (library_declaration
-  name: (identifier) @name) @definition.interface
+  name: (identifier) @name.definition.class) @definition.interface
 
-(struct_declaration name: (identifier) @name) @definition.class
-(enum_declaration name: (identifier) @name) @definition.class
-(event_definition name: (identifier) @name) @definition.class
+(struct_declaration name: (identifier) @name.definition.class) @definition.class
+(enum_declaration name: (identifier) @name.definition.class) @definition.class
+(event_definition name: (identifier) @name.definition.class) @definition.class
 
 ;; Function calls
-(call_expression (expression (identifier)) @name ) @reference.call
+(call_expression (expression (identifier)) @name.reference.call ) @reference.call
 
 (call_expression
     (expression (member_expression
-        property: (_) @name ))) @reference.call
+        property: (_) @name.reference.method ))) @reference.call
 
 ;; Log emit
-(emit_statement name: (_) @name) @reference.class
+(emit_statement name: (_) @name.reference.class) @reference.class
 
 
 ;; Inheritance
 
 (inheritance_specifier
-    ancestor: (user_defined_type (_) @name . )) @reference.class
+    ancestor: (user_defined_type (_) @name.reference.class . )) @reference.class
 
 
 ;; Imports ( note that unknown is not standardised )
 (import_directive
-  import_name: (_) @name ) @reference.unknown
+  import_name: (_) @name.reference.module ) @reference.unknown