diff --git a/runtime/queries/elm/tags.scm b/runtime/queries/elm/tags.scm
index 03999fb1..e5ba9031 100644
--- a/runtime/queries/elm/tags.scm
+++ b/runtime/queries/elm/tags.scm
@@ -9,7 +9,7 @@
 (type_ref (upper_case_qid (upper_case_identifier) @name)) @reference.type
 (exposed_type (upper_case_identifier) @name) @reference.type
 
-(type_declaration (union_variant (upper_case_identifier) @name)) @definition.union
+(type_declaration (union_variant (upper_case_identifier) @name)) @definition.enum
 
 (value_expr (upper_case_qid (upper_case_identifier) @name)) @reference.union
 
diff --git a/runtime/queries/php-only/tags.scm b/runtime/queries/php-only/tags.scm
index 66d594c2..54c3e17b 100644
--- a/runtime/queries/php-only/tags.scm
+++ b/runtime/queries/php-only/tags.scm
@@ -1,5 +1,5 @@
 (namespace_definition
-  name: (namespace_name) @name) @module
+  name: (namespace_name) @name) @definition.module
 
 (interface_declaration
   name: (name) @name) @definition.interface
@@ -10,7 +10,7 @@
 (class_declaration
   name: (name) @name) @definition.class
 
-(class_interface_clause [(name) (qualified_name)] @name) @impl
+(class_interface_clause [(name) (qualified_name)] @name) @reference.interface
 
 (property_declaration
   (property_element (variable_name (name) @name))) @definition.field
diff --git a/runtime/queries/ruby/tags.scm b/runtime/queries/ruby/tags.scm
index 47ba1eb5..52904f19 100644
--- a/runtime/queries/ruby/tags.scm
+++ b/runtime/queries/ruby/tags.scm
@@ -17,7 +17,7 @@
   name: (_) @name) @definition.method
 
 (setter
-  (identifier) @ignore)
+  (identifier) @_ignore)
 
 ; Class definitions
 
diff --git a/runtime/queries/unison/tags.scm b/runtime/queries/unison/tags.scm
index 2834748a..a31742a3 100644
--- a/runtime/queries/unison/tags.scm
+++ b/runtime/queries/unison/tags.scm
@@ -7,4 +7,4 @@
     ((type_name (regular_identifier) @name)) @definition.type))
 
 (ability_declaration
-  (ability_name) @type _) @definition.type
+  (ability_name) @name _) @definition.type