diff --git a/aider/queries/tree-sitter-language-pack/gleam-tags.scm b/aider/queries/tree-sitter-language-pack/gleam-tags.scm
index cfca227c0..b1b934c20 100644
--- a/aider/queries/tree-sitter-language-pack/gleam-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/gleam-tags.scm
@@ -1,41 +1,41 @@
 ; Modules
-(module) @name @reference.module
-(import alias: (identifier) @name) @reference.module
+(module) @name.reference.module @reference.module
+(import alias: (identifier) @name.reference.module) @reference.module
 (remote_type_identifier
-  module: (identifier) @name) @reference.module
+  module: (identifier) @name.reference.module) @reference.module
 ((field_access
-  record: (identifier) @name)
+  record: (identifier) @name.reference.module)
  (#is-not? local)) @reference.module
 
 ; Functions
 (function
-  name: (identifier) @name) @definition.function
+  name: (identifier) @name.definition.function) @definition.function
 (external_function
-  name: (identifier) @name) @definition.function
-(unqualified_import (identifier) @name) @reference.function
+  name: (identifier) @name.definition.function) @definition.function
+(unqualified_import (identifier) @name.reference.function) @reference.function
 ((function_call
-   function: (identifier) @name) @reference.function
+   function: (identifier) @name.reference.function) @reference.function
  (#is-not? local))
 ((field_access
   record: (identifier) @ignore
-  field: (label) @name)
+  field: (label) @name.reference.function)
  (#is-not? local)) @reference.function
 ((binary_expression
    operator: "|>"
-   right: (identifier) @name)
+   right: (identifier) @name.reference.function)
  (#is-not? local)) @reference.function
 
 ; Types
 (type_definition
   (type_name
-    name: (type_identifier) @name)) @definition.type
+    name: (type_identifier) @name.definition.type)) @definition.type
 (type_definition
   (data_constructors
     (data_constructor
-      name: (constructor_name) @name))) @definition.constructor
+      name: (constructor_name) @name.definition.constructor))) @definition.constructor
 (external_type
   (type_name
-    name: (type_identifier) @name)) @definition.type
+    name: (type_identifier) @name.definition.type)) @definition.type
 
-(type_identifier) @name @reference.type
-(constructor_name) @name @reference.constructor
+(type_identifier) @name.reference.type @reference.type
+(constructor_name) @name.reference.constructor @reference.constructor