diff --git a/framework/control.class.php b/framework/control.class.php
index d10c16c270..a766bb21b7 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -33,8 +33,10 @@ class control extends baseControl
     {
         parent::__construct($moduleName, $methodName, $appName);
 
-        $className = get_class($this);
-        if(strtolower(substr($className, -6)) == 'control') $this->loadModel($moduleName, $appName, 'zen');
+        if(!$moduleName) $moduleName = $this->moduleName;
+
+        $className = strtolower(get_class($this));
+        if($className == $moduleName || $className == 'my' . $moduleName) $this->loadModel($moduleName, $appName, 'zen');
 
         $this->app->setOpenApp();
 
@@ -591,7 +593,7 @@ class control extends baseControl
     public function __call($method, $arguments)
     {
         $moduleName = $this->app->getModuleName();
-        $taoClass   = $moduleName . 'Tao';
+        $taoClass   = $moduleName . 'Zen';
 
         if(!is_callable(array($this->{$taoClass}, $method))) $this->app->triggerError("the module {$moduleName} has no {$method} method", __FILE__, __LINE__, $exit = true);
 
@@ -610,7 +612,7 @@ class control extends baseControl
     {
         global $app;
         $moduleName = $app->getModuleName();
-        $taoClass   = $moduleName . 'Tao';
+        $taoClass   = $moduleName . 'Zen';
 
         if(!is_callable("{$taoClass}::{$method}")) $app->triggerError("the module {$moduleName} has no {$method} method", __FILE__, __LINE__, $exit = true);
 
diff --git a/framework/model.class.php b/framework/model.class.php
index 80a7c5a450..8401f940f7 100644
--- a/framework/model.class.php
+++ b/framework/model.class.php
@@ -31,12 +31,9 @@ class model extends baseModel
     {
         parent::__construct($appName);
 
-        $className = get_class($this);
-        if(strtolower(substr($className, -5)) == 'model')
-        {
-            $moduleName = $this->app->getModuleName();
-            $this->loadModel($moduleName, $appName, 'tao');
-        }
+        $className  = strtolower(get_class($this));
+        $moduleName = $this->app->getModuleName();
+        if($className == $moduleName . 'model' || $className == 'ext' . $moduleName . 'model') $this->loadModel($moduleName, $appName, 'tao');
     }
 
     /**