diff --git a/helix-syntax/languages/tree-sitter-cpp b/helix-syntax/languages/tree-sitter-cpp
index c61212414..e8dcc9d2b 160000
--- a/helix-syntax/languages/tree-sitter-cpp
+++ b/helix-syntax/languages/tree-sitter-cpp
@@ -1 +1 @@
-Subproject commit c61212414a3e95b5f7507f98e83de1d638044adc
+Subproject commit e8dcc9d2b404c542fd236ea5f7208f90be8a6e89
diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 3315fde05..3348ef3ca 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -3,7 +3,7 @@
 ; Functions
 
 (call_expression
-  function: (scoped_identifier
+  function: (qualified_identifier
     name: (identifier) @function))
 
 (template_function
@@ -13,15 +13,14 @@
   name: (field_identifier) @function)
 
 (template_function
-  name: (scoped_identifier
+  name: (identifier) @function)
+
+(function_declarator
+  declarator: (qualified_identifier
     name: (identifier) @function))
 
 (function_declarator
-  declarator: (scoped_identifier
-    name: (identifier) @function))
-
-(function_declarator
-  declarator: (scoped_identifier
+  declarator: (qualified_identifier
     name: (identifier) @function))
 
 (function_declarator