diff --git a/core/lib/Drupal/Core/Mail/MailCollector.php b/core/lib/Drupal/Core/Mail/MailCollector.php
new file mode 100644
index 0000000..0dcc60d
--- /dev/null
+++ b/core/lib/Drupal/Core/Mail/MailCollector.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\Core\Mail\MailCollector.
+ */
+
+namespace Drupal\Core\Mail;
+
+/**
+ * Defines a mail sending implementation that captures sent messages to a
+ * variable.
+ *
+ * This class is for running tests or for development.
+ */
+class MailCollector extends PhpMail implements MailInterface {
+
+  /**
+   * Overrides Drupal\Core\Mail\PhpMail::mail().
+   *
+   * Accepts an e-mail message and store it in a variable.
+   */
+  public function mail(array $message) {
+    $captured_emails = \Drupal::state()->get('system.test_email_collector') ?: array();
+    $captured_emails[] = $message;
+    \Drupal::state()->set('system.test_email_collector', $captured_emails);
+
+    return TRUE;
+  }
+}
diff --git a/core/lib/Drupal/Core/Mail/MailFactory.php b/core/lib/Drupal/Core/Mail/MailFactory.php
index d6bef9f..1cdfb58 100644
--- a/core/lib/Drupal/Core/Mail/MailFactory.php
+++ b/core/lib/Drupal/Core/Mail/MailFactory.php
@@ -62,7 +62,7 @@ public function __construct(ConfigFactory $configFactory) {
    * @code
    * array(
    *   'default' => 'Drupal\Core\Mail\PhpMail',
-   *   'user' => 'DevelMailLog',
+   *   'user' => 'Drupal\devel\DevelMailLog',
    * );
    * @endcode
    *
@@ -72,8 +72,8 @@ public function __construct(ConfigFactory $configFactory) {
    * @code
    * array(
    *   'default' => 'Drupal\Core\Mail\PhpMail',
-   *   'user' => 'DevelMailLog',
-   *   'contact_page_autoreply' => 'DrupalDevNullMailSend',
+   *   'user' => 'Drupal\devel\DevelMailLog',
+   *   'contact_page_autoreply' => 'Drupal\Core\Mail\MailCollector',
    * );
    * @endcode
    *
diff --git a/core/lib/Drupal/Core/Mail/VariableLog.php b/core/lib/Drupal/Core/Mail/VariableLog.php
deleted file mode 100644
index c7b5201..0000000
--- a/core/lib/Drupal/Core/Mail/VariableLog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Mail\VariableLog.
- */
-
-namespace Drupal\Core\Mail;
-
-/**
- * Defines a mail sending implementation that captures sent messages to a
- * variable.
- *
- * This class is for running tests or for development.
- */
-class VariableLog extends PhpMail implements MailInterface {
-
-  /**
-   * Overrides Drupal\Core\Mail\PhpMail::mail().
-   *
-   * Accepts an e-mail message and store it in a variable.
-   */
-  public function mail(array $message) {
-    $captured_emails = \Drupal::state()->get('system.test_email_collector') ?: array();
-    $captured_emails[] = $message;
-    \Drupal::state()->set('system.test_email_collector', $captured_emails);
-
-    return TRUE;
-  }
-}
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index a4c7b27..59ba3e8 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -841,7 +841,7 @@ protected function setUp() {
     }
 
     // Use the test mail class instead of the default mail handler class.
-    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\VariableLog')->save();
+    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\MailCollector')->save();
 
     drupal_set_time_limit($this->timeLimit);
     // Temporary fix so that when running from run-tests.sh we don't get an
diff --git a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
index 3efe397..829cf30 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
@@ -121,7 +121,7 @@ protected function setUp() {
     }
 
     // Use the test mail class instead of the default mail handler class.
-    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\VariableLog')->save();
+    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\MailCollector')->save();
 
     drupal_set_time_limit($this->timeLimit);
     // When running from run-tests.sh we don't get an empty current path which
diff --git a/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php b/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php
index df8cec1..8604080 100644
--- a/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php
@@ -97,7 +97,7 @@ protected function setUp() {
     }
 
     // Use the test mail class instead of the default mail handler class.
-    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\VariableLog')->save();
+    \Drupal::config('system.mail')->set('interface.default', 'Drupal\Core\Mail\MailCollector')->save();
 
     drupal_set_time_limit($this->timeLimit);
     // When running from run-tests.sh we don't get an empty current path which