diff --git a/src/Form/ViewState.php b/src/Form/ViewState.php
index c2ecaab..777618b 100644
--- a/src/Form/ViewState.php
+++ b/src/Form/ViewState.php
@@ -4,7 +4,7 @@
  * http://www.alternateinterior.com/2006/09/a-viewstate-for-php.html
  * Управление состоянием между страницами
  */
-class ViewState // extends Collection
+class Form_ViewState // extends Collection
 {
     private $values = array();
 
@@ -13,7 +13,7 @@ class ViewState // extends Collection
         $this->values[$name] = $value;
     }
 
-    function get() 
+    function get($_rest) 
     {
         $args = func_get_args();
         $result = $this->values;
diff --git a/src/Tools/Drawing.php b/src/Tools/Drawing.php
index 85cbdfa..e13a323 100644
--- a/src/Tools/Drawing.php
+++ b/src/Tools/Drawing.php
@@ -1,6 +1,6 @@
 <?php
 
-class Drawing
+class Tools_Drawing
 {
     const ALIGN_LEFT   = "left";
     const ALIGN_TOP    = "top";
diff --git a/src/Tools/Image.php b/src/Tools/Image.php
index 04350a1..b7f7c1b 100644
--- a/src/Tools/Image.php
+++ b/src/Tools/Image.php
@@ -1,6 +1,6 @@
 <?php
 
-class Core_Tools_Image
+class Tools_Image
 {    
     static function load($uri)
     {
diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php
index 302678e..8b03b4c 100644
--- a/src/Tools/TemplateImage.php
+++ b/src/Tools/TemplateImage.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'core/tools/drawing.php';
-
 /**
  * Формат для композиции изображений
  */