Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r15590 -r15608
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15590)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 15608)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 15590 2012-10-18 15:37:18Z alex $
+* @version	$Id: application.php 15608 2012-11-06 17:21:28Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2453,48 +2453,48 @@
 	/**
 	 * Triggers email event of type Admin
 	 *
-	 * @param string $email_event_name
+	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
-	public function EmailEventAdmin($email_event_name, $to_user_id = null, $send_params = Array ())
+	public function emailAdmin($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
-		return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_ADMIN, $to_user_id, $send_params);
+		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_ADMIN, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers email event of type User
 	 *
-	 * @param string $email_event_name
+	 * @param string $email_template_name
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params, possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access public
 	 */
-	public function EmailEventUser($email_event_name, $to_user_id = null, $send_params = Array ())
+	public function emailUser($email_template_name, $to_user_id = null, $send_params = Array ())
 	{
-		return $this->_emailEvent($email_event_name, EmailEvent::EVENT_TYPE_FRONTEND, $to_user_id, $send_params);
+		return $this->_email($email_template_name, EmailTemplate::TEMPLATE_TYPE_FRONTEND, $to_user_id, $send_params);
 	}
 
 	/**
 	 * Triggers general email event
 	 *
-	 * @param string $email_event_name
-	 * @param int $email_event_type (0 for User, 1 for Admin)
+	 * @param string $email_template_name
+	 * @param int $email_template_type (0 for User, 1 for Admin)
 	 * @param int $to_user_id
 	 * @param array $send_params associative array of direct send params,
 	 *  possible keys: to_email, to_name, from_email, from_name, message, message_text
 	 * @return kEvent
 	 * @access protected
 	 */
-	protected function _emailEvent($email_event_name, $email_event_type, $to_user_id = null, $send_params = Array ())
+	protected function _email($email_template_name, $email_template_type, $to_user_id = null, $send_params = Array ())
 	{
 		$email = $this->makeClass('kEmail');
 		/* @var $email kEmail */
 
-		if ( !$email->findEvent($email_event_name, $email_event_type) ) {
+		if ( !$email->findTemplate($email_template_name, $email_template_type) ) {
 			return false;
 		}