diff --git a/queries/tags.scm b/queries/tags.scm
index 66d594c2..4384302a 100644
--- a/queries/tags.scm
+++ b/queries/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.implementation
 
 (property_declaration
   (property_element (variable_name (name) @name))) @definition.field
diff --git a/test/tags/definition.php b/test/tags/definition.php
new file mode 100644
index 00000000..1967c044
--- /dev/null
+++ b/test/tags/definition.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace A\B;
+//        ^ definition.module
+//          ^ definition.module
+
+interface T {
+//        ^ definition.interface
+}
+
+trait U {
+//    ^ definition.interface
+}
+
+function f() {
+//       ^ definition.function
+}
+
+class A {
+//    ^ definition.class
+    int $foo;
+//       ^^^ definition.field
+    public function a() {
+//                  ^ definition.function
+    }
+}
diff --git a/test/tags/reference.php b/test/tags/reference.php
new file mode 100644
index 00000000..620a10e7
--- /dev/null
+++ b/test/tags/reference.php
@@ -0,0 +1,20 @@
+<?php
+
+class B implements T {
+//                 ^ reference.implementation
+}
+
+new A\B();
+//    ^ reference.class
+
+new $foo();
+//   ^^^ reference.class
+
+$bar->f();
+//    ^ reference.call
+
+\f();
+#^ reference.call
+
+C::f();
+// ^ reference.call