diff --git a/src/Forms/Container.php b/src/Forms/Container.php
index 96043ad45..80804a317 100644
--- a/src/Forms/Container.php
+++ b/src/Forms/Container.php
@@ -26,7 +26,10 @@ class Container extends Nette\ComponentModel\Container implements \ArrayAccess
 
 	private const ARRAY = 'array';
 
-	/** @var callable[]&((callable(Container, array|object|null): void)|(callable(array|object|null): void))[]; Occurs when the form was validated */
+	/**
+	 * Occurs when the form was validated
+	 * @var array<callable(self, array|object): void|callable(array|object): void>
+	 */
 	public $onValidate = [];
 
 	/** @var ControlGroup|null */
diff --git a/src/Forms/Controls/SubmitButton.php b/src/Forms/Controls/SubmitButton.php
index 02f40adf5..06cf9291b 100644
--- a/src/Forms/Controls/SubmitButton.php
+++ b/src/Forms/Controls/SubmitButton.php
@@ -19,10 +19,13 @@
  */
 class SubmitButton extends Button implements Nette\Forms\SubmitterControl
 {
-	/** @var callable[]&((callable(Nette\Forms\Form|SubmitButton, array|object): void)|(callable(array|object): void))[]; Occurs when the button is clicked and form is successfully validated */
+	/**
+	 * Occurs when the button is clicked and form is successfully validated
+	 * @var array<callable(self, array|object): void|callable(Nette\Forms\Form, array|object): void|callable(array|object): void>
+	 */
 	public $onClick = [];
 
-	/** @var callable[]&(callable(SubmitButton): void)[]; Occurs when the button is clicked and form is not validated */
+	/** @var array<callable(self): void>  Occurs when the button is clicked and form is not validated */
 	public $onInvalidClick = [];
 
 	/** @var array|null */
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index 5209a3e39..05f3b6f50 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -82,16 +82,19 @@ class Form extends Container implements Nette\HtmlStringable
 	/** @internal protection token ID */
 	public const PROTECTOR_ID = '_token_';
 
-	/** @var callable[]&((callable(Form, array|object): void)|(callable(array|object): void))[]; Occurs when the form is submitted and successfully validated */
+	/**
+	 * Occurs when the form is submitted and successfully validated
+	 * @var array<callable(self, array|object): void|callable(array|object): void>
+	 */
 	public $onSuccess = [];
 
-	/** @var callable[]&(callable(Form): void)[]; Occurs when the form is submitted and is not valid */
+	/** @var array<callable(self): void>  Occurs when the form is submitted and is not valid */
 	public $onError = [];
 
-	/** @var callable[]&(callable(Form): void)[]; Occurs when the form is submitted */
+	/** @var array<callable(self): void>  Occurs when the form is submitted */
 	public $onSubmit = [];
 
-	/** @var callable[]&(callable(Form): void)[]; Occurs before the form is rendered */
+	/** @var array<callable(self): void>  Occurs before the form is rendered */
 	public $onRender = [];
 
 	/** @internal @var Nette\Http\IRequest  used only by standalone form */