diff --git a/src/BuildDirector/LegacyBuildDirector.php b/src/BuildDirector/LegacyBuildDirector.php
index ba28304546322942fcbe143581d1f80a8da7d710..90e01620403535ff1d204cb9222cbc4be5e97177 100644
--- a/src/BuildDirector/LegacyBuildDirector.php
+++ b/src/BuildDirector/LegacyBuildDirector.php
@@ -27,7 +27,7 @@ class LegacyBuildDirector {
 	}
 
 	/**
-	 * Returns built pluginPluginAccess.php
+	 * Returns built plugin
 	 *
 	 * @return AbstractPlugin
 	 */
diff --git a/src/Plugin/ActivationTracker.php b/src/Plugin/ActivationTracker.php
index b35560582f1fc55823c0855029609ba2fb305cc1..e9a217a766ead233f62db8099b9ce8e915f38b18 100644
--- a/src/Plugin/ActivationTracker.php
+++ b/src/Plugin/ActivationTracker.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: grola
- * Date: 25.07.18
- * Time: 16:55
- */
 
 namespace WPDesk\PluginBuilder\Plugin;
 
diff --git a/src/Plugin/HookableParetn.php b/src/Plugin/HookableParent.php
similarity index 85%
rename from src/Plugin/HookableParetn.php
rename to src/Plugin/HookableParent.php
index e99e19d3f73cf3eb49775a0dbd6f2e109365e3ff..937ff77efe5ba9c3528e69c3fd78586369e9db34 100644
--- a/src/Plugin/HookableParetn.php
+++ b/src/Plugin/HookableParent.php
@@ -16,7 +16,7 @@ trait HookableParent {
 	 *
 	 * @param Hookable|HookablePluginDependant $hookable_object Hookable object.
 	 */
-	public function add_hookable( $hookable_object ) {
+	public function add_hookable( Hookable $hookable_object ) {
 		if ( $hookable_object instanceof HookablePluginDependant ) {
 			$hookable_object->set_plugin( $this );
 		}
@@ -26,7 +26,7 @@ trait HookableParent {
 	/**
 	 * Run hooks method on all hookable objects.
 	 */
-	protected function hooks_no_hookable_objects() {
+	protected function hooks_on_hookable_objects() {
 		/** @var Hookable $hookable_object $hookable_object */
 		foreach ( $this->hookable_objects as $hookable_object ) {
 			$hookable_object->hooks();
diff --git a/src/Plugin/Template.php b/src/Plugin/TemplateLoad.php
similarity index 94%
rename from src/Plugin/Template.php
rename to src/Plugin/TemplateLoad.php
index 9e1ca9bb1a0b54cbe3ca694e35abfc40256be2d3..89f1f782942be4944157d06d95ed209a01c70aaa 100644
--- a/src/Plugin/Template.php
+++ b/src/Plugin/TemplateLoad.php
@@ -2,21 +2,21 @@
 
 namespace WPDesk\PluginBuilder\Plugin;
 
-trait Template {
+trait TemplateLoad {
 
 	/**
 	 * Plugin path.
 	 *
 	 * @var string
 	 */
-	public $plugin_path;
+	protected $plugin_path;
 
 	/**
 	 * Template path.
 	 *
 	 * @var string
 	 */
-	public $template_path;
+	protected $template_path;
 
 	/**
 	 * Init base variables for plugin