diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 2d31846e37..6328f137df 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -219,7 +219,6 @@ function drupal_get_filename($type, $name, $filename = NULL) {
     }
     else {
       try {
-        @trigger_error('drupal_get_filename() is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal::service(\'extension.list.module\')->getFileName() and \Drupal::service(\'extension.list.theme\')->getFileName(). See https://www.drupal.org/node/2709919', E_USER_DEPRECATED);
         return $extension_list->getFilename($name);
       }
       catch (\InvalidArgumentException $e) {
diff --git a/core/lib/Drupal/Core/Extension/ExtensionList.php b/core/lib/Drupal/Core/Extension/ExtensionList.php
index f8fbeab69f..1c46cec8bd 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionList.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionList.php
@@ -169,7 +169,7 @@ public function reset() {
     $this->cache->delete($this->getFilenameCacheId());
     // We explicitly don't reset the addedFileNames as its sort of a static
     // cache.
-    // @todo In the longrun it would be great to add the reset, but the early
+    // @todo In the long run it would be great to add the reset, but the early
     //   installer fails due to that.
     return $this;
   }
diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 2f6745c890..a7d8a9bffc 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -717,7 +717,6 @@ public function getModuleDirectories() {
    * {@inheritdoc}
    */
   public function getName($module) {
-    @trigger_error('ModuleHandlerInterface::getName() is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal::service(\'extension.list.module\')->getName(). See https://www.drupal.org/node/2709919', E_USER_DEPRECATED);
     return \Drupal::service('extension.list.module')->getName($module);
   }
 
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index dabae62f4d..aa404497ca 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1007,6 +1007,8 @@ function _system_rebuild_module_data_ensure_required($module, &$modules) {
  *   An associative array of module information.
  *
  * @deprecated in Drupal 8.4.x and will be removed before Drupal 9.0.0.
+ *   Use \Drupal::service(\'extension.list.module\')->reset()->listExtensions()
+ *   instead. Note: You probably don't need the reset() method.
  */
 function _system_rebuild_module_data() {
   @trigger_error('_system_rebuild_module_data() is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, you should use \Drupal::service(\'extension.list.module\')->reset()->listExtensions(). See https://www.drupal.org/node/2709919', E_USER_DEPRECATED);