diff --git a/phpBB/includes/notifications/service.php b/phpBB/includes/notification/manager.php
similarity index 99%
rename from phpBB/includes/notifications/service.php
rename to phpBB/includes/notification/manager.php
index 2bf21cefa5..15db3f89fd 100644
--- a/phpBB/includes/notifications/service.php
+++ b/phpBB/includes/notification/manager.php
@@ -360,7 +360,7 @@ class phpbb_notification_manager
 				{
 					if (!isset($notification_methods[$method]))
 					{
-						$method_class_name = 'phpbb_notifications_method_' . $method;
+						$method_class_name = 'phpbb_notification_method_' . $method;
 						$notification_methods[$method] = new $method_class_name($this->phpbb_container);
 					}
 
@@ -496,7 +496,7 @@ class phpbb_notification_manager
 
 		foreach ($this->get_subscription_files('notifications/method/') as $method_name => $file)
 		{
-			$class_name = 'phpbb_notifications_method_' . $method_name;
+			$class_name = 'phpbb_notification_method_' . $method_name;
 
 			if (!class_exists($class_name))
 			{
@@ -651,7 +651,7 @@ class phpbb_notification_manager
 			$item_type = preg_replace('#[^a-z_]#', '', $item_type);
 		}
 
-		return 'phpbb_notifications_type_' . $item_type;
+		return 'phpbb_notification_type_' . $item_type;
 	}
 
 	/**
diff --git a/phpBB/includes/notifications/method/base.php b/phpBB/includes/notification/method/base.php
similarity index 100%
rename from phpBB/includes/notifications/method/base.php
rename to phpBB/includes/notification/method/base.php
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notification/method/email.php
similarity index 100%
rename from phpBB/includes/notifications/method/email.php
rename to phpBB/includes/notification/method/email.php
diff --git a/phpBB/includes/notifications/method/interface.php b/phpBB/includes/notification/method/interface.php
similarity index 100%
rename from phpBB/includes/notifications/method/interface.php
rename to phpBB/includes/notification/method/interface.php
diff --git a/phpBB/includes/notifications/method/jabber.php b/phpBB/includes/notification/method/jabber.php
similarity index 100%
rename from phpBB/includes/notifications/method/jabber.php
rename to phpBB/includes/notification/method/jabber.php
diff --git a/phpBB/includes/notifications/type/approve_post.php b/phpBB/includes/notification/type/approve_post.php
similarity index 100%
rename from phpBB/includes/notifications/type/approve_post.php
rename to phpBB/includes/notification/type/approve_post.php
diff --git a/phpBB/includes/notifications/type/approve_topic.php b/phpBB/includes/notification/type/approve_topic.php
similarity index 100%
rename from phpBB/includes/notifications/type/approve_topic.php
rename to phpBB/includes/notification/type/approve_topic.php
diff --git a/phpBB/includes/notifications/type/base.php b/phpBB/includes/notification/type/base.php
similarity index 100%
rename from phpBB/includes/notifications/type/base.php
rename to phpBB/includes/notification/type/base.php
diff --git a/phpBB/includes/notifications/type/bookmark.php b/phpBB/includes/notification/type/bookmark.php
similarity index 100%
rename from phpBB/includes/notifications/type/bookmark.php
rename to phpBB/includes/notification/type/bookmark.php
diff --git a/phpBB/includes/notifications/type/disapprove_post.php b/phpBB/includes/notification/type/disapprove_post.php
similarity index 100%
rename from phpBB/includes/notifications/type/disapprove_post.php
rename to phpBB/includes/notification/type/disapprove_post.php
diff --git a/phpBB/includes/notifications/type/disapprove_topic.php b/phpBB/includes/notification/type/disapprove_topic.php
similarity index 100%
rename from phpBB/includes/notifications/type/disapprove_topic.php
rename to phpBB/includes/notification/type/disapprove_topic.php
diff --git a/phpBB/includes/notifications/type/interface.php b/phpBB/includes/notification/type/interface.php
similarity index 100%
rename from phpBB/includes/notifications/type/interface.php
rename to phpBB/includes/notification/type/interface.php
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notification/type/pm.php
similarity index 100%
rename from phpBB/includes/notifications/type/pm.php
rename to phpBB/includes/notification/type/pm.php
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notification/type/post.php
similarity index 100%
rename from phpBB/includes/notifications/type/post.php
rename to phpBB/includes/notification/type/post.php
diff --git a/phpBB/includes/notifications/type/post_in_queue.php b/phpBB/includes/notification/type/post_in_queue.php
similarity index 100%
rename from phpBB/includes/notifications/type/post_in_queue.php
rename to phpBB/includes/notification/type/post_in_queue.php
diff --git a/phpBB/includes/notifications/type/quote.php b/phpBB/includes/notification/type/quote.php
similarity index 100%
rename from phpBB/includes/notifications/type/quote.php
rename to phpBB/includes/notification/type/quote.php
diff --git a/phpBB/includes/notifications/type/topic.php b/phpBB/includes/notification/type/topic.php
similarity index 100%
rename from phpBB/includes/notifications/type/topic.php
rename to phpBB/includes/notification/type/topic.php
diff --git a/phpBB/includes/notifications/type/topic_in_queue.php b/phpBB/includes/notification/type/topic_in_queue.php
similarity index 100%
rename from phpBB/includes/notifications/type/topic_in_queue.php
rename to phpBB/includes/notification/type/topic_in_queue.php