diff --git a/cron/status.cron.php b/cron/status.cron.php
index 2ba3ecc0..9b6ce773 100644
--- a/cron/status.cron.php
+++ b/cron/status.cron.php
@@ -44,7 +44,7 @@ if(!defined('PSM_DEBUG') || !PSM_DEBUG) {
 }
 psm_update_conf('cron_running_time', $time);
 
-$autorun = new \psm\Util\Updater\Autorun($db);
+$autorun = new \psm\Util\Server\UpdateManager($db);
 $autorun->run();
 
 psm_update_conf('cron_running', 0);
diff --git a/src/psm/Module/Server/Controller/UpdateController.class.php b/src/psm/Module/Server/Controller/UpdateController.class.php
index c6aab3a0..c3d0fa4f 100644
--- a/src/psm/Module/Server/Controller/UpdateController.class.php
+++ b/src/psm/Module/Server/Controller/UpdateController.class.php
@@ -40,7 +40,7 @@ class UpdateController extends AbstractController {
 	}
 
 	protected function executeIndex() {
-		$autorun = new \psm\Util\Updater\Autorun($this->db);
+		$autorun = new \psm\Util\Server\UpdateManager($this->db);
 		$autorun->setUser($this->user);
 		$autorun->run();
 
diff --git a/src/psm/Util/Updater/Autorun.class.php b/src/psm/Util/Server/UpdateManager.class.php
similarity index 93%
rename from src/psm/Util/Updater/Autorun.class.php
rename to src/psm/Util/Server/UpdateManager.class.php
index 70e3337e..0a09a63a 100644
--- a/src/psm/Util/Updater/Autorun.class.php
+++ b/src/psm/Util/Server/UpdateManager.class.php
@@ -26,7 +26,7 @@
  * @since       phpservermon 3.0.0
  **/
 
-namespace psm\Util\Updater;
+namespace psm\Util\Server;
 use psm\Service\Database;
 use psm\Service\User;
 
@@ -36,7 +36,7 @@ use psm\Service\User;
  * If you provide a User service instance it will be
  * restricted to that user only.
  */
-class Autorun {
+class UpdateManager {
 
 	/**
 	 * Database service
@@ -76,8 +76,8 @@ class Autorun {
 
 		$servers = $this->db->query($sql);
 
-		$updater = new StatusUpdater($this->db);
-		$notifier = new StatusNotifier($this->db);
+		$updater = new Updater\StatusUpdater($this->db);
+		$notifier = new Updater\StatusNotifier($this->db);
 
 		foreach($servers as $server) {
 			$status_old = ($server['status'] == 'on') ? true : false;
@@ -87,7 +87,7 @@ class Autorun {
 		}
 
 		// clean-up time!! archive all records
-		$archive = new \psm\Util\Server\ArchiveManager($this->db);
+		$archive = new ArchiveManager($this->db);
 		$archive->archive();
 		$archive->cleanup();
 	}
diff --git a/src/psm/Util/Updater/StatusNotifier.class.php b/src/psm/Util/Server/Updater/StatusNotifier.class.php
similarity index 98%
rename from src/psm/Util/Updater/StatusNotifier.class.php
rename to src/psm/Util/Server/Updater/StatusNotifier.class.php
index 225659a2..028889f0 100644
--- a/src/psm/Util/Updater/StatusNotifier.class.php
+++ b/src/psm/Util/Server/Updater/StatusNotifier.class.php
@@ -28,10 +28,10 @@
 /**
  * The status updater is for sending notifications to the users.
  *
- * @see \psm\Util\Updater\StatusUpdater
- * @see \psm\Util\Updater\Autorun
+ * @see \psm\Util\Server\Updater\StatusUpdater
+ * @see \psm\Util\Server\Updater\Autorun
  */
-namespace psm\Util\Updater;
+namespace psm\Util\Server\Updater;
 use psm\Service\Database;
 
 class StatusNotifier {
diff --git a/src/psm/Util/Updater/StatusUpdater.class.php b/src/psm/Util/Server/Updater/StatusUpdater.class.php
similarity index 98%
rename from src/psm/Util/Updater/StatusUpdater.class.php
rename to src/psm/Util/Server/Updater/StatusUpdater.class.php
index 1b1fa6ab..acd7bd9e 100644
--- a/src/psm/Util/Updater/StatusUpdater.class.php
+++ b/src/psm/Util/Server/Updater/StatusUpdater.class.php
@@ -28,10 +28,10 @@
 /**
  * The status class is for checking the status of a server.
  *
- * @see \psm\Util\Updater\StatusNotifier
- * @see \psm\Util\Updater\Autorun
+ * @see \psm\Util\Server\Updater\StatusNotifier
+ * @see \psm\Util\Server\Updater\Autorun
  */
-namespace psm\Util\Updater;
+namespace psm\Util\Server\Updater;
 use psm\Service\Database;
 
 class StatusUpdater {