diff --git a/sources/Application/Service/Description/EventDataDescription.php b/sources/Application/Service/Description/EventDataDescription.php
index 00684e6d5..1112b13b3 100644
--- a/sources/Application/Service/Description/EventDataDescription.php
+++ b/sources/Application/Service/Description/EventDataDescription.php
@@ -10,6 +10,7 @@ namespace Combodo\iTop\Service\Description;
  * Description of the data given with an event when registering
  *
  * @api
+ * @package EventsAPI
  * @since 3.1.0
  */
 class EventDataDescription
diff --git a/sources/Application/Service/Description/EventDescription.php b/sources/Application/Service/Description/EventDescription.php
index 75a769268..09333393e 100644
--- a/sources/Application/Service/Description/EventDescription.php
+++ b/sources/Application/Service/Description/EventDescription.php
@@ -10,6 +10,7 @@ namespace Combodo\iTop\Service\Description;
  * Description of an event when registering
  *
  * @api
+ * @package EventsAPI
  * @since 3.1.0
  */
 class EventDescription
diff --git a/sources/Application/Service/EventData.php b/sources/Application/Service/EventData.php
index a5edf6bd7..efe42039d 100644
--- a/sources/Application/Service/EventData.php
+++ b/sources/Application/Service/EventData.php
@@ -12,7 +12,7 @@ namespace Combodo\iTop\Service;
  * Class EventServiceData
  *
  * @api
- * @package Combodo\iTop\Service
+ * @package EventsAPI
  * @since 3.1.0
  */
 class EventData
diff --git a/sources/Application/Service/EventService.php b/sources/Application/Service/EventService.php
index ac35230be..6d7ee6041 100644
--- a/sources/Application/Service/EventService.php
+++ b/sources/Application/Service/EventService.php
@@ -20,7 +20,7 @@ use utils;
  * Inspired by [PSR-14: Event Dispatcher](https://www.php-fig.org/psr/psr-14).
  * Adapted to iTop needs in terms of event filtering (using event source or context).
  *
- * @package Combodo\iTop\Service
+ * @package EventsAPI
  * @api
  * @since 3.1.0
  */
diff --git a/sources/Application/Service/iEventServiceSetup.php b/sources/Application/Service/iEventServiceSetup.php
index b3c395176..713fc3144 100644
--- a/sources/Application/Service/iEventServiceSetup.php
+++ b/sources/Application/Service/iEventServiceSetup.php
@@ -10,7 +10,7 @@ namespace Combodo\iTop\Service;
  * Interface to implement in order to register the events and listeners
  *
  * @api
- * @package Combodo\iTop\Service
+ * @package EventsAPI
  * @since 3.1.0
  */
 interface iEventServiceSetup