diff --git a/queries/php/highlights.scm b/queries/php/highlights.scm
index aa6a3eb72..3e30f75bb 100644
--- a/queries/php/highlights.scm
+++ b/queries/php/highlights.scm
@@ -2,6 +2,15 @@
 
 (variable_name) @variable
 
+; Constants
+
+((name) @constant
+ (#vim-match? @constant "^_?[A-Z][A-Z\d_]*$"))
+((name) @constant.builtin
+ (#vim-match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
+
+(const_declaration (const_element (name) @constant))
+
 ; Types
 
 [
@@ -100,13 +109,6 @@
 
 (relative_scope) @variable.builtin
 
-((name) @constant
- (#vim-match? @constant "^_?[A-Z][A-Z\d_]*$"))
-((name) @constant.builtin
- (#vim-match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
-
-(const_declaration (const_element (name) @constant))
-
 ((variable_name) @variable.builtin
  (#eq? @variable.builtin "$this"))