diff --git a/fail2ban/README.md b/fail2ban/README.md
index dd34a7be7..6eac73bef 100644
--- a/fail2ban/README.md
+++ b/fail2ban/README.md
@@ -8,12 +8,12 @@ If you use other ports then http, https & 2096, modify them in /filter.d/*.conf
 
 Upload the following to /etc/fail2ban/*
 
-- /filter.d/rainloop-fpm-journal.conf
-- /jail.d/rainloop-fpm-journal.conf
+- /filter.d/snappymail-fpm-journal.conf
+- /jail.d/snappymail-fpm-journal.conf
 
 Modify your /etc/fail2ban/jail.local with:
 
-<code>[rainloop-fpm-journal]<br/>
+<code>[snappymail-fpm-journal]<br/>
 enabled = true</code>
 
 ## Default log (not recommended)
@@ -26,14 +26,14 @@ auth_logging_filename = "fail2ban/auth-fail.log"<br/>
 auth_logging_format = "[{date:Y-m-d H:i:s T}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}"
 </code>
 
-Modify the path in /jail.d/rainloop-log.conf
+Modify the path in /jail.d/snappymail-log.conf
 
 Upload the following to /etc/fail2ban/*
 
-- /filter.d/rainloop-log.conf
-- /jail.d/rainloop-log.conf
+- /filter.d/snappymail-log.conf
+- /jail.d/snappymail-log.conf
 
 Modify your /etc/fail2ban/jail.local with:
 
-<code>[rainloop-log]<br/>
+<code>[snappymail-log]<br/>
 enabled = true</code>
diff --git a/fail2ban/filter.d/rainloop-fpm-journal.conf b/fail2ban/filter.d/snappymail-fpm-journal.conf
similarity index 85%
rename from fail2ban/filter.d/rainloop-fpm-journal.conf
rename to fail2ban/filter.d/snappymail-fpm-journal.conf
index 6943df2ac..ceeef7e34 100644
--- a/fail2ban/filter.d/rainloop-fpm-journal.conf
+++ b/fail2ban/filter.d/snappymail-fpm-journal.conf
@@ -5,4 +5,4 @@ failregex = Auth failed: ip=<HOST> user=.*$
 ignoreregex =
 _daemon = php-fpm
 journalmatch = _SYSTEMD_UNIT=php-fpm.service SYSLOG_FACILITY=10
-#journalmatch = _SYSTEMD_UNIT=php-fpm.service SYSLOG_FACILITY=10 SYSLOG_IDENTIFIER=rainloop PRIORITY=3
+#journalmatch = _SYSTEMD_UNIT=php-fpm.service SYSLOG_FACILITY=10 SYSLOG_IDENTIFIER=snappymail PRIORITY=3
diff --git a/fail2ban/filter.d/rainloop-log.conf b/fail2ban/filter.d/snappymail-log.conf
similarity index 100%
rename from fail2ban/filter.d/rainloop-log.conf
rename to fail2ban/filter.d/snappymail-log.conf
diff --git a/fail2ban/jail.d/rainloop-fpm-journal.conf b/fail2ban/jail.d/rainloop-fpm-journal.conf
deleted file mode 100644
index 92af30723..000000000
--- a/fail2ban/jail.d/rainloop-fpm-journal.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[rainloop-fpm-journal]
-filter  = rainloop-fpm-journal
-port    = http,https,2096
-backend = systemd
-maxretry = 3
diff --git a/fail2ban/jail.d/rainloop-log.conf b/fail2ban/jail.d/rainloop-log.conf
deleted file mode 100644
index f3b385e58..000000000
--- a/fail2ban/jail.d/rainloop-log.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[rainloop-log]
-filter  = rainloop-log
-port    = http,https,2096
-logpath = /PATH-TO-RAINLOOP-DATA/_data_/_default_/logs/fail2ban/auth-fail.log
-maxretry = 3
diff --git a/fail2ban/jail.d/snappymail-fpm-journal.conf b/fail2ban/jail.d/snappymail-fpm-journal.conf
new file mode 100644
index 000000000..fb6a5494e
--- /dev/null
+++ b/fail2ban/jail.d/snappymail-fpm-journal.conf
@@ -0,0 +1,5 @@
+[snappymail-fpm-journal]
+filter  = snappymail-fpm-journal
+port    = http,https,2096
+backend = systemd
+maxretry = 3
diff --git a/fail2ban/jail.d/snappymail-log.conf b/fail2ban/jail.d/snappymail-log.conf
new file mode 100644
index 000000000..6e46e864c
--- /dev/null
+++ b/fail2ban/jail.d/snappymail-log.conf
@@ -0,0 +1,5 @@
+[snappymail-log]
+filter  = snappymail-log
+port    = http,https,2096
+logpath = /PATH-TO-SNAPPYMAIL-DATA/_data_/_default_/logs/fail2ban/auth-fail.log
+maxretry = 3
diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
index 3ab6a41b3..88361c2e2 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
@@ -46,7 +46,7 @@ class Syslog extends \MailSo\Log\Driver
 			$mDesc = \implode($this->sNewLine, $mDesc);
 		}
 
-		\openlog('rainloop', LOG_ODELAY, LOG_USER);
+		\openlog('snappymail', LOG_ODELAY, LOG_USER);
 		$result = \syslog($this->iLogLevel, $mDesc);
 		\closelog();
 		return $result;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 495ad20d7..615a162f6 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -958,7 +958,7 @@ class Actions
 		{
 			$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, false, $aAdditionalParams));
 		}
-		if ($this->Config()->Get('logs', 'auth_logging', false) && \openlog('rainloop', 0, \LOG_AUTHPRIV))
+		if ($this->Config()->Get('logs', 'auth_logging', false) && \openlog('snappymail', 0, \LOG_AUTHPRIV))
 		{
 			\syslog(\LOG_ERR, $this->compileLogParams('Auth failed: ip={request:ip} user={imap:login}', $oAccount, false, $aAdditionalParams));
 			\closelog();
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index 77ec55ffb..eccd57f6d 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -213,7 +213,7 @@ trait Admin
 			$this->LoggerAuthHelper(null, $this->getAdditionalLogParamsByUserLogin($sLogin, true));
 			if ($this->Config()->Get('logs', 'auth_logging', false)
 			 && $this->Config()->Get('security', 'allow_admin_panel', true)
-			 && \openlog('rainloop', 0, \LOG_AUTHPRIV))
+			 && \openlog('snappymail', 0, \LOG_AUTHPRIV))
 			{
 				\syslog(\LOG_ERR, $this->compileLogParams('Admin Auth failed: ip={request:ip} user='.$sLogin));
 				\closelog();