diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 3002b3c08..b73d295af 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -59,10 +59,10 @@
 (class_declaration
  name: (identifier) @type)
 (enum_declaration
- name: (identifier)
+ name: (identifier) @type)
 (constructor_declaration
  name: (identifier) @type)
-(type_identifier @type)
+(type_identifier) @type