diff --git a/src/InmailAnalyzerResult.php b/src/DefaultAnalyzerResult.php
similarity index 94%
rename from src/InmailAnalyzerResult.php
rename to src/DefaultAnalyzerResult.php
index 8499558..98b020e 100644
--- a/src/InmailAnalyzerResult.php
+++ b/src/DefaultAnalyzerResult.php
@@ -6,11 +6,11 @@ use Drupal\Core\Plugin\Context\ContextInterface;
 use Drupal\user\UserInterface;
 
 /**
- * Contains default result.
+ * Contains default analyzer result.
  *
  * @ingroup analyzer
  */
-class InmailAnalyzerResult implements AnalyzerResultInterface, InmailAnalyzerResultInterface {
+class DefaultAnalyzerResult implements AnalyzerResultInterface, DefaultAnalyzerResultInterface {
 
   /**
    * Identifies this class in relation to other analyzer results.
@@ -77,7 +77,7 @@ class InmailAnalyzerResult implements AnalyzerResultInterface, InmailAnalyzerRes
    * Returns a function closure that in turn returns a new class instance.
    *
    * @return callable
-   *   A factory closure that returns a new InmailAnalyzerResult object
+   *   A factory closure that returns a new DefaultAnalyzerResult object
    *   when called.
    */
   public static function createFactory() {
diff --git a/src/InmailAnalyzerResultInterface.php b/src/DefaultAnalyzerResultInterface.php
similarity index 96%
rename from src/InmailAnalyzerResultInterface.php
rename to src/DefaultAnalyzerResultInterface.php
index eb401c7..2cf1447 100644
--- a/src/InmailAnalyzerResultInterface.php
+++ b/src/DefaultAnalyzerResultInterface.php
@@ -6,12 +6,11 @@ use Drupal\Core\Plugin\Context\ContextInterface;
 use Drupal\user\UserInterface;
 
 /**
- * A default Inmail analyzer result created to allow collaboration between
- * analyzers.
+ * A default analyzer result created to allow collaboration between analyzers.
  *
  * @ingroup analyzer
  */
-interface InmailAnalyzerResultInterface {
+interface DefaultAnalyzerResultInterface {
 
   /**
    * Sets the sender mail address.
diff --git a/src/MessageProcessor.php b/src/MessageProcessor.php
index 3379153..db9fccb 100644
--- a/src/MessageProcessor.php
+++ b/src/MessageProcessor.php
@@ -106,8 +106,8 @@ class MessageProcessor implements MessageProcessorInterface {
     $result = new ProcessorResult();
     $result->setDeliverer($deliverer);
 
-    /** @var \Drupal\inmail\InmailAnalyzerResult $default_result */
-    $default_result = $result->ensureAnalyzerResult(InmailAnalyzerResult::TOPIC, InmailAnalyzerResult::createFactory());
+    /** @var \Drupal\inmail\DefaultAnalyzerResult $default_result */
+    $default_result = $result->ensureAnalyzerResult(DefaultAnalyzerResult::TOPIC, DefaultAnalyzerResult::createFactory());
     // @todo: Add dependency to "user" module?
     if ($this->moduleHandler->moduleExists('user')) {
       // Enabled analyzers will be able to update the account.
diff --git a/src/Plugin/inmail/Analyzer/StandardDSNAnalyzer.php b/src/Plugin/inmail/Analyzer/StandardDSNAnalyzer.php
index 23b6831..53a0ce3 100644
--- a/src/Plugin/inmail/Analyzer/StandardDSNAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/StandardDSNAnalyzer.php
@@ -4,7 +4,7 @@ namespace Drupal\inmail\Plugin\inmail\Analyzer;
 
 use Drupal\inmail\BounceAnalyzerResult;
 use Drupal\inmail\DSNStatus;
-use Drupal\inmail\InmailAnalyzerResult;
+use Drupal\inmail\DefaultAnalyzerResult;
 use Drupal\inmail\MIME\DSNEntity;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\ProcessorResultInterface;
diff --git a/src/Plugin/inmail/Analyzer/VERPAnalyzer.php b/src/Plugin/inmail/Analyzer/VERPAnalyzer.php
index be3cd12..2279e9d 100644
--- a/src/Plugin/inmail/Analyzer/VERPAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/VERPAnalyzer.php
@@ -3,7 +3,6 @@
 namespace Drupal\inmail\Plugin\inmail\Analyzer;
 
 use Drupal\inmail\BounceAnalyzerResult;
-use Drupal\inmail\InmailAnalyzerResult;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\ProcessorResultInterface;
 
@@ -51,8 +50,6 @@ class VerpAnalyzer extends AnalyzerBase {
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
     /** @var \Drupal\inmail\BounceAnalyzerResult $result */
     $result = $processor_result->ensureAnalyzerResult(BounceAnalyzerResult::TOPIC, BounceAnalyzerResult::createFactory());
-    /** @var \Drupal\inmail\InmailAnalyzerResult $default_result */
-    $default_result = $processor_result->getAnalyzerResult(InmailAnalyzerResult::TOPIC);
 
     // Split the site address to facilitate matching.
     $return_path = \Drupal::config('inmail.settings')->get('return_path') ?: \Drupal::config('system.site')->get('mail');
@@ -70,7 +67,6 @@ class VerpAnalyzer extends AnalyzerBase {
       // Report the recipient address (alice@example.com).
       $address = $matches[1] . '@' . $matches[2];
       $result->setRecipient($address);
-      $default_result->setSender($address);
     }
   }
 
diff --git a/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php b/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
index e0d7f05..ea2fb67 100644
--- a/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
+++ b/tests/modules/inmail_test/src/Plugin/inmail/Analyzer/TestAnalyzer.php
@@ -4,15 +4,13 @@ namespace Drupal\inmail_test\Plugin\inmail\Analyzer;
 
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
-use Drupal\inmail\InmailAnalyzerResult;
+use Drupal\inmail\DefaultAnalyzerResult;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
 
 /**
- * Finds the sender based on "From" mail header field.
- *
- * @ingroup analyzer
+ * Provides a test analyzer.
  *
  * @Analyzer(
  *   id = "test_analyzer",
@@ -25,8 +23,8 @@ class TestAnalyzer extends AnalyzerBase {
    * {@inheritdoc}
    */
   public function analyze(MessageInterface $message, ProcessorResultInterface $processor_result) {
-    /** @var \Drupal\inmail\InmailAnalyzerResult $default_result */
-    $default_result = $processor_result->getAnalyzerResult(InmailAnalyzerResult::TOPIC);
+    /** @var \Drupal\inmail\DefaultAnalyzerResult $default_result */
+    $default_result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
 
     // Provide sample context.
     $this->addContext($default_result);
@@ -35,7 +33,7 @@ class TestAnalyzer extends AnalyzerBase {
   /**
    * Adds a sample context.
    *
-   * @param \Drupal\inmail\InmailAnalyzerResult $default_result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $default_result
    */
   private function addContext($default_result) {
     $context_definition = new ContextDefinition('string', $this->t('Test Context'));
diff --git a/tests/src/Kernel/AnalyzerTest.php b/tests/src/Kernel/AnalyzerTest.php
index bab25df..9e6b3ad 100644
--- a/tests/src/Kernel/AnalyzerTest.php
+++ b/tests/src/Kernel/AnalyzerTest.php
@@ -6,7 +6,7 @@ use Drupal\inmail\BounceAnalyzerResult;
 use Drupal\inmail\Entity\AnalyzerConfig;
 use Drupal\inmail\Entity\DelivererConfig;
 use Drupal\inmail\Entity\HandlerConfig;
-use Drupal\inmail\InmailAnalyzerResult;
+use Drupal\inmail\DefaultAnalyzerResult;
 use Drupal\inmail_test\Plugin\inmail\Handler\ResultKeeperHandler;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\User;
@@ -80,8 +80,8 @@ EOF;
     $processor_result = ResultKeeperHandler::getResult();
     /** @var \Drupal\inmail\BounceAnalyzerResult $result */
     $result = $processor_result->getAnalyzerResult(BounceAnalyzerResult::TOPIC);
-    /** @var \Drupal\inmail\InmailAnalyzerResult $default_result */
-    $default_result = $processor_result->getAnalyzerResult(InmailAnalyzerResult::TOPIC);
+    /** @var \Drupal\inmail\DefaultAnalyzerResult $default_result */
+    $default_result = $processor_result->getAnalyzerResult(DefaultAnalyzerResult::TOPIC);
 
     $this->assertEqual($result->getRecipient(), 'verp-parsed@example.org');
     $this->assertEquals('verp-parsed@example.org', $default_result->getSender());
diff --git a/tests/src/Kernel/VerpTest.php b/tests/src/Kernel/VerpTest.php
index 50ef5c2..12d2e1a 100644
--- a/tests/src/Kernel/VerpTest.php
+++ b/tests/src/Kernel/VerpTest.php
@@ -6,7 +6,6 @@ use Drupal\inmail\BounceAnalyzerResult;
 use Drupal\inmail\Entity\AnalyzerConfig;
 use Drupal\inmail\Entity\DelivererConfig;
 use Drupal\inmail\Entity\HandlerConfig;
-use Drupal\inmail\InmailAnalyzerResult;
 use Drupal\inmail_test\Plugin\inmail\Handler\ResultKeeperHandler;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\KernelTests\KernelTestBase;
@@ -64,11 +63,8 @@ class VerpTest extends KernelTestBase {
 
     /** @var \Drupal\inmail\BounceAnalyzerResult $result */
     $result = ResultKeeperHandler::getResult()->getAnalyzerResult(BounceAnalyzerResult::TOPIC);
-    /** @var \Drupal\inmail\InmailAnalyzerResult $default_result */
-    $default_result = ResultKeeperHandler::getResult()->getAnalyzerResult(InmailAnalyzerResult::TOPIC);
     $parsed_recipient = $result->getRecipient();
     $this->assertEqual($parsed_recipient, $recipient);
-    $this->assertEquals($default_result->getSender(), $recipient);
 
     // VERP should be skipped for messages with Cc recipients.
     $message = \Drupal::service('plugin.manager.mail')->mail('inmail_test', 'cc', $recipient, LanguageInterface::LANGCODE_DEFAULT);