diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
index afcde062a..5eb2b42b5 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Copyright (C) 2013-2020 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -91,7 +91,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param string $sJson
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 *
 	 * @throws \Exception
 	 * @throws \ArchivedObjectException
@@ -175,7 +175,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param \Symfony\Component\DependencyInjection\ContainerInterface $oContainer
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetContainer(ContainerInterface $oContainer)
 	{
@@ -197,7 +197,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param \DBObject $oObject
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetObject(DBObject $oObject)
 	{
@@ -219,7 +219,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param string $sMode
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetMode($sMode)
 	{
@@ -241,7 +241,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param boolean $bIsSubmittable
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetIsSubmittable($bIsSubmittable)
 	{
@@ -263,7 +263,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param string $sActionRulesToken
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetActionRulesToken($sActionRulesToken)
 	{
@@ -285,7 +285,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param array $aFormProperties
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetFormProperties($aFormProperties)
 	{
@@ -307,7 +307,7 @@ class ObjectFormManager extends FormManager
 	 *
 	 * @param array $aCallbackUrls
 	 *
-	 * @return \Combodo\iTop\Portal\Form\ObjectFormManager
+	 * @return $this
 	 */
 	public function SetCallbackUrls($aCallbackUrls)
 	{
diff --git a/sources/form/formmanager.class.inc.php b/sources/form/formmanager.class.inc.php
index 8d733ae60..3b34e089a 100644
--- a/sources/form/formmanager.class.inc.php
+++ b/sources/form/formmanager.class.inc.php
@@ -1,21 +1,22 @@
 <?php
 
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
 
 namespace Combodo\iTop\Form;
 
@@ -40,7 +41,7 @@ abstract class FormManager
 	 * - formrenderer_endpoint : The endpoint of the renderer
 	 *
 	 * @param string $sJson
-	 * @return \Combodo\iTop\Form\FormManager
+	 * @return $this
 	 */
 	static function FromJSON($sJson)
 	{
@@ -89,7 +90,7 @@ abstract class FormManager
 	/**
 	 *
 	 * @param \Combodo\iTop\Form\Form $oForm
-	 * @return \Combodo\iTop\Form\FormManager
+	 * @return $this
 	 */
 	public function SetForm(Form $oForm)
 	{
@@ -109,7 +110,7 @@ abstract class FormManager
 	/**
 	 *
 	 * @param \Combodo\iTop\Renderer\FormRenderer $oRenderer
-	 * @return \Combodo\iTop\Form\FormManager
+	 * @return $this
 	 */
 	public function SetRenderer(FormRenderer $oRenderer)
 	{
@@ -149,9 +150,24 @@ abstract class FormManager
 
 	abstract public function Build();
 
+	/**
+	 * @param array|null $aArgs
+	 *
+	 * @return mixed
+	 */
 	abstract public function OnUpdate($aArgs = null);
 
+	/**
+	 * @param array|null $aArgs
+	 *
+	 * @return mixed
+	 */
 	abstract public function OnSubmit($aArgs = null);
 
+	/**
+	 * @param array|null $aArgs
+	 *
+	 * @return mixed
+	 */
 	abstract public function OnCancel($aArgs = null);
 }