diff --git a/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
index 1bf5e6fa8..e3140a5da 100644
--- a/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -5,18 +5,13 @@
   (dtsi_include)
 ] @include
 
-[
-  (preproc_def)
-] @constant.macro
-
-[
-  (preproc_function_def)
-] @function.macro
+(preproc_def) @constant.macro
+(preproc_function_def) @function.macro
 
 [
   (memory_reservation)
   (file_version)
-] @annotation
+] @attribute
 
 [
   (string_literal)
@@ -27,12 +22,12 @@
 (integer_literal) @number
 
 (identifier) @variable
-(node (identifier) @attribute)
+(node (identifier) @namespace)
 (property (identifier) @property)
 (labeled_item (identifier) @label)
 (call_expression (identifier) @function.macro)
 
-(reference) @attribute
+(reference) @label ; referencing labeled_item.identifier
 (unit_address) @constant
 
 [ "=" ] @operator