diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
index 3709b100f0..20cb8451d0 100644
--- a/phpBB/config/development/config.yml
+++ b/phpBB/config/development/config.yml
@@ -18,5 +18,5 @@ core:
         composer_debug: true
         composer_verbose: true
 
-    log:
-        session_errors: true
+    session:
+        log_errors: true
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index 5df1ebb59e..909a47c53e 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -54,10 +54,10 @@ class container_configuration implements ConfigurationInterface
 						->booleanNode('composer_verbose')->defaultValue(false)->end()
 					->end()
 				->end()
-				->arrayNode('log')
+				->arrayNode('session')
 					->addDefaultsIfNotSet()
 					->children()
-						->booleanNode('session_errors')->defaultValue(false)->end()
+						->booleanNode('log_errors')->defaultValue(false)->end()
 					->end()
 				->end()
 			->end()
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php
index 2f57c2854c..db40feb4cf 100644
--- a/phpBB/phpbb/di/extension/core.php
+++ b/phpBB/phpbb/di/extension/core.php
@@ -112,9 +112,9 @@ class core extends Extension
 		}
 
 		// Set the log options
-		foreach ($config['log'] as $name => $value)
+		foreach ($config['session'] as $name => $value)
 		{
-			$container->setParameter('log.' . $name, $value);
+			$container->setParameter('session.' . $name, $value);
 		}
 	}
 
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 73f40b4e33..7d40d4ef87 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -481,7 +481,7 @@ class session
 				else
 				{
 					// Added logging temporarily to help debug bugs...
-					if ($phpbb_container->getParameter('log.session_errors') && $this->data['user_id'] != ANONYMOUS)
+					if ($phpbb_container->getParameter('session.log_errors') && $this->data['user_id'] != ANONYMOUS)
 					{
 						if ($referer_valid)
 						{
diff --git a/tests/mock/container_builder.php b/tests/mock/container_builder.php
index b27b0e64cb..17c4ae22dd 100644
--- a/tests/mock/container_builder.php
+++ b/tests/mock/container_builder.php
@@ -21,7 +21,7 @@ class phpbb_mock_container_builder implements ContainerInterface
 	public function __construct()
 	{
 		$this->setParameter('debug.load_time', false);
-		$this->setParameter('log.session_errors', false);
+		$this->setParameter('session.log_errors', false);
 	}
 
 	/**