15 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index c4c1d2979a..00fc1a5cb7 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -242,5 +242,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	$cron = new cron_manager();
+	$cron = new phpbb_cron_manager();
 }
diff --git a/phpBB/cron.php b/phpBB/cron.php
index cad83109dc..0520fae1b4 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -63,7 +63,7 @@ if ($config['use_system_cron'])
 {
 	$use_shutdown_function = false;
 
-	$cron = new cron_manager();
+	$cron = new phpbb_cron_manager();
 }
 else
 {
diff --git a/phpBB/includes/cron/lock.php b/phpBB/includes/cron/lock.php
index 64b82128ce..1d75079ee4 100644
--- a/phpBB/includes/cron/lock.php
+++ b/phpBB/includes/cron/lock.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * Cron lock class
 * @package phpBB3
 */
-class cron_lock
+class phpbb_cron_lock
 {
 	private $cron_id;
 
diff --git a/phpBB/includes/cron/manager.php b/phpBB/includes/cron/manager.php
index 899fd5e325..73b06afca0 100644
--- a/phpBB/includes/cron/manager.php
+++ b/phpBB/includes/cron/manager.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_manager
+class phpbb_cron_manager
 {
 	private $tasks = array();
 
@@ -94,9 +94,9 @@ class cron_manager
 	{
 		foreach ($task_names as $task_name)
 		{
-				$class = "cron_task_$task_name";
+				$class = "phpbb_cron_task_$task_name";
 				$task = new $class();
-				$wrapper = new cron_task_wrapper($task);
+				$wrapper = new phpbb_cron_task_wrapper($task);
 				$this->tasks[] = $wrapper;
 		}
 	}
@@ -167,7 +167,7 @@ class cron_manager
 			$class = $task->get_name();
 			$task = new $class($args);
 			// need to wrap the new task too
-			$task = new cron_task_wrapper($task);
+			$task = new phpbb_cron_task_wrapper($task);
 		}
 		return $task;
 	}
diff --git a/phpBB/includes/cron/task.php b/phpBB/includes/cron/task.php
index 46eacff517..e66acd5492 100644
--- a/phpBB/includes/cron/task.php
+++ b/phpBB/includes/cron/task.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * Cron task interface
 * @package phpBB3
 */
-interface cron_task
+interface phpbb_cron_task
 {
 	/**
 	* Runs this cron task.
@@ -58,7 +58,7 @@ interface cron_task
 *
 * @package phpBB3
 */
-interface parametrized_cron_task extends cron_task
+interface phpbb_parametrized_cron_task extends cron_task
 {
 	/**
 	* Returns parameters of this cron task as an array.
diff --git a/phpBB/includes/cron/task/core/prune_all_forums.php b/phpBB/includes/cron/task/core/prune_all_forums.php
index b218aac6c5..154409a37c 100644
--- a/phpBB/includes/cron/task/core/prune_all_forums.php
+++ b/phpBB/includes/cron/task/core/prune_all_forums.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_prune_all_forums extends cron_task_base
+class phpbb_cron_task_core_prune_all_forums extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/prune_forum.php b/phpBB/includes/cron/task/core/prune_forum.php
index 090a90c212..eb01e535a9 100644
--- a/phpBB/includes/cron/task/core/prune_forum.php
+++ b/phpBB/includes/cron/task/core/prune_forum.php
@@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_prune_forum extends cron_task_base implements parametrized_cron_task
+class phpbb_cron_task_core_prune_forum extends phpbb_cron_task_base implements phpbb_parametrized_cron_task
 {
 	private $forum_data;
 
diff --git a/phpBB/includes/cron/task/core/queue.php b/phpBB/includes/cron/task/core/queue.php
index d32e133973..271a03937d 100644
--- a/phpBB/includes/cron/task/core/queue.php
+++ b/phpBB/includes/cron/task/core/queue.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_queue extends cron_task_base
+class phpbb_cron_task_core_queue extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/tidy_cache.php b/phpBB/includes/cron/task/core/tidy_cache.php
index 69038a8a5a..9656275742 100644
--- a/phpBB/includes/cron/task/core/tidy_cache.php
+++ b/phpBB/includes/cron/task/core/tidy_cache.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_tidy_cache extends cron_task_base
+class phpbb_cron_task_core_tidy_cache extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/tidy_database.php b/phpBB/includes/cron/task/core/tidy_database.php
index 3ae8c42273..a2a0b84a68 100644
--- a/phpBB/includes/cron/task/core/tidy_database.php
+++ b/phpBB/includes/cron/task/core/tidy_database.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_tidy_database extends cron_task_base
+class phpbb_cron_task_core_tidy_database extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/tidy_search.php b/phpBB/includes/cron/task/core/tidy_search.php
index e21d48c13a..dffc44174c 100644
--- a/phpBB/includes/cron/task/core/tidy_search.php
+++ b/phpBB/includes/cron/task/core/tidy_search.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_tidy_search extends cron_task_base
+class phpbb_cron_task_core_tidy_search extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/tidy_sessions.php b/phpBB/includes/cron/task/core/tidy_sessions.php
index ea6aa70699..1d471f9333 100644
--- a/phpBB/includes/cron/task/core/tidy_sessions.php
+++ b/phpBB/includes/cron/task/core/tidy_sessions.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_tidy_sessions extends cron_task_base
+class phpbb_cron_task_core_tidy_sessions extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task/core/tidy_warnings.php b/phpBB/includes/cron/task/core/tidy_warnings.php
index 257c116b5e..5120369178 100644
--- a/phpBB/includes/cron/task/core/tidy_warnings.php
+++ b/phpBB/includes/cron/task/core/tidy_warnings.php
@@ -23,7 +23,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_core_tidy_warnings extends cron_task_base
+class phpbb_cron_task_core_tidy_warnings extends phpbb_cron_task_base
 {
 	/**
 	* Runs this cron task.
diff --git a/phpBB/includes/cron/task_base.php b/phpBB/includes/cron/task_base.php
index d867b3abf1..ba399c18b1 100644
--- a/phpBB/includes/cron/task_base.php
+++ b/phpBB/includes/cron/task_base.php
@@ -27,7 +27,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-abstract class cron_task_base implements cron_task
+abstract class phpbb_cron_task_base implements phpbb_cron_task
 {
 	/**
 	* Returns whether this cron task can run, given current board configuration.
diff --git a/phpBB/includes/cron/task_wrapper.php b/phpBB/includes/cron/task_wrapper.php
index ecc0d1901d..b3662a4e31 100644
--- a/phpBB/includes/cron/task_wrapper.php
+++ b/phpBB/includes/cron/task_wrapper.php
@@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class cron_task_wrapper
+class phpbb_cron_task_wrapper
 {
 	/**
 	* Wraps a task $task, which must implement cron_task interface.
@@ -40,7 +40,7 @@ class cron_task_wrapper
 	*/
 	public function is_parametrized()
 	{
-		return $this->task instanceof parametrized_cron_task;
+		return $this->task instanceof phpbb_parametrized_cron_task;
 	}
 
 	/**