diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
index d4f3f56be..0db4c79e5 100644
--- a/src/Forms/Controls/BaseControl.php
+++ b/src/Forms/Controls/BaseControl.php
@@ -18,7 +18,7 @@
  *
  * @author     David Grudl
  *
- * @property-read Nette\Forms\Form $form
+ * @property-read Form $form
  * @property-read string $htmlName
  * @property   string $htmlId
  * @property-read array $options
@@ -28,10 +28,10 @@
  * @property-write $defaultValue
  * @property   bool $disabled
  * @property   bool $omitted
- * @property-read Nette\Utils\Html $control
- * @property-read Nette\Utils\Html $label
- * @property-read Nette\Utils\Html $controlPrototype
- * @property-read Nette\Utils\Html $labelPrototype
+ * @property-read Html $control
+ * @property-read Html $label
+ * @property-read Html $controlPrototype
+ * @property-read Html $labelPrototype
  * @property-read Nette\Forms\Rules $rules
  * @property   bool $required
  * @property-read array $errors
@@ -47,10 +47,10 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var mixed current control value */
 	protected $value;
 
-	/** @var Nette\Utils\Html  control element template */
+	/** @var Html  control element template */
 	protected $control;
 
-	/** @var Nette\Utils\Html  label element template */
+	/** @var Html  label element template */
 	protected $label;
 
 	/** @var array */
@@ -103,7 +103,7 @@ protected function attached($form)
 	/**
 	 * Returns form.
 	 * @param  bool   throw exception if form doesn't exist?
-	 * @return Nette\Forms\Form
+	 * @return Form
 	 */
 	public function getForm($need = TRUE)
 	{
@@ -242,7 +242,7 @@ public function isOmitted()
 
 	/**
 	 * Generates control's HTML element.
-	 * @return Nette\Utils\Html|string
+	 * @return Html|string
 	 */
 	public function getControl()
 	{
@@ -261,7 +261,7 @@ public function getControl()
 	/**
 	 * Generates label's HTML element.
 	 * @param  string
-	 * @return Nette\Utils\Html|string
+	 * @return Html|string
 	 */
 	public function getLabel($caption = NULL)
 	{
@@ -274,7 +274,7 @@ public function getLabel($caption = NULL)
 
 	/**
 	 * Returns control's HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getControlPrototype()
 	{
@@ -284,7 +284,7 @@ public function getControlPrototype()
 
 	/**
 	 * Returns label's HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getLabelPrototype()
 	{
@@ -408,7 +408,7 @@ public function addCondition($validator, $value = NULL)
 
 	/**
 	 * Adds a validation condition based on another control a returns new branch.
-	 * @param  Nette\Forms\IControl form control
+	 * @param  IControl form control
 	 * @param  mixed      condition type
 	 * @param  mixed      optional condition arguments
 	 * @return Nette\Forms\Rules      new branch
diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
index 9375e349c..0fa5ba918 100644
--- a/src/Forms/Controls/CheckboxList.php
+++ b/src/Forms/Controls/CheckboxList.php
@@ -16,11 +16,11 @@
  *
  * @author     David Grudl
  *
- * @property-read Nette\Utils\Html $separatorPrototype
+ * @property-read Html $separatorPrototype
  */
 class CheckboxList extends MultiChoiceControl
 {
-	/** @var Nette\Utils\Html  separator element template */
+	/** @var Html  separator element template */
 	protected $separator;
 
 
@@ -59,7 +59,7 @@ public function getControl()
 	/**
 	 * Generates label's HTML element.
 	 * @param  string
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getLabel($caption = NULL)
 	{
@@ -69,7 +69,7 @@ public function getLabel($caption = NULL)
 
 	/**
 	 * Returns separator HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getSeparatorPrototype()
 	{
@@ -78,7 +78,7 @@ public function getSeparatorPrototype()
 
 
 	/**
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getControlPart($key)
 	{
@@ -93,7 +93,7 @@ public function getControlPart($key)
 
 
 	/**
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getLabelPart($key)
 	{
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
index b516bdf69..187232af5 100644
--- a/src/Forms/Controls/RadioList.php
+++ b/src/Forms/Controls/RadioList.php
@@ -16,22 +16,22 @@
  *
  * @author     David Grudl
  *
- * @property-read Nette\Utils\Html $separatorPrototype
- * @property-read Nette\Utils\Html $containerPrototype
- * @property-read Nette\Utils\Html $itemLabelPrototype
+ * @property-read Html $separatorPrototype
+ * @property-read Html $containerPrototype
+ * @property-read Html $itemLabelPrototype
  */
 class RadioList extends ChoiceControl
 {
 	/** @var bool */
 	public $generateId = FALSE;
 
-	/** @var Nette\Utils\Html  separator element template */
+	/** @var Html  separator element template */
 	protected $separator;
 
-	/** @var Nette\Utils\Html  container element template */
+	/** @var Html  container element template */
 	protected $container;
 
-	/** @var Nette\Utils\Html  item label template */
+	/** @var Html  item label template */
 	protected $itemLabel;
 
 
@@ -61,7 +61,7 @@ public function getValue()
 
 	/**
 	 * Returns separator HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getSeparatorPrototype()
 	{
@@ -71,7 +71,7 @@ public function getSeparatorPrototype()
 
 	/**
 	 * Returns container HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getContainerPrototype()
 	{
@@ -81,7 +81,7 @@ public function getContainerPrototype()
 
 	/**
 	 * Returns item label HTML element template.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getItemLabelPrototype()
 	{
@@ -91,7 +91,7 @@ public function getItemLabelPrototype()
 
 	/**
 	 * Generates control's HTML element.
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getControl()
 	{
@@ -123,7 +123,7 @@ public function getControl()
 	/**
 	 * Generates label's HTML element.
 	 * @param  string
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getLabel($caption = NULL)
 	{
@@ -132,7 +132,7 @@ public function getLabel($caption = NULL)
 
 
 	/**
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getControlPart($key)
 	{
@@ -146,7 +146,7 @@ public function getControlPart($key)
 
 
 	/**
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public function getLabelPart($key)
 	{
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
index da505dd78..63fc6767b 100644
--- a/src/Forms/Helpers.php
+++ b/src/Forms/Helpers.php
@@ -165,7 +165,7 @@ public static function createInputList(array $items, array $inputAttrs = NULL, a
 
 
 	/**
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	public static function createSelectBox(array $items, array $optionAttrs = NULL)
 	{
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
index 61b52e7b0..e72a0bb91 100644
--- a/src/Forms/Rendering/DefaultFormRenderer.php
+++ b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -456,7 +456,7 @@ public function renderControl(Nette\Forms\IControl $control)
 
 	/**
 	 * @param  string
-	 * @return Nette\Utils\Html
+	 * @return Html
 	 */
 	protected function getWrapper($name)
 	{
diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
index 0dab78020..c25ed83ec 100644
--- a/src/Forms/Validator.php
+++ b/src/Forms/Validator.php
@@ -40,7 +40,7 @@ class Validator extends Nette\Object
 		Form::MAX_POST_SIZE => 'The uploaded data exceeds the limit of %d bytes.',
 		Form::MIME_TYPE => 'The uploaded file is not in the expected format.',
 		Form::IMAGE => 'The uploaded file must be image in format JPEG, GIF or PNG.',
-		Nette\Forms\Controls\SelectBox::VALID => 'Please select a valid option.',
+		Controls\SelectBox::VALID => 'Please select a valid option.',
 	);