diff --git a/phpBB/includes/cron/task_base.php b/phpBB/includes/cron/task/base.php
similarity index 100%
rename from phpBB/includes/cron/task_base.php
rename to phpBB/includes/cron/task/base.php
diff --git a/phpBB/includes/cron/task_parametrized.php b/phpBB/includes/cron/task/parametrized.php
similarity index 94%
rename from phpBB/includes/cron/task_parametrized.php
rename to phpBB/includes/cron/task/parametrized.php
index 1906009ebe..d505cc3328 100644
--- a/phpBB/includes/cron/task_parametrized.php
+++ b/phpBB/includes/cron/task/parametrized.php
@@ -27,7 +27,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-interface phpbb_cron_task_parametrized extends cron_task
+interface phpbb_cron_task_parametrized extends phpbb_cron_task
 {
 	/**
 	* Returns parameters of this cron task as an array.
diff --git a/phpBB/includes/cron/task.php b/phpBB/includes/cron/task/task.php
similarity index 100%
rename from phpBB/includes/cron/task.php
rename to phpBB/includes/cron/task/task.php
diff --git a/phpBB/includes/cron/task_wrapper.php b/phpBB/includes/cron/task/wrapper.php
similarity index 97%
rename from phpBB/includes/cron/task_wrapper.php
rename to phpBB/includes/cron/task/wrapper.php
index 159382a8d1..e31f467cc8 100644
--- a/phpBB/includes/cron/task_wrapper.php
+++ b/phpBB/includes/cron/task/wrapper.php
@@ -27,7 +27,7 @@ class phpbb_cron_task_wrapper
 	/**
 	* Wraps a task $task, which must implement cron_task interface.
 	*/
-	public function __construct(cron_task $task)
+	public function __construct(phpbb_cron_task $task)
 	{
 		$this->task = $task;
 	}