diff --git a/classes/controller/kostache.php b/classes/controller/layout.php
similarity index 55%
rename from classes/controller/kostache.php
rename to classes/controller/layout.php
index c5c3146..350aa3b 100644
--- a/classes/controller/kostache.php
+++ b/classes/controller/layout.php
@@ -1,14 +1,14 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-abstract class Controller_Kostache extends Controller {
+abstract class Controller_Layout extends Controller {
 
 	/**
-	 * @var  string  page template
+	 * @var  string  page layout
 	 */
-	public $template = 'template';
+	public $template = 'layout';
 
 	/**
-	 * @var  boolean  auto render template
+	 * @var  boolean  auto render layout
 	 **/
 	public $auto_render = TRUE;
 
@@ -19,15 +19,16 @@ abstract class Controller_Kostache extends Controller {
 	{
 		if ($this->auto_render === TRUE)
 		{
-			// Load the template
-			$this->template = Walrus::factory($this->template);
+			// Load the layout
+			$view_class = 'View_'.$this->template;
+			$this->template = new $view_class;
 		}
 
 		return parent::before();
 	}
 
 	/**
-	 * Assigns the template [View] as the request response.
+	 * Assigns the layout [View] as the request response.
 	 */
 	public function after()
 	{
@@ -39,4 +40,4 @@ abstract class Controller_Kostache extends Controller {
 		return parent::after();
 	}
 
-} // End Controller_Kostache
+} // End Controller_Layout
diff --git a/classes/view/template.php b/classes/view/layout.php
similarity index 79%
rename from classes/view/template.php
rename to classes/view/layout.php
index fd958fd..6c6ce09 100644
--- a/classes/view/template.php
+++ b/classes/view/layout.php
@@ -1,6 +1,6 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class View_Template extends Kostache {
+class View_Layout extends Kostache {
 
 	/**
 	 * @var string template title
diff --git a/templates/template.mustache b/templates/layout.mustache
similarity index 100%
rename from templates/template.mustache
rename to templates/layout.mustache