4 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php
index 97833710c0..32e0ef50bc 100644
--- a/phpBB/phpbb/notification/manager.php
+++ b/phpBB/phpbb/notification/manager.php
@@ -525,7 +525,7 @@ class phpbb_notification_manager
 		{
 			$type = $this->get_item_type_class($type_name);
 
-			if ($type instanceof phpbb_notification_type_interface && $type->is_available())
+			if ($type instanceof phpbb_notification_type_type_interface && $type->is_available())
 			{
 				$options = array_merge(array(
 					'id'		=> $type->get_type(),
@@ -561,7 +561,7 @@ class phpbb_notification_manager
 		{
 			$method = $this->get_method_class($method_name);
 
-			if ($method instanceof phpbb_notification_method_interface && $method->is_available())
+			if ($method instanceof phpbb_notification_method_method_interface && $method->is_available())
 			{
 				$subscription_methods[$method_name] = array(
 					'id'		=> $method->get_type(),
diff --git a/phpBB/phpbb/notification/method/base.php b/phpBB/phpbb/notification/method/base.php
index b633956d01..fbff75b59f 100644
--- a/phpBB/phpbb/notification/method/base.php
+++ b/phpBB/phpbb/notification/method/base.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications method class
 * @package notifications
 */
-abstract class phpbb_notification_method_base implements phpbb_notification_method_interface
+abstract class phpbb_notification_method_base implements phpbb_notification_method_method_interface
 {
 	/** @var phpbb_notification_manager */
 	protected $notification_manager;
@@ -30,7 +30,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/** @var phpbb_db_driver */
 	protected $db;
 
-	/** @var phpbb_cache_driver_interface */
+	/** @var phpbb_cache_driver_driver_interface */
 	protected $cache;
 
 	/** @var phpbb_template */
@@ -66,7 +66,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_driver_driver_interface $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -74,7 +74,7 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	* @param string $php_ext
 	* @return phpbb_notification_method_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;
@@ -99,9 +99,9 @@ abstract class phpbb_notification_method_base implements phpbb_notification_meth
 	/**
 	* Add a notification to the queue
 	*
-	* @param phpbb_notification_type_interface $notification
+	* @param phpbb_notification_type_type_interface $notification
 	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification)
+	public function add_to_queue(phpbb_notification_type_type_interface $notification)
 	{
 		$this->queue[] = $notification;
 	}
diff --git a/phpBB/phpbb/notification/method/method_interface.php b/phpBB/phpbb/notification/method/method_interface.php
index b3ca757d5f..bd21d924e4 100644
--- a/phpBB/phpbb/notification/method/method_interface.php
+++ b/phpBB/phpbb/notification/method/method_interface.php
@@ -37,9 +37,9 @@ interface phpbb_notification_method_method_interface
 	/**
 	* Add a notification to the queue
 	*
-	* @param phpbb_notification_type_interface $notification
+	* @param phpbb_notification_type_type_interface $notification
 	*/
-	public function add_to_queue(phpbb_notification_type_interface $notification);
+	public function add_to_queue(phpbb_notification_type_type_interface $notification);
 
 	/**
 	* Parse the queue and notify the users
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php
index 46517f1c9b..a7434fc9a7 100644
--- a/phpBB/phpbb/notification/type/base.php
+++ b/phpBB/phpbb/notification/type/base.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Base notifications class
 * @package notifications
 */
-abstract class phpbb_notification_type_base implements phpbb_notification_type_interface
+abstract class phpbb_notification_type_base implements phpbb_notification_type_type_interface
 {
 	/** @var phpbb_notification_manager */
 	protected $notification_manager;
@@ -30,7 +30,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	/** @var phpbb_db_driver */
 	protected $db;
 
-	/** @var phpbb_cache_driver_interface */
+	/** @var phpbb_cache_driver_driver_interface */
 	protected $cache;
 
 	/** @var phpbb_template */
@@ -96,7 +96,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* 
 	* @param phpbb_user_loader $user_loader
 	* @param phpbb_db_driver $db
-	* @param phpbb_cache_driver_interface $cache
+	* @param phpbb_cache_driver_driver_interface $cache
 	* @param phpbb_user $user
 	* @param phpbb_auth $auth
 	* @param phpbb_config $config
@@ -107,7 +107,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
 	* @param string $user_notifications_table
 	* @return phpbb_notification_type_base
 	*/
-	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
+	public function __construct(phpbb_user_loader $user_loader, phpbb_db_driver $db, phpbb_cache_driver_driver_interface $cache, $user, phpbb_auth $auth, phpbb_config $config, $phpbb_root_path, $php_ext, $notification_types_table, $notifications_table, $user_notifications_table)
 	{
 		$this->user_loader = $user_loader;
 		$this->db = $db;