diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 7f4d0d83..8146800e 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -51,8 +51,12 @@
 ;;; ----------------------------------------------------------------------------
 ;; Types
 
+(namespace_identifier) @namespace
+
 ((namespace_identifier) @type
- (.match? @type "^[A-Za-z]"))
+                        (#lua-match? @type "^[A-Z]"))
+
+(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace)
 
 (auto) @type