diff --git a/aider/queries/tree-sitter-language-pack/r-tags.scm b/aider/queries/tree-sitter-language-pack/r-tags.scm
index 39809c595..5ffc72332 100644
--- a/aider/queries/tree-sitter-language-pack/r-tags.scm
+++ b/aider/queries/tree-sitter-language-pack/r-tags.scm
@@ -1,21 +1,21 @@
 (binary_operator
-    lhs: (identifier) @name
+    lhs: (identifier) @name.definition.function
     operator: "<-"
     rhs: (function_definition)
 ) @definition.function
 
 (binary_operator
-    lhs: (identifier) @name
+    lhs: (identifier) @name.definition.function
     operator: "="
     rhs: (function_definition)
 ) @definition.function
 
 (call
-    function: (identifier) @name
+    function: (identifier) @name.reference.call
 ) @reference.call
 
 (call
     function: (namespace_operator
-        rhs: (identifier) @name
+        rhs: (identifier) @name.reference.call
     )
 ) @reference.call