diff --git a/typo3/sysext/compatibility6/Classes/Controller/FormDataSubmissionController.php b/typo3/sysext/compatibility6/Classes/Controller/FormDataSubmissionController.php
index b48647872b8230fbda4e490b13ef748541cd461f..883ec25818a94bd471f8dbd9f3b6f0397a98bd99 100644
--- a/typo3/sysext/compatibility6/Classes/Controller/FormDataSubmissionController.php
+++ b/typo3/sysext/compatibility6/Classes/Controller/FormDataSubmissionController.php
@@ -278,7 +278,7 @@ class FormDataSubmissionController {
 				$autoRespondChecksum = $valueList['auto_respond_checksum'];
 				$correctHmacChecksum = GeneralUtility::hmac($this->autoRespondMessage, 'content_form');
 				if ($autoRespondChecksum !== $correctHmacChecksum) {
-					GeneralUtility::sysLog('Possible misuse of DataSubmissionController auto respond method. Subject: ' . $valueList['subject'], 'Core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
+					GeneralUtility::sysLog('Possible misuse of DataSubmissionController auto respond method. Subject: ' . $valueList['subject'], 'core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
 					return;
 				} else {
 					$this->autoRespondMessage = $this->sanitizeHeaderString($this->autoRespondMessage);
@@ -319,7 +319,7 @@ class FormDataSubmissionController {
 						'Error in uploaded file in DataSubmissionController: temporary file "' .
 							$_FILES[$variableName]['tmp_name'] . '" ("' . $_FILES[$variableName]['name'] . '") Error code: ' .
 							$_FILES[$variableName]['error'],
-						'Core',
+						'core',
 						GeneralUtility::SYSLOG_SEVERITY_ERROR
 					);
 					continue;
@@ -329,7 +329,7 @@ class FormDataSubmissionController {
 					GeneralUtility::sysLog(
 						'Possible abuse of DataSubmissionController: temporary file "' . $_FILES[$variableName]['tmp_name'] .
 							'" ("' . $_FILES[$variableName]['name'] . '") was not an uploaded file.',
-						'Core',
+						'core',
 						GeneralUtility::SYSLOG_SEVERITY_ERROR
 					);
 					continue;
@@ -358,7 +358,7 @@ class FormDataSubmissionController {
 			// is not worth the trouble
 			// Log dirty header lines
 			if ($this->dirtyHeaders) {
-				GeneralUtility::sysLog('Possible misuse of DataSubmissionController: see TYPO3 devLog', 'Core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
+				GeneralUtility::sysLog('Possible misuse of DataSubmissionController: see TYPO3 devLog', 'core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
 				if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['enable_DLOG']) {
 					GeneralUtility::devLog('DataSubmissionController: ' . GeneralUtility::arrayToLogString($this->dirtyHeaders, '', 200), 'Core', 3);
 				}
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index c51b1bf3f382f94dde2889ed1302c55e913ea33c..874d03e778bad526edf0e1b4e0fb65e4ab8ad1d3 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -506,7 +506,7 @@ abstract class AbstractUserAuthentication {
 				$match = array();
 				$matchCnt = @preg_match($cookieDomain, GeneralUtility::getIndpEnv('TYPO3_HOST_ONLY'), $match);
 				if ($matchCnt === FALSE) {
-					GeneralUtility::sysLog('The regular expression for the cookie domain (' . $cookieDomain . ') contains errors. The session is not shared across sub-domains.', 'Core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
+					GeneralUtility::sysLog('The regular expression for the cookie domain (' . $cookieDomain . ') contains errors. The session is not shared across sub-domains.', 'core', GeneralUtility::SYSLOG_SEVERITY_ERROR);
 				} elseif ($matchCnt) {
 					$result = $match[0];
 				}
@@ -860,7 +860,7 @@ abstract class AbstractUserAuthentication {
 		$inserted = (bool)$this->db->exec_INSERTquery($this->session_table, $insertFields);
 		if (!$inserted) {
 			$message = 'Session data could not be written to DB. Error: ' . $this->db->sql_error();
-			GeneralUtility::sysLog($message, 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+			GeneralUtility::sysLog($message, 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 			if ($this->writeDevLog) {
 				GeneralUtility::devLog($message, \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, 2);
 			}
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index a34076b46e878bbac2779c80e4fb8d37d035b7df..aa6bde0ea66dbe9b18e66a1ee07a6b26d3b7a7bc 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -216,7 +216,7 @@ class MemcachedBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend imp
 				throw new \TYPO3\CMS\Core\Cache\Exception('Could not set data to memcache server.', 1275830266);
 			}
 		} catch (\Exception $exception) {
-			\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog('Memcache: could not set value. Reason: ' . $exception->getMessage(), 'Core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_WARNING);
+			\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog('Memcache: could not set value. Reason: ' . $exception->getMessage(), 'core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_WARNING);
 		}
 	}
 
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 7db113f1487c5c11768b1d176e65aa478a9ca519..7c7ab8d877b80a9471760675640a4b589fe9e65a 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -1202,7 +1202,7 @@ class DatabaseConnection {
 			if ($this->link->set_charset($this->connectionCharset) === FALSE) {
 				GeneralUtility::sysLog(
 					'Error setting connection charset to "' . $this->connectionCharset . '"',
-					'Core',
+					'core',
 					GeneralUtility::SYSLOG_SEVERITY_ERROR
 				);
 			}
@@ -1211,7 +1211,7 @@ class DatabaseConnection {
 				if ($this->query($command) === FALSE) {
 					GeneralUtility::sysLog(
 						'Could not initialize DB connection with query "' . $command . '": ' . $this->sql_error(),
-						'Core',
+						'core',
 						GeneralUtility::SYSLOG_SEVERITY_ERROR
 					);
 				}
@@ -1224,7 +1224,7 @@ class DatabaseConnection {
 			$this->link = NULL;
 			GeneralUtility::sysLog(
 				'Could not connect to MySQL server ' . $host . ' with user ' . $this->databaseUsername . ': ' . $error_msg,
-				'Core',
+				'core',
 				GeneralUtility::SYSLOG_SEVERITY_FATAL
 			);
 		}
@@ -1246,7 +1246,7 @@ class DatabaseConnection {
 				$this->sql_query($query);
 				GeneralUtility::sysLog(
 					'NO_BACKSLASH_ESCAPES could not be removed from SQL mode: ' . $this->sql_error(),
-					'Core',
+					'core',
 					GeneralUtility::SYSLOG_SEVERITY_ERROR
 				);
 			}
@@ -1267,7 +1267,7 @@ class DatabaseConnection {
 		if (!$ret) {
 			GeneralUtility::sysLog(
 				'Could not select MySQL database ' . $this->databaseName . ': ' . $this->sql_error(),
-				'Core',
+				'core',
 				GeneralUtility::SYSLOG_SEVERITY_FATAL
 			);
 		}
@@ -1617,7 +1617,7 @@ class DatabaseConnection {
 		if ($sessionResult === FALSE) {
 			GeneralUtility::sysLog(
 				'Error while retrieving the current charset session variables from the database: ' . $this->sql_error(),
-				'Core',
+				'core',
 				GeneralUtility::SYSLOG_SEVERITY_ERROR
 			);
 			throw new \RuntimeException(
@@ -1647,7 +1647,7 @@ class DatabaseConnection {
 			if (empty($charsetVariables[$variableName])) {
 				GeneralUtility::sysLog(
 					'A required session variable is missing in the current MySQL connection: ' . $variableName,
-					'Core',
+					'core',
 					GeneralUtility::SYSLOG_SEVERITY_ERROR
 				);
 				throw new \RuntimeException(
@@ -1765,7 +1765,7 @@ class DatabaseConnection {
 		$msg .= ': function TYPO3\\CMS\\Core\\Database\\DatabaseConnection->' . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(PATH_site) + 2)) . ' in line ' . $trace[0]['line'];
 		GeneralUtility::sysLog(
 			$msg . '. Use a devLog extension to get more details.',
-			'Core/t3lib_db',
+			'core',
 			GeneralUtility::SYSLOG_SEVERITY_ERROR
 		);
 		// Send to devLog if enabled
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandler.php b/typo3/sysext/core/Classes/Error/ErrorHandler.php
index d98b1e4547d7000bee791b1d32535c1734c41f08..2ac8f1d84a1e969c81a714e4388cb9d80b76b953 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandler.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandler.php
@@ -107,26 +107,27 @@ class ErrorHandler implements ErrorHandlerInterface {
 					$severity = 0;
 			}
 			$logTitle = 'Core: Error handler (' . TYPO3_MODE . ')';
+			$message = $logTitle . ': ' . $message;
 			// Write error message to the configured syslogs,
 			// see: $TYPO3_CONF_VARS['SYS']['systemLog']
 			if ($errorLevel & $GLOBALS['TYPO3_CONF_VARS']['SYS']['syslogErrorReporting']) {
-				GeneralUtility::sysLog($message, $logTitle, $severity);
+				GeneralUtility::sysLog($message, 'core', $severity + 1);
 			}
 			// Write error message to devlog extension(s),
 			// see: $TYPO3_CONF_VARS['SYS']['enable_errorDLOG']
 			if (TYPO3_ERROR_DLOG) {
-				GeneralUtility::devLog($message, $logTitle, $severity + 1);
+				GeneralUtility::devLog($message, 'core', $severity + 1);
 			}
 			// Write error message to TSlog (admin panel)
 			if (is_object($GLOBALS['TT'])) {
-				$GLOBALS['TT']->setTSlogMessage($logTitle . ': ' . $message, $severity + 1);
+				$GLOBALS['TT']->setTSlogMessage($message, $severity + 1);
 			}
 			// Write error message to sys_log table (ext: belog, Tools->Log)
 			if ($errorLevel & $GLOBALS['TYPO3_CONF_VARS']['SYS']['belogErrorReporting']) {
 				// Silently catch in case an error occurs before a database connection exists,
 				// but DatabaseConnection fails to connect.
 				try {
-					$this->writeLog($logTitle . ': ' . $message, $severity);
+					$this->writeLog($message, $severity);
 				} catch (\Exception $e) {
 				}
 			}
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 69d605d2f5ce0e1af84e8f9de89639bc9e088425..d486a9a4633160feebb471ca77f7a58e504016c1 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -580,7 +580,7 @@ class TypoScriptParser {
 				} else {
 					GeneralUtility::sysLog(
 						'Missing function definition for ' . $modifierName . ' on TypoScript',
-						'Core',
+						'core',
 						GeneralUtility::SYSLOG_SEVERITY_WARNING
 					);
 				}
@@ -780,7 +780,7 @@ class TypoScriptParser {
 	static public function checkIncludeLines($string, $cycle_counter = 1, $returnFiles = FALSE, $parentFilenameOrPath = '') {
 		$includedFiles = array();
 		if ($cycle_counter > 100) {
-			GeneralUtility::sysLog('It appears like TypoScript code is looping over itself. Check your templates for "<INCLUDE_TYPOSCRIPT: ..." tags', 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+			GeneralUtility::sysLog('It appears like TypoScript code is looping over itself. Check your templates for "<INCLUDE_TYPOSCRIPT: ..." tags', 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 			if ($returnFiles) {
 				return array(
 					'typoscript' => '',
@@ -978,7 +978,7 @@ class TypoScriptParser {
 	 * @static
 	 */
 	static protected function typoscriptIncludeError($error) {
-		GeneralUtility::sysLog($error, 'Core', 2);
+		GeneralUtility::sysLog($error, 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 		return "\n###\n### ERROR: " . $error . "\n###\n\n";
 	}
 
@@ -1010,7 +1010,7 @@ class TypoScriptParser {
 	 */
 	static public function extractIncludes($string, $cycle_counter = 1, array $extractedFileNames = array(), $parentFilenameOrPath = '') {
 		if ($cycle_counter > 10) {
-			GeneralUtility::sysLog('It appears like TypoScript code is looping over itself. Check your templates for "<INCLUDE_TYPOSCRIPT: ..." tags', 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+			GeneralUtility::sysLog('It appears like TypoScript code is looping over itself. Check your templates for "<INCLUDE_TYPOSCRIPT: ..." tags', 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 			return '
 ###
 ### ERROR: Recursion!
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 6ab921fcb1795100594061d1d078ed12b299fa7d..c6ab2613752b3ea35d9010373025e6f3a819518a 100755
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -3832,7 +3832,7 @@ Connection: close
 			}
 		}
 		if (!empty($url) && empty($sanitizedUrl)) {
-			self::sysLog('The URL "' . $url . '" is not considered to be local and was denied.', 'Core', self::SYSLOG_SEVERITY_NOTICE);
+			self::sysLog('The URL "' . $url . '" is not considered to be local and was denied.', 'core', self::SYSLOG_SEVERITY_NOTICE);
 		}
 		return $sanitizedUrl;
 	}
diff --git a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
index 1ed38776a044c43809f0a78c1c3654d0e7dd2124..fdbfab9c3f036b8561c32f7204a724049f3df48b 100644
--- a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
@@ -2497,7 +2497,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 		if (!$ret) {
 			GeneralUtility::sysLog(
 				'Could not select MySQL database ' . $databaseName . ': ' . $this->sql_error(),
-				'Core',
+				'core',
 				GeneralUtility::SYSLOG_SEVERITY_FATAL
 			);
 		}
@@ -2973,7 +2973,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 					if ($link->set_charset($this->connectionCharset) === FALSE) {
 						GeneralUtility::sysLog(
 							'Error setting connection charset to "' . $this->connectionCharset . '"',
-							'Core',
+							'core',
 							GeneralUtility::SYSLOG_SEVERITY_ERROR
 						);
 					}
@@ -2987,7 +2987,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 							if ($this->query($command) === FALSE) {
 								GeneralUtility::sysLog(
 									'Could not initialize DB connection with query "' . $command . '": ' . $this->sql_error(),
-									'Core',
+									'core',
 									GeneralUtility::SYSLOG_SEVERITY_ERROR
 								);
 							}
@@ -2998,7 +2998,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 
 					$output = TRUE;
 				} else {
-					GeneralUtility::sysLog('Could not connect to MySQL server ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'Core', 4);
+					GeneralUtility::sysLog('Could not connect to MySQL server ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'core', GeneralUtility::SYSLOG_SEVERITY_FATAL);
 				}
 				break;
 			case 'adodb':
@@ -3028,7 +3028,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 				}
 				if (!$this->handlerInstance[$handlerKey]->isConnected()) {
 					$dsn = $cfgArray['config']['driver'] . '://' . $cfgArray['config']['username'] . ((string)$cfgArray['config']['password'] !== '' ? ':XXXX@' : '') . $cfgArray['config']['host'] . (isset($cfgArray['config']['port']) ? ':' . $cfgArray['config']['port'] : '') . '/' . $cfgArray['config']['database'] . ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect'] ? '' : '?persistent=1');
-					GeneralUtility::sysLog('Could not connect to DB server using ADOdb on ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'Core', 4);
+					GeneralUtility::sysLog('Could not connect to DB server using ADOdb on ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'core', GeneralUtility::SYSLOG_SEVERITY_FATAL);
 					error_log('DBAL error: Connection to ' . $dsn . ' failed. Maybe PHP doesn\'t support the database?');
 					$output = FALSE;
 				} else {
diff --git a/typo3/sysext/extbase/Classes/Scheduler/Task.php b/typo3/sysext/extbase/Classes/Scheduler/Task.php
index 430436a6c0264ebb1344cc3f25311287dc3a38b4..a2204de26a893a79bf61eb72bfa7989128b0e820 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/Task.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/Task.php
@@ -176,7 +176,7 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * @param \Exception $e
 	 */
 	protected function logException(\Exception $e) {
-		\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog($e->getMessage(), $this->commandIdentifier, 3);
+		\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog($e->getMessage(), $this->commandIdentifier, \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_ERROR);
 	}
 
 }
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index db5ec99d2e4cc17b6873fd4492e62110cc2fb989..cf6b0d87e6bca00d0be4b2011d64ee4b89488bcb 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -191,7 +191,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
 					$this->authInfo['REMOTE_HOST'],
 					$this->login['uname']
 				));
-				\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(sprintf($errorMessage, $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'Core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_INFO);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(sprintf($errorMessage, $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_INFO);
 			} elseif ($validPasswd && $user['lockToDomain'] && strcasecmp($user['lockToDomain'], $this->authInfo['HTTP_HOST'])) {
 				// Lock domain didn't match, so error:
 				$errorMessage = 'Login-attempt from %s (%s), username \'%s\', locked domain \'%s\' did not match \'%s\'!';
@@ -203,7 +203,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
 					$user['lockToDomain'],
 					$this->authInfo['HTTP_HOST']
 				));
-				\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(sprintf($errorMessage, $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']), 'Core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_INFO);
+				\TYPO3\CMS\Core\Utility\GeneralUtility::sysLog(sprintf($errorMessage, $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']), 'core', \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_INFO);
 				$OK = 0;
 			} elseif ($validPasswd) {
 				$this->writeLogMessage(TYPO3_MODE . ' Authentication successful for username \'%s\'', $this->login['uname']);
diff --git a/typo3/sysext/sv/Classes/AuthenticationService.php b/typo3/sysext/sv/Classes/AuthenticationService.php
index 119397a30419a254afb339a2b0d9e5b915a2d137..d19c674aafcaa90b62bd9653208fe4bfe5f142a0 100644
--- a/typo3/sysext/sv/Classes/AuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AuthenticationService.php
@@ -63,7 +63,7 @@ class AuthenticationService extends AbstractAuthenticationService {
 			// Failed login attempt (no username found)
 			$this->writelog(255, 3, 3, 2, 'Login-attempt from %s (%s), username \'%s\' not found!!', array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']));
 			// Logout written to log
-			GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\' not found!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+			GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\' not found!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 		} else {
 			if ($this->writeDevLog) {
 				GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($user, array($this->db_user['userid_column'], $this->db_user['username_column'])), AuthenticationService::class);
@@ -94,7 +94,7 @@ class AuthenticationService extends AbstractAuthenticationService {
 				// Failed login attempt (wrong password) - write that to the log!
 				if ($this->writeAttemptLog) {
 					$this->writelog(255, 3, 3, 1, 'Login-attempt from %s (%s), username \'%s\', password not accepted!', array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']));
-					GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\', password not accepted!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+					GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\', password not accepted!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 				}
 				if ($this->writeDevLog) {
 					GeneralUtility::devLog('Password not accepted: ' . $this->login['uident'], AuthenticationService::class, 2);
@@ -105,7 +105,7 @@ class AuthenticationService extends AbstractAuthenticationService {
 				// Lock domain didn't match, so error:
 				if ($this->writeAttemptLog) {
 					$this->writelog(255, 3, 3, 1, 'Login-attempt from %s (%s), username \'%s\', locked domain \'%s\' did not match \'%s\'!', array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']));
-					GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\', locked domain \'%s\' did not match \'%s\'!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']), 'Core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
+					GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\', locked domain \'%s\' did not match \'%s\'!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']), 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
 				}
 				$OK = 0;
 			}
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index cc266e3e4b1661af7750f2cf1c7e19d0ce1bac21..aa3b76f218e54bf8db2369bc4dddc3bb7a5097e5 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -363,7 +363,11 @@ class GridDataService {
 					// Do nothing
 			}
 		} else {
-			GeneralUtility::sysLog('Try to sort "' . $this->sort . '" in "TYPO3\\CMS\\Workspaces\\Service\\GridDataService::sortDataArray" but $this->dataArray is empty! This might be the Bug #26422 which could not reproduced yet.', 3);
+			GeneralUtility::sysLog(
+				'Try to sort "' . $this->sort . '" in "TYPO3\\CMS\\Workspaces\\Service\\GridDataService::sortDataArray" but $this->dataArray is empty! This might be the Bug #26422 which could not reproduced yet.',
+				'workspaces',
+				GeneralUtility::SYSLOG_SEVERITY_ERROR
+			);
 		}
 		// Suggested slot method:
 		// methodName(\TYPO3\CMS\Workspaces\Service\GridDataService $gridData, array $dataArray, $sortColumn, $sortDirection)