diff --git a/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php b/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
index 519546c..f0e07d1 100644
--- a/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
+++ b/mailhandler_comment/src/Plugin/inmail/Handler/MailhandlerComment.php
@@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Handler\HandlerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -96,7 +95,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    *
    * @return \Drupal\comment\Entity\Comment
@@ -105,7 +104,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
    * @throws \Exception
    *   Throws an exception in case user is not authorized to create a comment.
    */
-  protected function createComment(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function createComment(MessageInterface $message, DefaultAnalyzerResult $result) {
     $entity_id = $this->getEntityId($result);
 
     // Validate whether user is allowed to post comments.
@@ -133,7 +132,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
   /**
    * Checks if the user is authenticated and authorized to post comments.
    *
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    *
    * @return \Drupal\Core\Session\AccountInterface
@@ -142,7 +141,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
    * @throws \Exception
    *   Throws an exception in case user is not validated.
    */
-  protected function validateUser(DefaultAnalyzerResultInterface $result) {
+  protected function validateUser(DefaultAnalyzerResult $result) {
     // Do not allow unverified PGP-signed messages.
     if ($result->hasContext('verified') && !$result->getContext('verified')->getContextValue()) {
       throw new \Exception('Failed to process the message. PGP-signed message is not verified.');
@@ -215,7 +214,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
   /**
    * Returns a referenced entity ID.
    *
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    *
    * @return string
@@ -224,7 +223,7 @@ class MailhandlerComment extends HandlerBase implements ContainerFactoryPluginIn
    * @throws \Exception.
    *   Throws an exception in case entity ID is not valid.
    */
-  protected function getEntityId(DefaultAnalyzerResultInterface $result) {
+  protected function getEntityId(DefaultAnalyzerResult $result) {
     $subject = $result->getSubject();
     if (!preg_match('/^\[#(\d+)\]\s+/', $subject, $matches)) {
       throw new \Exception('Referenced entity ID of the comment could not be identified.');
diff --git a/src/Plugin/inmail/Analyzer/BodyAnalyzer.php b/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
index 6998245..99fe4bc 100644
--- a/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/BodyAnalyzer.php
@@ -3,7 +3,6 @@
 namespace Drupal\mailhandler\Plugin\inmail\Analyzer;
 
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -40,10 +39,10 @@ class BodyAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   A mail message to be analyzed.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    */
-  protected function analyzeBody(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function analyzeBody(MessageInterface $message, DefaultAnalyzerResult $result) {
     // Get the processed body if available. Otherwise, fallback to default one.
     $body = $result->getBody() ?: $message->getBody();
 
diff --git a/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php b/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
index cd0c730..37184fa 100644
--- a/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/EntityTypeAnalyzer.php
@@ -5,7 +5,6 @@ namespace Drupal\mailhandler\Plugin\inmail\Analyzer;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -45,10 +44,10 @@ class EntityTypeAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzed result.
    */
-  protected function findEntityType(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function findEntityType(MessageInterface $message, DefaultAnalyzerResult $result) {
     $subject = $result->getSubject() ?: $message->getSubject();
     $entity_type = NULL;
     $bundle = NULL;
diff --git a/src/Plugin/inmail/Analyzer/FooterAnalyzer.php b/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
index 0f27379..119e5b3 100644
--- a/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/FooterAnalyzer.php
@@ -3,7 +3,6 @@
 namespace Drupal\mailhandler\Plugin\inmail\Analyzer;
 
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -42,10 +41,10 @@ class FooterAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   A mail message to be analyzed.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    */
-  protected function findFooter(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function findFooter(MessageInterface $message, DefaultAnalyzerResult $result) {
     // Get a message body.
     $body = $result->getBody() ?: $message->getBody();
     $footer = NULL;
diff --git a/src/Plugin/inmail/Analyzer/PGPAnalyzer.php b/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
index ba81006..efb453a 100644
--- a/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/PGPAnalyzer.php
@@ -6,7 +6,6 @@ use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Plugin\Context\Context;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\MIME\MultipartEntity;
 use Drupal\inmail\MIME\MultipartMessage;
@@ -59,7 +58,7 @@ class PGPAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The message to check signature.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    * @param array $context
    *   An array to provide context data in case the message is signed.
@@ -67,7 +66,7 @@ class PGPAnalyzer extends AnalyzerBase {
    * @return bool
    *   TRUE if message is signed. Otherwise, FALSE.
    */
-  protected function isSigned(MessageInterface $message, DefaultAnalyzerResultInterface $result, array &$context) {
+  protected function isSigned(MessageInterface $message, DefaultAnalyzerResult $result, array &$context) {
     // Support PGP/MIME signed messages.
     if ($message instanceof MultipartMessage) {
       $parameters = $message->getContentType()['parameters'];
@@ -136,13 +135,13 @@ class PGPAnalyzer extends AnalyzerBase {
   /**
    * Verifies the PGP signature.
    *
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result instance containing PGP context.
    *
    * @throws \Exception
    *   Throws an exception in case verification fails.
    */
-  protected function verifySignature(DefaultAnalyzerResultInterface $result) {
+  protected function verifySignature(DefaultAnalyzerResult $result) {
     if (!extension_loaded('gnupg')) {
       throw new \Exception('PHP extension "gnupg" has to enabled to verify the signature.');
     }
@@ -183,7 +182,7 @@ class PGPAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    * @param array $context
    *   The array with context data.
@@ -191,7 +190,7 @@ class PGPAnalyzer extends AnalyzerBase {
    * @return string
    *   The analyzed message body.
    */
-  protected function findBody(MessageInterface $message, DefaultAnalyzerResultInterface $result, array &$context) {
+  protected function findBody(MessageInterface $message, DefaultAnalyzerResult $result, array &$context) {
     // By default, use original message body.
     $body = $message->getBody();
 
@@ -240,14 +239,14 @@ class PGPAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    * @param array $context
    *   The array with context data.
    * @throws \Exception
    *   Throws an exception if user is not authenticated.
    */
-  protected function findSender(MessageInterface $message, DefaultAnalyzerResultInterface $result, array &$context) {
+  protected function findSender(MessageInterface $message, DefaultAnalyzerResult $result, array &$context) {
     $sender = NULL;
     $user = NULL;
     $matches = [];
diff --git a/src/Plugin/inmail/Analyzer/SenderAnalyzer.php b/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
index 86b3280..7a54ca4 100644
--- a/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
+++ b/src/Plugin/inmail/Analyzer/SenderAnalyzer.php
@@ -3,7 +3,6 @@
 namespace Drupal\mailhandler\Plugin\inmail\Analyzer;
 
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Analyzer\AnalyzerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -38,10 +37,10 @@ class SenderAnalyzer extends AnalyzerBase {
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    */
-  protected function findSender(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function findSender(MessageInterface $message, DefaultAnalyzerResult $result) {
     $sender = NULL;
     $user = NULL;
     $matches = [];
diff --git a/src/Plugin/inmail/Handler/MailhandlerNode.php b/src/Plugin/inmail/Handler/MailhandlerNode.php
index 32e344c..df9d951 100644
--- a/src/Plugin/inmail/Handler/MailhandlerNode.php
+++ b/src/Plugin/inmail/Handler/MailhandlerNode.php
@@ -8,7 +8,6 @@ use Drupal\Core\Logger\RfcLogLevel;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Url;
 use Drupal\inmail\DefaultAnalyzerResult;
-use Drupal\inmail\DefaultAnalyzerResultInterface;
 use Drupal\inmail\MIME\MessageInterface;
 use Drupal\inmail\Plugin\inmail\Handler\HandlerBase;
 use Drupal\inmail\ProcessorResultInterface;
@@ -104,7 +103,7 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
    *
    * @param \Drupal\inmail\MIME\MessageInterface $message
    *   The mail message.
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    *
    * @return \Drupal\node\Entity\Node
@@ -113,7 +112,7 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
    * @throws \Exception
    *   Throws an exception in case user is not authorized to create a node.
    */
-  protected function createNode(MessageInterface $message, DefaultAnalyzerResultInterface $result) {
+  protected function createNode(MessageInterface $message, DefaultAnalyzerResult $result) {
     $node = Node::create([
       'type' => $this->getContentType($result),
       'body' => [
@@ -131,13 +130,13 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
   /**
    * Checks if the user is authenticated.
    *
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result instance.
    *
    * @throws \Exception
    *   Throws an exception in case user is not authenticated.
    */
-  protected function authenticateUser(DefaultAnalyzerResultInterface $result) {
+  protected function authenticateUser(DefaultAnalyzerResult $result) {
     // Do not allow "From" mail header authorization for PGP-signed messages.
     if (!$result->isUserAuthenticated() || ($result->hasContext('verified') && !$result->getContext('verified')->getContextValue())) {
       throw new \Exception('Failed to process the message. User is not authenticated.');
@@ -147,7 +146,7 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
   /**
    * Returns the content type.
    *
-   * @param \Drupal\inmail\DefaultAnalyzerResultInterface $result
+   * @param \Drupal\inmail\DefaultAnalyzerResult $result
    *   The analyzer result.
    *
    * @return string
@@ -156,7 +155,7 @@ class MailhandlerNode extends HandlerBase implements ContainerFactoryPluginInter
    * @throws \Exception
    *   Throws an exception in case user is not authorized to create a node.
    */
-  protected function getContentType(DefaultAnalyzerResultInterface $result) {
+  protected function getContentType(DefaultAnalyzerResult $result) {
     $content_type = $this->configuration['content_type'];
     $node = TRUE;
     if ($content_type == '_mailhandler' && $result->hasContext('entity_type')) {