diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 23321f0f7..0098cc22a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -156,7 +156,8 @@ As languages differ quite a lot, here is a set of captures available to you when
 @function.method      ; method definitions
 @function.method.call ; method calls
 
-@constructor          ; constructor calls and definitions
+@constructor          ; constructor definitions
+@constructor.call     ; constructor calls
 @operator             ; symbolic operators (e.g. `+` / `*`)
 ```
 
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index 1ea6245d3..b2a375d6a 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -290,12 +290,12 @@
   "new"
   (call_expression
     .
-    (identifier) @constructor))
+    (identifier) @constructor.call))
 
 ((call_expression
   .
-  (identifier) @constructor)
-  (#lua-match? @constructor "^%u"))
+  (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^%u"))
 
 ; Attributes
 (decorator
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 85ff2dc40..0e1d1e138 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -161,24 +161,24 @@
   (#lua-match? @constructor "^%u"))
 
 ((call_expression
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^%u"))
+  function: (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^%u"))
 
 ((call_expression
   function: (qualified_identifier
-    name: (identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
+    name: (identifier) @constructor.call))
+  (#lua-match? @constructor.call "^%u"))
 
 ((call_expression
   function: (field_expression
-    field: (field_identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
+    field: (field_identifier) @constructor.call))
+  (#lua-match? @constructor.call "^%u"))
 
 ; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
 ((field_initializer
-  (field_identifier) @constructor
+  (field_identifier) @constructor.call
   (argument_list))
-  (#lua-match? @constructor "^%u"))
+  (#lua-match? @constructor.call "^%u"))
 
 ; Constants
 (this) @variable.builtin
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index cec2f4e3e..7b4d828d4 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -138,7 +138,7 @@
 ; Constructor
 ;------------
 (new_expression
-  constructor: (identifier) @constructor)
+  constructor: (identifier) @constructor.call)
 
 ; Decorators
 ;----------
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index 7675cb790..d4df888d7 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -44,12 +44,12 @@
 
 ; Constructors
 ((call_expression
-  (identifier) @constructor)
-  (#lua-match? @constructor "^[nN]ew.+$"))
+  (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^[nN]ew.+$"))
 
 ((call_expression
-  (identifier) @constructor)
-  (#lua-match? @constructor "^[mM]ake.+$"))
+  (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^[mM]ake.+$"))
 
 ; Operators
 [
diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm
index deaecd283..9c6061728 100644
--- a/queries/hare/highlights.scm
+++ b/queries/hare/highlights.scm
@@ -131,8 +131,8 @@
 
 ((call_expression
   .
-  (identifier) @constructor)
-  (#eq? @constructor "init"))
+  (identifier) @constructor.call)
+  (#eq? @constructor.call "init"))
 
 ; Parameters
 (parameter
diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm
index 722c0abdf..981fa6a20 100644
--- a/queries/nim/highlights.scm
+++ b/queries/nim/highlights.scm
@@ -364,29 +364,29 @@
 ; @constructor      ; constructor calls and definitions
 (call
   function: [
-    (identifier) @constructor
+    (identifier) @constructor.call
     (accent_quoted
-      (identifier) @constructor)
+      (identifier) @constructor.call)
     ; generic types
     (bracket_expression
-      left: (identifier) @constructor)
+      left: (identifier) @constructor.call)
     (bracket_expression
       left: (accent_quoted
-        (identifier) @constructor))
+        (identifier) @constructor.call))
     ; dot accessor
     (dot_expression
-      right: (identifier) @constructor)
+      right: (identifier) @constructor.call)
     (dot_expression
       right: (accent_quoted
-        (identifier) @constructor))
+        (identifier) @constructor.call))
     ; both
     (bracket_expression
       left: (dot_expression
-        right: (identifier) @constructor))
+        right: (identifier) @constructor.call))
     (bracket_expression
       left: (dot_expression
         right: (accent_quoted
-          (identifier) @constructor)))
+          (identifier) @constructor.call)))
   ]
   (argument_list
     (colon_expression)+))
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index 0f412404f..ff6e29345 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -113,8 +113,8 @@
 
 ; Constructors
 ((message_expression
-  method: (identifier) @constructor)
-  (#eq? @constructor "init"))
+  method: (identifier) @constructor.call)
+  (#eq? @constructor.call "init"))
 
 ; Attributes
 (availability_attribute_specifier
diff --git a/queries/powershell/highlights.scm b/queries/powershell/highlights.scm
index 6081e8f1b..fcea9023e 100644
--- a/queries/powershell/highlights.scm
+++ b/queries/powershell/highlights.scm
@@ -270,8 +270,8 @@
   (member_name) @function.call)
 
 (invokation_expression
-  (member_name) @constructor
-  (#eq? @constructor "new"))
+  (member_name) @constructor.call
+  (#eq? @constructor.call "new"))
 
 (member_access
   (member_name
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index 00250de1b..9e9082cbc 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -387,13 +387,13 @@
     attribute: (identifier) @function.method.call))
 
 ((call
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^%u"))
+  function: (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^%u"))
 
 ((call
   function: (attribute
-    attribute: (identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
+    attribute: (identifier) @constructor.call))
+  (#lua-match? @constructor.call "^%u"))
 
 ; Builtin functions
 ((call
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index f85c502a4..b31ff7505 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -101,8 +101,8 @@
     field: (identifier) @function.method.call))
 
 ((call_expression
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^[A-Z]"))
+  function: (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^[A-Z]"))
 
 (generic_function
   function: (identifier) @function.call)
diff --git a/queries/slang/highlights.scm b/queries/slang/highlights.scm
index 166964c62..35976e05a 100644
--- a/queries/slang/highlights.scm
+++ b/queries/slang/highlights.scm
@@ -160,24 +160,24 @@
   (#lua-match? @constructor "^%u"))
 
 ((call_expression
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^%u"))
+  function: (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^%u"))
 
 ((call_expression
   function: (qualified_identifier
-    name: (identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
+    name: (identifier) @constructor.call))
+  (#lua-match? @constructor.call "^%u"))
 
 ((call_expression
   function: (field_expression
-    field: (field_identifier) @constructor))
-  (#lua-match? @constructor "^%u"))
+    field: (field_identifier) @constructor.call))
+  (#lua-match? @constructor.call "^%u"))
 
 ; constructing a type in an initializer list: Constructor ():  **SuperType (1)**
 ((field_initializer
-  (field_identifier) @constructor
+  (field_identifier) @constructor.call
   (argument_list))
-  (#lua-match? @constructor "^%u"))
+  (#lua-match? @constructor.call "^%u"))
 
 ; Constants
 (this) @variable.builtin
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index 21cbb9733..d9212b79b 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -109,7 +109,7 @@
 ; Constructors
 (new_expression
   class: (identifier) @type
-  arguments: (call_arguments) @constructor)
+  arguments: (call_arguments) @constructor.call)
 
 ; Methodmaps
 (methodmap
@@ -119,7 +119,7 @@
   inherits: (identifier) @type)
 
 (methodmap_method_constructor
-  name: (identifier) @constructor)
+  name: (identifier) @constructor.call)
 
 (methodmap_method
   name: (identifier) @function.method)
diff --git a/queries/starlark/highlights.scm b/queries/starlark/highlights.scm
index fe3dce89b..f6539dcc1 100644
--- a/queries/starlark/highlights.scm
+++ b/queries/starlark/highlights.scm
@@ -328,10 +328,10 @@
     attribute: (identifier) @function.method.call))
 
 ((call
-  function: (identifier) @constructor)
-  (#lua-match? @constructor "^[A-Z]"))
+  function: (identifier) @constructor.call)
+  (#lua-match? @constructor.call "^[A-Z]"))
 
 ((call
   function: (attribute
-    attribute: (identifier) @constructor))
-  (#lua-match? @constructor "^[A-Z]"))
+    attribute: (identifier) @constructor.call))
+  (#lua-match? @constructor.call "^[A-Z]"))
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index 0ba11caa1..d159c4edc 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -39,8 +39,8 @@
       (symbol
         (symbol)? @keyword.import
         (identifier) @type)
-      (identifier) @constructor)))
-  (#lua-match? @constructor "^[%l][%l%d_]*$"))
+      (identifier) @constructor.call)))
+  (#lua-match? @constructor.call "^[%l][%l%d_]*$"))
 
 (unqualified_type
   (symbol