diff --git a/aider/queries/tree-sitter-language-pack/swift-tags.scm b/aider/queries/tree-sitter-language-pack/swift-tags.scm
index 0038571e5..9b81cf7bd 100644
--- a/aider/queries/tree-sitter-language-pack/swift-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/swift-tags.scm
@@ -1,20 +1,20 @@
 (class_declaration
-  name: (type_identifier) @name) @definition.class
+  name: (type_identifier) @name.definition.class) @definition.class
 
 (protocol_declaration
-  name: (type_identifier) @name) @definition.interface
+  name: (type_identifier) @name.definition.interface) @definition.interface
 
 (class_declaration
     (class_body
         [
             (function_declaration
-                name: (simple_identifier) @name
+                name: (simple_identifier) @name.definition.method
             )
             (subscript_declaration
-                (parameter (simple_identifier) @name)
+                (parameter (simple_identifier) @name.definition.method)
             )
-            (init_declaration "init" @name)
-            (deinit_declaration "deinit" @name)
+            (init_declaration "init" @name.definition.method)
+            (deinit_declaration "deinit" @name.definition.method)
         ]
     )
 ) @definition.method
@@ -23,12 +23,12 @@
     (protocol_body
         [
             (protocol_function_declaration
-                name: (simple_identifier) @name
+                name: (simple_identifier) @name.definition.method
             )
             (subscript_declaration
-                (parameter (simple_identifier) @name)
+                (parameter (simple_identifier) @name.definition.method)
             )
-            (init_declaration "init" @name)
+            (init_declaration "init" @name.definition.method)
         ]
     )
 ) @definition.method
@@ -37,15 +37,15 @@
     (class_body
         [
             (property_declaration
-                (pattern (simple_identifier) @name)
+                (pattern (simple_identifier) @name.definition.property)
             )
         ]
     )
 ) @definition.property
 
 (property_declaration
-    (pattern (simple_identifier) @name)
+    (pattern (simple_identifier) @name.definition.property)
 ) @definition.property
 
 (function_declaration
-    name: (simple_identifier) @name) @definition.function
\ No newline at end of file
+    name: (simple_identifier) @name.definition.function) @definition.function