diff --git a/plugins/README.md b/plugins/README.md
index de2e1db78..de2f84f95 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -111,25 +111,25 @@ $Plugin->addHook('hook.name', 'functionName');
 ### sieve.before-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		bool $bSuccess
 		\MailSo\Sieve\Settings $oSettings
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
similarity index 99%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
rename to snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index 3d4c97653..b69c8ee76 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -17,7 +17,7 @@ use MailSo\Net\Enumerations\ConnectionSecurityType;
  * @category MailSo
  * @package Sieve
  */
-class ManageSieveClient extends \MailSo\Net\NetClient
+class SieveClient extends \MailSo\Net\NetClient
 {
 	/**
 	 * @var bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index ec5f03082..9908e4565 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -352,7 +352,7 @@ class ActionsAdmin extends Actions
 			{
 				try
 				{
-					$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
+					$oSieveClient = new \MailSo\Sieve\SieveClient();
 					$oSieveClient->SetLogger($this->Logger());
 					$oSieveClient->SetTimeOuts($iConnectionTimeout);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index 3acb216e6..cac637b11 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -251,7 +251,7 @@ abstract class Account implements \JsonSerializable
 		return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
 	}
 
-	public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\ManageSieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
+	public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
 	{
 		$oSettings = $this->Domain()->SieveSettings();
 		$oSettings->Login = $this->IncLogin();
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 4b4bc5f2f..f85e15b33 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -29,9 +29,9 @@ class SieveStorage implements FiltersInterface
 		$this->oConfig = $oConfig;
 	}
 
-	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\ManageSieveClient
+	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\SieveClient
 	{
-		$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
+		$oSieveClient = new \MailSo\Sieve\SieveClient();
 		$oSieveClient->SetLogger($this->oLogger);
 		$oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10));
 		return $oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)