diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 2c4d3819e..9e1317284 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -221,11 +221,11 @@
         </field>
       </fields>
       <event_listeners>
-        <listener id="UpdateImpactAnalysis">
+        <event_listener id="UpdateImpactAnalysis">
           <event>EVENT_DB_LINKS_CHANGED</event>
           <callback>UpdateImpactedItems</callback>
           <rank>0</rank>
-        </listener>
+        </event_listener>
       </event_listeners>
       <methods>
         <method id="DBInsertNoReload">
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index e66f9ad9b..0b72ec5ed 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1390,7 +1390,7 @@ EOF
 		$sMethods = '';
 		$oHooks = $oClass->GetOptionalElement('event_listeners');
 		if ($oHooks) {
-			foreach ($oHooks->getElementsByTagName('listener') as $oListener) {
+			foreach ($oHooks->getElementsByTagName('event_listener') as $oListener) {
 				/** @var DesignElement $oListener */
 				$oEventNode = $oListener->GetUniqueElement('event');
 				/** @var DesignElement $oEventNode $oEventNode */
@@ -3724,7 +3724,7 @@ EOF;
 		if (!array_key_exists($sModuleId, $this->aSnippets)) {
 			$this->aSnippets[$sModuleId] = ['before' => [], 'after' => []];
 		}
-		$oEventListeners = $this->oFactory->GetNodes('/itop_design/event_listeners/listener');
+		$oEventListeners = $this->oFactory->GetNodes('/itop_design/event_listeners/event_listener');
 		$aEventListeners = [];
 		foreach ($oEventListeners as $oListener) {
 			/** @var \DOMElement $oListener */
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
index face0a6db..0740d27ff 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.1_to_3.0.input.xml
@@ -91,11 +91,11 @@
     </class>
     <class id="ClassWithEventListeners">
       <event_listeners>
-        <listener id="OnUserRequestUpdateDone" _delta="define">
+        <event_listener id="OnUserRequestUpdateDone" _delta="define">
           <event>EVENT_DB_UPDATE_DONE</event>
           <callback>OnUpdateDone</callback>
           <rank>0</rank>
-        </listener>
+        </event_listener>
       </event_listeners>
       <methods>
         <method id="OnUpdateDone" _delta="define">
@@ -133,7 +133,7 @@
     </event>
   </events>
   <event_listeners>
-    <listener id="GlobalFAQRead" _delta="define">
+    <event_listener id="GlobalFAQRead" _delta="define">
       <event>EVENT_SERVICE_DISPLAY_OBJECT_DETAILS</event>
       <filters>
         <filter>FAQ</filter>
@@ -149,7 +149,7 @@
         IssueLog::Info("FAQ: '{$sFaqTitle}' (id:{$sId}) was read by {$sUser}");
       }
 ]]></code>
-    </listener>
+    </event_listener>
   </event_listeners>
   <meta>
     <presentation>