diff --git a/include/api.php b/include/api.php
index 69569bdc18..d25aeb8c5e 100644
--- a/include/api.php
+++ b/include/api.php
@@ -3873,7 +3873,7 @@ function api_account_update_profile_image($type)
 		Worker::add(PRIORITY_LOW, "Directory", $url);
 	}
 
-	Worker::add(PRIORITY_LOW, 'profile_update', api_user());
+	Worker::add(PRIORITY_LOW, 'ProfileUpdate', api_user());
 
 	// output for client
 	if ($data) {
diff --git a/include/create_shadowentry.php b/include/create_shadowentry.php
deleted file mode 100644
index 29222de5e7..0000000000
--- a/include/create_shadowentry.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * @file include/create_shadowentry.php
- * @brief This script creates posts with UID = 0 for a given public post.
- *
- * This script is started from mod/item.php to save some time when doing a post.
- */
-
-require_once("include/threads.php");
-
-function create_shadowentry_run($argv, $argc) {
-	if ($argc != 2) {
-		return;
-	}
-
-	$message_id = intval($argv[1]);
-
-	add_shadow_entry($message_id);
-}
diff --git a/include/profile_update.php b/include/profile_update.php
deleted file mode 100644
index 0c5de0156d..0000000000
--- a/include/profile_update.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-use Friendica\Protocol\Diaspora;
-
-function profile_update_run(&$argv, &$argc) {
-	if ($argc != 2) {
-		return;
-	}
-
-	$uid = intval($argv[1]);
-
-	Diaspora::send_profile($uid);
-}
diff --git a/mod/item.php b/mod/item.php
index 400acfc971..5f5a96d5e9 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1064,7 +1064,7 @@ function item_post(App $a) {
 	// We now do it in the background to save some time.
 	// This is important in interactive environments like the frontend or the API.
 	// We don't fork a new process since this is done anyway with the following command
-	Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "create_shadowentry", $post_id);
+	Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowentry", $post_id);
 
 	// Call the background process that is delivering the item to the receivers
 	Worker::add(PRIORITY_HIGH, "notifier", $notify_type, $post_id);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 3ef0118da0..e80b9ee84e 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -135,7 +135,7 @@ function profile_photo_post(App $a) {
 					Worker::add(PRIORITY_LOW, "Directory", $url);
 				}
 
-				Worker::add(PRIORITY_LOW, 'profile_update', local_user());
+				Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 			} else {
 				notice( t('Unable to process image') . EOL);
 			}
diff --git a/mod/profiles.php b/mod/profiles.php
index 545fb2fc78..5a5a649bcf 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -506,7 +506,7 @@ function profiles_post(App $a) {
 				Worker::add(PRIORITY_LOW, "Directory", $url);
 			}
 
-			Worker::add(PRIORITY_LOW, 'profile_update', local_user());
+			Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 
 			// Update the global contact for the user
 			GlobalContact::updateForUser(local_user());
diff --git a/mod/settings.php b/mod/settings.php
index bc6425171c..a3ba2ecb91 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -651,7 +651,7 @@ function settings_post(App $a) {
 		}
 	}
 
-	Worker::add(PRIORITY_LOW, 'profile_update', local_user());
+	Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 
 	// Update the global contact for the user
 	GlobalContact::updateForUser(local_user());
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 276179131b..88b5bdea89 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -923,7 +923,7 @@ class Worker {
 	 *
 	 * next args are passed as $cmd command line
 	 * or: Worker::add(PRIORITY_HIGH, "notifier", "drop", $drop_id);
-	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "create_shadowentry", $post_id);
+	 * or: Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowentry", $post_id);
 	 *
 	 * @note $cmd and string args are surrounded with ""
 	 *
diff --git a/src/Worker/CreateShadowentry.php b/src/Worker/CreateShadowentry.php
new file mode 100644
index 0000000000..cc0542058f
--- /dev/null
+++ b/src/Worker/CreateShadowentry.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @file src/Worker/CreateShadowentry.php
+ * @brief This script creates posts with UID = 0 for a given public post.
+ *
+ * This script is started from mod/item.php to save some time when doing a post.
+ */
+
+namespace Friendica\Worker;
+
+require_once("include/threads.php");
+
+class CreateShadowentry {
+	public static function execute($message_id = 0) {
+		if (empty($message_id)) {
+			return;
+		}
+
+		add_shadow_entry($message_id);
+	}
+}
diff --git a/src/Worker/ProfileUpdate.php b/src/Worker/ProfileUpdate.php
new file mode 100644
index 0000000000..43c76965d6
--- /dev/null
+++ b/src/Worker/ProfileUpdate.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @file src/Worker/ProfileUpdate.php
+ * @brief Send updated profile data to Diaspora
+ */
+
+namespace Friendica\Worker;
+
+use Friendica\Protocol\Diaspora;
+
+class ProfileUpdate {
+	public static function execute($uid = 0) {
+		if (empty($uid)) {
+			return;
+		}
+
+		Diaspora::send_profile($uid);
+	}
+}