diff --git a/phpBB/phpbb/template/twig/node/event.php b/phpBB/phpbb/template/twig/node/event.php
index c94e5fdf20..4533151d05 100644
--- a/phpBB/phpbb/template/twig/node/event.php
+++ b/phpBB/phpbb/template/twig/node/event.php
@@ -43,7 +43,7 @@ class phpbb_template_twig_node_event extends Twig_Node
 	{
 		$compiler->addDebugInfo($this);
 
-		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
+		$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name') . '_listener';
 
 		foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
 		{
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/kappa/styles/all/template/event/test_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/kappa/styles/silver/template/event/test_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html b/tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/kappa/styles/silver_inherit/template/event/test_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/omega/styles/all/template/event/test_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/test_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html b/tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two.html
rename to tests/template/datasets/event_inheritance/ext/omega/styles/silver/template/event/two_listener.html
diff --git a/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html b/tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
similarity index 100%
rename from tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test.html
rename to tests/template/datasets/event_inheritance/ext/zeta/styles/all/template/event/test_listener.html
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
similarity index 100%
rename from tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing.html
rename to tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/event_variable_spacing_listener.html
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
similarity index 100%
rename from tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal.html
rename to tests/template/datasets/ext_trivial/ext/trivial/styles/all/template/event/universal_listener.html
diff --git a/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html b/tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html
similarity index 100%
rename from tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple.html
rename to tests/template/datasets/ext_trivial/ext/trivial/styles/silver/template/event/simple_listener.html