diff --git a/classes/controller/ModuleAdminController.php b/classes/controller/ModuleAdminController.php
index b28c08904..60cef6dd0 100644
--- a/classes/controller/ModuleAdminController.php
+++ b/classes/controller/ModuleAdminController.php
@@ -64,8 +64,8 @@ abstract class ModuleAdminControllerCore extends AdminController
 	 */
 	public function getTemplatePath()
 	{
-		if (file_exists(_PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/admin/'.$template))
-			return _PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/admin/'.$template;
+		if (file_exists(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$template))
+			return _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/admin/'.$template;
 		return _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/';
 	}
 }
diff --git a/classes/controller/ModuleFrontController.php b/classes/controller/ModuleFrontController.php
index d5eeb4725..7da522ba2 100644
--- a/classes/controller/ModuleFrontController.php
+++ b/classes/controller/ModuleFrontController.php
@@ -68,8 +68,8 @@ class ModuleFrontControllerCore extends FrontController
 	 */
 	public function getTemplatePath()
 	{
-		if (file_exists(_PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/front/'.$template))
-			return _PS_THEME_DIR_.'modules/'.$this->name.'/views/templates/front/'.$template;
+		if (file_exists(_PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template))
+			return _PS_THEME_DIR_.'modules/'.$this->module->name.'/views/templates/front/'.$template;
 		return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/';
 	}
 }