diff --git a/aider/queries/tree-sitter-language-pack/go-tags.scm b/aider/queries/tree-sitter-language-pack/go-tags.scm
index 22c92249b..16ecc4de8 100644
--- a/aider/queries/tree-sitter-language-pack/go-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/go-tags.scm
@@ -2,7 +2,7 @@
   (comment)* @doc
   .
   (function_declaration
-    name: (identifier) @name) @definition.function
+    name: (identifier) @name.definition.function) @definition.function
   (#strip! @doc "^//\\s*")
   (#set-adjacent! @doc @definition.function)
 )
@@ -11,32 +11,32 @@
   (comment)* @doc
   .
   (method_declaration
-    name: (field_identifier) @name) @definition.method
+    name: (field_identifier) @name.definition.method) @definition.method
   (#strip! @doc "^//\\s*")
   (#set-adjacent! @doc @definition.method)
 )
 
 (call_expression
   function: [
-    (identifier) @name
-    (parenthesized_expression (identifier) @name)
-    (selector_expression field: (field_identifier) @name)
-    (parenthesized_expression (selector_expression field: (field_identifier) @name))
+    (identifier) @name.reference.call
+    (parenthesized_expression (identifier) @name.reference.call)
+    (selector_expression field: (field_identifier) @name.reference.call)
+    (parenthesized_expression (selector_expression field: (field_identifier) @name.reference.call))
   ]) @reference.call
 
 (type_spec
-  name: (type_identifier) @name) @definition.type
+  name: (type_identifier) @name.definition.type) @definition.type
 
-(type_identifier) @name @reference.type
+(type_identifier) @name.reference.type @reference.type
 
-(package_clause "package" (package_identifier) @name)
+(package_clause "package" (package_identifier) @name.definition.module)
 
-(type_declaration (type_spec name: (type_identifier) @name type: (interface_type)))
+(type_declaration (type_spec name: (type_identifier) @name.definition.interface type: (interface_type)))
 
-(type_declaration (type_spec name: (type_identifier) @name type: (struct_type)))
+(type_declaration (type_spec name: (type_identifier) @name.definition.class type: (struct_type)))
 
-(import_declaration (import_spec) @name)
+(import_declaration (import_spec) @name.reference.module)
 
-(var_declaration (var_spec name: (identifier) @name))
+(var_declaration (var_spec name: (identifier) @name.definition.variable))
 
-(const_declaration (const_spec name: (identifier) @name))
+(const_declaration (const_spec name: (identifier) @name.definition.constant))