diff --git a/core/lib/Drupal/Core/Cache/CacheFactory.php b/core/lib/Drupal/Core/Cache/CacheFactory.php
index ee14206fa7..023787bbef 100644
--- a/core/lib/Drupal/Core/Cache/CacheFactory.php
+++ b/core/lib/Drupal/Core/Cache/CacheFactory.php
@@ -35,7 +35,7 @@ class CacheFactory implements CacheFactoryInterface, ContainerAwareInterface {
    */
   public function __construct($default_bin_backends = []) {
     if ($default_bin_backends instanceof Settings) {
-      @trigger_error('The settings service should not be passed to ' . __METHOD__ . ' since drupal:9.5.0. The service will be removed in drupal:11.0.0. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
+      @trigger_error('Passing settings service to ' . __METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Site\Settings instead. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
       $args = func_get_args();
       $default_bin_backends = $args[1];
     }
diff --git a/core/lib/Drupal/Core/Database/ReplicaKillSwitch.php b/core/lib/Drupal/Core/Database/ReplicaKillSwitch.php
index 76600ec681..46aad13287 100644
--- a/core/lib/Drupal/Core/Database/ReplicaKillSwitch.php
+++ b/core/lib/Drupal/Core/Database/ReplicaKillSwitch.php
@@ -36,7 +36,7 @@ class ReplicaKillSwitch implements EventSubscriberInterface {
    */
   public function __construct($time, $session) {
     if ($time instanceof Settings) {
-      @trigger_error('The settings service should not be passed to ' . __METHOD__ . ' since drupal:9.5.0. The service will be removed in drupal:11.0.0. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
+      @trigger_error('Passing settings service to ' . __METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Site\Settings instead. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
       $args = func_get_args();
       $time = $args[1];
       $session = $args[2];
diff --git a/core/lib/Drupal/Core/EventSubscriber/ExcludedModulesEventSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ExcludedModulesEventSubscriber.php
index e7e573564c..ed2ccc4326 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ExcludedModulesEventSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ExcludedModulesEventSubscriber.php
@@ -40,7 +40,7 @@ final class ExcludedModulesEventSubscriber implements EventSubscriberInterface {
   public function __construct(StorageInterface $active_storage, $manager) {
     $this->activeStorage = $active_storage;
     if ($manager instanceof Settings) {
-      @trigger_error('The settings service should not be passed to ' . __METHOD__ . ' since drupal:9.5.0. The service will be removed in drupal:11.0.0. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
+      @trigger_error('Passing settings service to ' . __METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Site\Settings instead. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
       $args = func_get_args();
       $manager = $args[2];
     }
diff --git a/core/lib/Drupal/Core/File/FileSystem.php b/core/lib/Drupal/Core/File/FileSystem.php
index e658337c12..e910493969 100644
--- a/core/lib/Drupal/Core/File/FileSystem.php
+++ b/core/lib/Drupal/Core/File/FileSystem.php
@@ -56,7 +56,7 @@ class FileSystem implements FileSystemInterface {
   public function __construct(StreamWrapperManagerInterface $stream_wrapper_manager, $logger) {
     $this->streamWrapperManager = $stream_wrapper_manager;
     if ($logger instanceof Settings) {
-      @trigger_error('The settings service should not be passed to ' . __METHOD__ . ' since drupal:9.5.0. The service will be removed in drupal:11.0.0. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
+      @trigger_error('Passing settings service to ' . __METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Site\Settings instead. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
       $args = func_get_args();
       $logger = $args[2];
     }
diff --git a/core/modules/language/src/LanguageNegotiator.php b/core/modules/language/src/LanguageNegotiator.php
index 314d5cab26..2d88407dd4 100644
--- a/core/modules/language/src/LanguageNegotiator.php
+++ b/core/modules/language/src/LanguageNegotiator.php
@@ -79,7 +79,7 @@ public function __construct(ConfigurableLanguageManagerInterface $language_manag
     $this->negotiatorManager = $negotiator_manager;
     $this->configFactory = $config_factory;
     if ($requestStack instanceof Settings) {
-      @trigger_error('The settings service should not be passed to ' . __METHOD__ . ' since drupal:9.5.0. The service will be removed in drupal:11.0.0. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
+      @trigger_error('Passing settings service to ' . __METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\Site\Settings instead. See https://www.drupal.org/node/3306646', E_USER_DEPRECATED);
       $args = func_get_args();
       $requestStack = $args[4];
     }