diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php
index 648d870a14..6cb11c6ad0 100644
--- a/lib/DI/ContainerConfigurator.php
+++ b/lib/DI/ContainerConfigurator.php
@@ -240,8 +240,8 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository::class);
     $container->autowire(\MailPoet\Newsletter\Scheduler\WelcomeScheduler::class);
     $container->autowire(\MailPoet\Newsletter\Scheduler\PostNotificationScheduler::class);
-    $container->autowire(\MailPoet\Newsletter\ViewInBrowser::class)->setPublic(true);
     $container->autowire(\MailPoet\Newsletter\ViewInBrowser\ViewInBrowserController::class)->setPublic(true);
+    $container->autowire(\MailPoet\Newsletter\ViewInBrowser\ViewInBrowserRenderer::class)->setPublic(true);
     // Util
     $container->autowire(\MailPoet\Util\Cookies::class);
     $container->autowire(\MailPoet\Util\Url::class)->setPublic(true);
diff --git a/lib/Newsletter/ViewInBrowser/ViewInBrowserController.php b/lib/Newsletter/ViewInBrowser/ViewInBrowserController.php
index 1df158ffaa..b5d3b0431c 100644
--- a/lib/Newsletter/ViewInBrowser/ViewInBrowserController.php
+++ b/lib/Newsletter/ViewInBrowser/ViewInBrowserController.php
@@ -7,7 +7,6 @@ use MailPoet\Models\Newsletter;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Models\Subscriber;
 use MailPoet\Newsletter\Url as NewsletterUrl;
-use MailPoet\Newsletter\ViewInBrowser as NewsletterViewInBrowser;
 use MailPoet\Subscribers\LinkTokens;
 
 class ViewInBrowserController {
@@ -17,17 +16,17 @@ class ViewInBrowserController {
   /** @var LinkTokens */
   private $linkTokens;
 
-  /** @var NewsletterViewInBrowser */
-  private $newsletterViewInBrowser;
+  /** @var ViewInBrowserRenderer */
+  private $viewInBrowserRenderer;
 
   public function __construct(
     AccessControl $accessControl,
     LinkTokens $linkTokens,
-    NewsletterViewInBrowser $newsletterViewInBrowser
+    ViewInBrowserRenderer $viewInBrowserRenderer
   ) {
     $this->accessControl = $accessControl;
     $this->linkTokens = $linkTokens;
-    $this->newsletterViewInBrowser = $newsletterViewInBrowser;
+    $this->viewInBrowserRenderer = $viewInBrowserRenderer;
   }
 
   public function view(array $data) {
@@ -62,10 +61,9 @@ class ViewInBrowserController {
       throw new \InvalidArgumentException();
     }
 
-    return $this->newsletterViewInBrowser->view($isPreview, $newsletter, $subscriber, $queue);
+    return $this->viewInBrowserRenderer->render($isPreview, $newsletter, $subscriber, $queue);
   }
 
-
   private function getQueue(Newsletter $newsletter, array $data) {
     // queue is optional; try to find it if it's not defined and this is not a welcome email
     if ($newsletter->type === Newsletter::TYPE_WELCOME) {
diff --git a/lib/Newsletter/ViewInBrowser.php b/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
similarity index 95%
rename from lib/Newsletter/ViewInBrowser.php
rename to lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
index 965b8614d3..52579e7964 100644
--- a/lib/Newsletter/ViewInBrowser.php
+++ b/lib/Newsletter/ViewInBrowser/ViewInBrowserRenderer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace MailPoet\Newsletter;
+namespace MailPoet\Newsletter\ViewInBrowser;
 
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\SendingQueue;
@@ -11,7 +11,7 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes;
 use MailPoet\Settings\SettingsController;
 use MailPoet\WP\Emoji;
 
-class ViewInBrowser {
+class ViewInBrowserRenderer {
   /** @var Emoji */
   private $emoji;
 
@@ -23,7 +23,7 @@ class ViewInBrowser {
     $this->isTrackingEnabled = $settings->get('tracking.enabled');
   }
 
-  public function view(
+  public function render(
     bool $isPreview,
     Newsletter $newsletter,
     Subscriber $subscriber = null,