diff --git a/boot.php b/boot.php
index 8492701a0c..52026a7fb3 100644
--- a/boot.php
+++ b/boot.php
@@ -630,7 +630,7 @@ function check_db($via_worker)
 	}
 	if ($build != DB_UPDATE_VERSION) {
 		// When we cannot execute the database update via the worker, we will do it directly
-		if (!Worker::add(PRIORITY_CRITICAL, 'dbupdate') && $via_worker) {
+		if (!Worker::add(PRIORITY_CRITICAL, 'DBUpdate') && $via_worker) {
 			update_db(get_app());
 		}
 	}
diff --git a/include/dbupdate.php b/include/dbupdate.php
deleted file mode 100644
index 799ca262c8..0000000000
--- a/include/dbupdate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-use Friendica\Core\Config;
-
-function dbupdate_run(&$argv, &$argc) {
-	global $a;
-
-	// We are deleting the latest dbupdate entry.
-	// This is done to avoid endless loops because the update was interupted.
-	Config::delete('database', 'dbupdate_'.DB_UPDATE_VERSION);
-
-	update_db($a);
-}
diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 1893a862e8..21b76903bb 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * @file src/Worker/Cron.php
+ */
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
diff --git a/src/Worker/CronHooks.php b/src/Worker/CronHooks.php
index 42670eb238..22109931fe 100644
--- a/src/Worker/CronHooks.php
+++ b/src/Worker/CronHooks.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * @file src/Worker/CronHooks.php
+ */
+
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 94295b053e..7030081dc9 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -4,6 +4,8 @@
  * @brief The script is called from time to time to clean the database entries and remove orphaned data.
  */
 
+namespace Friendica\Worker;
+
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use dba;
diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php
new file mode 100644
index 0000000000..0e1c9859be
--- /dev/null
+++ b/src/Worker/DBUpdate.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @file src/Worker/DBUpdate.php
+ * @brief This file is called when the database structure needs to be updated
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Config;
+
+class DBUpdate {
+	public static function execute() {
+		// We are deleting the latest dbupdate entry.
+		// This is done to avoid endless loops because the update was interupted.
+		Config::delete('database', 'dbupdate_'.DB_UPDATE_VERSION);
+
+		update_db($a);
+	}
+}