diff --git a/core/lib/Drupal/Core/Mail/MailFactory.php b/core/lib/Drupal/Core/Mail/MailFactory.php
index d6bef9f..affa694 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\NullMail',
    * );
    * @endcode
    *
diff --git a/core/lib/Drupal/Core/Mail/VariableLog.php b/core/lib/Drupal/Core/Mail/MockMail.php
similarity index 65%
rename from core/lib/Drupal/Core/Mail/VariableLog.php
rename to core/lib/Drupal/Core/Mail/MockMail.php
index c7b5201..6d3da52 100644
--- a/core/lib/Drupal/Core/Mail/VariableLog.php
+++ b/core/lib/Drupal/Core/Mail/MockMail.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Mail\VariableLog.
+ * Contains \Drupal\Core\Mail\MockMail.
  */
 
 namespace Drupal\Core\Mail;
 
 /**
- * Defines a mail sending implementation that captures sent messages to a
- * variable.
+ * Defines a mail sending implementation that captures sent messages to the
+ * state system.
  *
  * This class is for running tests or for development.
  */
-class VariableLog extends PhpMail implements MailInterface {
+class MockMail extends PhpMail implements MailInterface {
 
   /**
-   * Overrides Drupal\Core\Mail\PhpMail::mail().
+   * Overrides \Drupal\Core\Mail\PhpMail::mail().
    *
-   * Accepts an e-mail message and store it in a variable.
+   * Accepts an e-mail message and stores it with the state system.
    */
   public function mail(array $message) {
     $captured_emails = \Drupal::state()->get('system.test_email_collector') ?: array();
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 79d8b8f..45bb2d5 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\MockMail')->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 91e5485..7aa0026 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php
@@ -133,7 +133,7 @@ protected function setUp() {
     ), $submit_value);
 
     // 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\MockMail')->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..a8be1bd 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\MockMail')->save();
 
     drupal_set_time_limit($this->timeLimit);
     // When running from run-tests.sh we don't get an empty current path which