diff --git a/src/Components/Actions/Action.php b/src/Components/Actions/Action.php
index 30215793..8515de9b 100644
--- a/src/Components/Actions/Action.php
+++ b/src/Components/Actions/Action.php
@@ -22,8 +22,8 @@
  * @author      Petr Bugyík
  *
  * @property-read Html $element
- * @property-write callback $customRender
- * @property-write callback $disable
+ * @property-write callable $customRender
+ * @property-write callable $disable
  * @property Html $elementPrototype
  * @property string $primaryKey
  * @property string $options
@@ -35,13 +35,13 @@ abstract class Action extends \Grido\Components\Component
     /** @var Html <a> html tag */
     protected $elementPrototype;
 
-    /** @var callback for custom rendering */
+    /** @var callable for custom rendering */
     protected $customRender;
 
     /** @var string - name of primary key f.e.: link->('Article:edit', array($primaryKey => 1)) */
     protected $primaryKey;
 
-    /** @var callback for disabling */
+    /** @var callable for disabling */
     protected $disable;
 
     /** @var string */
@@ -73,7 +73,7 @@ public function setElementPrototype(Html $elementPrototype)
 
     /**
      * Sets callback for custom rendering.
-     * @param callback
+     * @param callable
      * @return Action
      */
     public function setCustomRender($callback)
@@ -96,7 +96,7 @@ public function setPrimaryKey($primaryKey)
     /**
      * Sets callback for disable.
      * Callback should return TRUE if the action is not allowed for current item.
-     * @param callback
+     * @param callable
      * @return Action
      */
     public function setDisable($callback)
diff --git a/src/Components/Actions/Href.php b/src/Components/Actions/Href.php
index 0ccd3a3c..47822650 100644
--- a/src/Components/Actions/Href.php
+++ b/src/Components/Actions/Href.php
@@ -30,7 +30,7 @@ class Href extends Action
     /** @var array second param for method $presenter->link() */
     protected $arguments = [];
 
-    /** @var callback for custom href attribute creating */
+    /** @var callable for custom href attribute creating */
     protected $customHref;
 
     /**
@@ -50,7 +50,7 @@ public function __construct($grid, $name, $label, $destination = NULL, array $ar
 
     /**
      * Sets callback for custom link creating.
-     * @param callback $callback
+     * @param callable $callback
      * @return Href
      */
     public function setCustomHref($callback)
diff --git a/src/Components/Columns/Column.php b/src/Components/Columns/Column.php
index 08cb3349..93fccc21 100644
--- a/src/Components/Columns/Column.php
+++ b/src/Components/Columns/Column.php
@@ -24,7 +24,7 @@
  * @property-read string $sort
  * @property-read \Nette\Utils\Html $cellPrototype
  * @property-read \Nette\Utils\Html $headerPrototype
- * @property-write callback $cellCallback
+ * @property-write callable $cellCallback
  * @property-write string $defaultSorting
  * @property mixed $customRender
  * @property-write array $customRenderVariables
@@ -51,7 +51,7 @@ abstract class Column extends \Grido\Components\Component
     /** @var \Nette\Utils\Html <td> html tag */
     protected $cellPrototype;
 
-    /** @var callback returns td html element; function($row, Html $td) */
+    /** @var callable returns td html element; function($row, Html $td) */
     protected $cellCallback;
 
     /** @var \Nette\Utils\Html <th> html tag */
@@ -149,7 +149,7 @@ public function setCustomRenderExport($callback)
     }
 
     /**
-     * @param callback $callback
+     * @param callable $callback
      * @return Column
      */
     public function setCellCallback($callback)
diff --git a/src/Components/Columns/Editable.php b/src/Components/Columns/Editable.php
index 10a0c264..38231f8a 100644
--- a/src/Components/Columns/Editable.php
+++ b/src/Components/Columns/Editable.php
@@ -22,9 +22,9 @@
  * @author      Petr Bugyík
  *
  * @property \Nette\Forms\IControl $editableControl
- * @property callback $editableCallback
- * @property callback $editableValueCallback
- * @property callback $editableRowCallback
+ * @property callable $editableCallback
+ * @property callable $editableValueCallback
+ * @property callable $editableRowCallback
  * @property bool $editable
  * @property bool $editableDisabled
  */
@@ -39,18 +39,18 @@ abstract class Editable extends Column
     /** @var \Nette\Forms\IControl Custom control for inline editing */
     protected $editableControl;
 
-    /** @var callback for custom handling with edited data; function($id, $newValue, $oldValue, Editable $column) {} */
+    /** @var callable for custom handling with edited data; function($id, $newValue, $oldValue, Editable $column) {} */
     protected $editableCallback;
 
-    /** @var callback for custom value; function($row, Columns\Editable $column) {} */
+    /** @var callable for custom value; function($row, Columns\Editable $column) {} */
     protected $editableValueCallback;
 
-    /** @var callback for getting row; function($row, Columns\Editable $column) {} */
+    /** @var callable for getting row; function($row, Columns\Editable $column) {} */
     protected $editableRowCallback;
 
     /**
      * Sets column as editable.
-     * @param callback $callback function($id, $newValue, $oldValue, Columns\Editable $column) {}
+     * @param callable $callback function($id, $newValue, $oldValue, Columns\Editable $column) {}
      * @param \Nette\Forms\IControl $control
      * @return Editable
      */
