diff --git a/aider/queries/tree-sitter-language-pack/python-tags.scm b/aider/queries/tree-sitter-language-pack/python-tags.scm
index 4fe365523..dab8b941d 100644
--- a/aider/queries/tree-sitter-language-pack/python-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/python-tags.scm
@@ -1,14 +1,14 @@
-(module (expression_statement (assignment left: (identifier) @name) @definition.constant))
+(module (expression_statement (assignment left: (identifier) @name.definition.constant) @definition.constant))
 
 (class_definition
-  name: (identifier) @name) @definition.class
+  name: (identifier) @name.definition.class) @definition.class
 
 (function_definition
-  name: (identifier) @name) @definition.function
+  name: (identifier) @name.definition.function) @definition.function
 
 (call
   function: [
-      (identifier) @name
+      (identifier) @name.reference.call
       (attribute
-        attribute: (identifier) @name)
+        attribute: (identifier) @name.reference.call)
   ]) @reference.call