diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index cd1a73692..57e96cdf2 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -11,7 +11,7 @@
 /**
  * Class ajax_page
  *
- * @deprecated since 3.0.0 will be removed in 3.1.0 - moved to AjaxPage
+ * @deprecated 3.0.0 will be removed in 3.1.0 - moved to AjaxPage
  */
 class ajax_page extends AjaxPage
 {
diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php
index 5b658d3ee..6d2f95945 100644
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -1184,7 +1184,7 @@ interface iPageUIBlockExtension
  * @api
  * @package     Extensibility
  * @since       2.7.0
- * @deprecated since 3.0.0 use AbstractPageUIBlockExtension instead
+ * @deprecated 3.0.0 use AbstractPageUIBlockExtension instead
  */
 abstract class AbstractPageUIExtension implements iPageUIExtension
 {
diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 952e87400..a5f6a5751 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -1448,7 +1448,7 @@ HTML
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
 	 * @throws \MySQLHasGoneAwayException
-	 * @deprecated since 3.0.0
+	 * @deprecated 3.0.0
 	 */
 	public static function GetDisplayExtendedSet(WebPage $oPage, CMDBObjectSet $oSet, $aExtraParams = array())
 	{
diff --git a/application/datatable.class.inc.php b/application/datatable.class.inc.php
index 4e4ce06b4..139d1a3b2 100644
--- a/application/datatable.class.inc.php
+++ b/application/datatable.class.inc.php
@@ -19,7 +19,7 @@ use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
  *
  * You should have received a copy of the GNU Affero General Public License
  *
- * @deprecated since 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
+ * @deprecated 3.0.0 use Combodo\iTop\Application\UI\Base\Component\DataTable\Datatable
  */
 
 class DataTable
diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php
index 1d145203a..fd6f0a7df 100644
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -358,10 +358,11 @@ class WizardHelper
 {$sWizardHelperJsVar}.UpdateFields();
 JS;
 	}
-/*
- * Function with an old pattern of code
- * @deprecated since 3.1
-*/
+
+	/*
+	 * Function with an old pattern of code
+	 * @deprecated 3.1.0
+	*/
 	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
 	{
 		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
diff --git a/core/expression.class.inc.php b/core/expression.class.inc.php
index 5df759d7f..5e05bf710 100644
--- a/core/expression.class.inc.php
+++ b/core/expression.class.inc.php
@@ -2,7 +2,7 @@
 // The file has been moved in iTop 2.2.0+ (revision 3803)
 // Preserve backward compatibility with some external tools (Cf. toolkit)
 
-//  @deprecated since 3.1.0
+// @deprecated 3.1.0
 DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use core/oql/expression.class.inc.php instead');
 
 require_once(APPROOT.'core/oql/expression.class.inc.php');
diff --git a/lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php b/lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php
index 8980992fb..1f0738249 100644
--- a/lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php
+++ b/lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php
@@ -186,7 +186,7 @@ abstract class AbstractPluginManager extends ServiceManager implements PluginMan
      *
      * Returns the creation context.
      *
-     * @deprecated since 3.0.0. The creation context should be passed during
+     * @deprecated 3.0.0. The creation context should be passed during
      *     instantiation instead.
      * @param ContainerInterface $container
      * @return void
diff --git a/lib/laminas/laminas-servicemanager/src/ServiceManager.php b/lib/laminas/laminas-servicemanager/src/ServiceManager.php
index c0a0891eb..07d613790 100644
--- a/lib/laminas/laminas-servicemanager/src/ServiceManager.php
+++ b/lib/laminas/laminas-servicemanager/src/ServiceManager.php
@@ -158,7 +158,7 @@ class ServiceManager implements ServiceLocatorInterface
      *
      * Returns the creation context.
      *
-     * @deprecated since 3.0.0. Factories using 3.0 should use the container
+     * @deprecated 3.0.0. Factories using 3.0 should use the container
      *     instance passed to the factory instead.
      * @return ContainerInterface
      */
diff --git a/pages/csvimport.php b/pages/csvimport.php
index 001cc4d86..4ecc7f48f 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -51,7 +51,7 @@ try {
 	/**
 	 * Helper function to build a select from the list of valid classes for a given action
 	 *
-	 * @deprecated since 3.0.0 use GetClassesSelectUIBlock
+	 * @deprecated 3.0.0 use GetClassesSelectUIBlock
 	 *
 	 * @param $sDefaultValue
 	 * @param integer $iWidthPx The width (in pixels) of the drop-down list
diff --git a/sources/Application/WebPage/WebPage.php b/sources/Application/WebPage/WebPage.php
index 8a93cea1e..005902b49 100644
--- a/sources/Application/WebPage/WebPage.php
+++ b/sources/Application/WebPage/WebPage.php
@@ -1368,7 +1368,7 @@ JS;
 	 * Get an ID (for any kind of HTML tag) that is guaranteed unique in this page
 	 *
 	 * @return int The unique ID (in this page)
-	 * @deprecated since 3.0.0 use utils::GetUniqueId() instead
+	 * @deprecated 3.0.0 use utils::GetUniqueId() instead
 	 */
 	public function GetUniqueId()
 	{