@@ -80,7 +80,7 @@ public function setEditableControl(\Nette\Forms\IControl $control)
 
     /**
      * Sets editable callback.
-     * @param callback $callback function($id, $newValue, $oldValue, Columns\Editable $column) {}
+     * @param callable $callback function($id, $newValue, $oldValue, Columns\Editable $column) {}
      * @return Editable
      */
     public function setEditableCallback($callback)
@@ -93,7 +93,7 @@ public function setEditableCallback($callback)
 
     /**
      * Sets editable value callback.
-     * @param callback $callback for custom value; function($row, Columns\Editable $column) {}
+     * @param callable $callback for custom value; function($row, Columns\Editable $column) {}
      * @return Editable
      */
     public function setEditableValueCallback($callback)
@@ -106,7 +106,7 @@ public function setEditableValueCallback($callback)
 
     /**
      * Sets editable row callback - it's required when used editable collumn with customRenderCallback
-     * @param callback $callback for getting row; function($id, Columns\Editable $column) {}
+     * @param callable $callback for getting row; function($id, Columns\Editable $column) {}
      * @return Editable
      */
     public function setEditableRowCallback($callback)
@@ -224,7 +224,7 @@ public function getEditableControl()
     }
 
     /**
-     * @return callback
+     * @return callable
      * @internal
      */
     public function getEditableCallback()
@@ -233,7 +233,7 @@ public function getEditableCallback()
     }
 
     /**
-     * @return callback
+     * @return callable
      * @internal
      */
     public function getEditableValueCallback()
@@ -242,7 +242,7 @@ public function getEditableValueCallback()
     }
 
     /**
-     * @return callback
+     * @return callable
      * @internal
      */
     public function getEditableRowCallback()
diff --git a/src/Components/Container.php b/src/Components/Container.php
index 692d8e82..05dbf0a2 100644
--- a/src/Components/Container.php
+++ b/src/Components/Container.php
@@ -370,7 +370,7 @@ public function addActionHref($name, $label, $destination = NULL, array $argumen
     /**
      * @param string $name
      * @param string $label
-     * @param callback $onClick
+     * @param callable $onClick
      * @return Actions\Event
      */
     public function addActionEvent($name, $label, $onClick = NULL)
@@ -382,7 +382,7 @@ public function addActionEvent($name, $label, $onClick = NULL)
 
     /**
      * @param array $operations
-     * @param callback $onSubmit - callback after operation submit
+     * @param callable $onSubmit - callback after operation submit
      * @return Operation
      */
     public function setOperation(array $operations, $onSubmit)
@@ -415,7 +415,7 @@ public function addButton($name, $label = NULL, $destination = NULL, array $argu
     /**
      * Sets all columns as editable.
      * First parameter is optional and is for implementation of method for saving modified data.
-     * @param callback $callback function($id, $newValue, $oldValue, Editable $column) {}
+     * @param callable $callback function($id, $newValue, $oldValue, Editable $column) {}
      * @return Grid
      */
     public function setEditableColumns($callback = NULL)
diff --git a/src/Components/Filters/Text.php b/src/Components/Filters/Text.php
index ee9a5082..85c264fb 100644
--- a/src/Components/Filters/Text.php
+++ b/src/Components/Filters/Text.php
@@ -21,7 +21,7 @@
  * @author      Petr Bugyík
  *
  * @property int $suggestionLimit
- * @property-write callback $suggestionCallback
+ * @property-write callable $suggestionCallback
  */
 class Text extends Filter
 {
@@ -40,7 +40,7 @@ class Text extends Filter
     /** @var int */
     protected $suggestionLimit = 10;
 
-    /** @var callback */
+    /** @var callable */
     protected $suggestionCallback;
 
     /**
@@ -82,7 +82,7 @@ public function setSuggestionLimit($limit)
 
     /**
      * Sets custom data callback.
-     * @param callback $callback
+     * @param callable $callback
      * @return \Grido\Components\Filters\Text
      */
     public function setSuggestionCallback($callback)
@@ -102,7 +102,7 @@ public function getSuggestionLimit()
     }
 
     /**
-     * @return callback
+     * @return callable
      */
     public function getSuggestionCallback()
     {
diff --git a/src/Components/Operation.php b/src/Components/Operation.php
index c55c1120..1638e1fe 100644
--- a/src/Components/Operation.php
+++ b/src/Components/Operation.php
@@ -38,7 +38,7 @@ class Operation extends Component
     /**
      * @param \Grido\Grid $grid
      * @param array $operations
-     * @param callback $onSubmit - callback after operation submit
+     * @param callable $onSubmit - callback after operation submit
      */
     public function __construct($grid, array $operations, $onSubmit)
     {
diff --git a/src/Grid.php b/src/Grid.php
index 1e078ab5..65841998 100644
--- a/src/Grid.php
+++ b/src/Grid.php
@@ -43,7 +43,7 @@
  * @property string $primaryKey
  * @property string $filterRenderType
  * @property DataSources\IDataSource $model
- * @property callback $rowCallback
+ * @property callable $rowCallback
  * @property bool $strictMode
  * @method void onRegistered(Grid $grid)
  * @method void onRender(Grid $grid)
@@ -77,7 +77,7 @@ class Grid extends Components\Container
     /** @var array event for modifying data */
     public $onFetchData;
 
-    /** @var callback returns tr html element; function($row, Html $tr) */
+    /** @var callable returns tr html element; function($row, Html $tr) */
     protected $rowCallback;
 
     /** @var \Nette\Utils\Html */
@@ -432,7 +432,7 @@ public function getRememberState()
 
     /**
      * Returns row callback.
-     * @return callback
+     * @return callable
      */
     public function getRowCallback()
     {