diff --git a/runtime/queries/go/highlights.scm b/runtime/queries/go/highlights.scm
index b2d81e45d..b45a11bee 100644
--- a/runtime/queries/go/highlights.scm
+++ b/runtime/queries/go/highlights.scm
@@ -24,7 +24,6 @@
 
 ; Identifiers
 
-((identifier) @constant (match? @constant "^[A-Z][A-Z\\d_]+$"))
 (const_spec
   name: (identifier) @constant)
 
@@ -38,6 +37,7 @@
 (type_spec 
   name: (type_identifier) @constructor)
 (field_identifier) @variable.other.member
+(keyed_element (literal_element (identifier) @variable.other.member))
 (identifier) @variable
 (package_identifier) @namespace