diff --git a/entity_print.services.yml b/entity_print.services.yml
index 93bb3bf..6747f70 100644
--- a/entity_print.services.yml
+++ b/entity_print.services.yml
@@ -2,8 +2,8 @@ services:
   plugin.manager.entity_print.pdf_engine:
     class: Drupal\entity_print\Plugin\EntityPrintPluginManager
     arguments: ['@container.namespaces', '@cache.discovery', '@module_handler', '@event_dispatcher']
-  entity_print.pdf_manager:
-    class: Drupal\entity_print\EntityPrintPdfBuilder
+  entity_print.print_manager:
+    class: Drupal\entity_print\EntityPrintPrintBuilder
     arguments: ['@entity_print.renderer_factory', '@event_dispatcher']
   entity_print.renderer_factory:
     class: Drupal\entity_print\Renderer\RendererFactory
diff --git a/src/Controller/EntityPrintController.php b/src/Controller/EntityPrintController.php
index 31b9bf2..050ea39 100644
--- a/src/Controller/EntityPrintController.php
+++ b/src/Controller/EntityPrintController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_print\Controller\EntityPrintController
+ * Contains \Drupal\entity_print\Controller\EntityPrintController.
  */
 
 namespace Drupal\entity_print\Controller;
@@ -12,7 +12,7 @@ use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\entity_print\PdfBuilderInterface;
+use Drupal\entity_print\PrintBuilderInterface;
 use Drupal\entity_print\PdfEngineException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -32,9 +32,9 @@ class EntityPrintController extends ControllerBase {
   /**
    * The PDF builder.
    *
-   * @var \Drupal\entity_print\PdfBuilderInterface
+   * @var \Drupal\entity_print\PrintBuilderInterface
    */
-  protected $pdfBuilder;
+  protected $printBuilder;
 
   /**
    * The Entity Type manager.
@@ -46,9 +46,9 @@ class EntityPrintController extends ControllerBase {
   /**
    * {@inheritdoc}
    */
-  public function __construct(EntityPrintPluginManager $plugin_manager, PdfBuilderInterface $pdf_builder, EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(EntityPrintPluginManager $plugin_manager, PrintBuilderInterface $print_builder, EntityTypeManagerInterface $entity_type_manager) {
     $this->pluginManager = $plugin_manager;
-    $this->pdfBuilder = $pdf_builder;
+    $this->printBuilder = $print_builder;
     $this->entityTypeManager = $entity_type_manager;
   }
 
@@ -58,7 +58,7 @@ class EntityPrintController extends ControllerBase {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('plugin.manager.entity_print.pdf_engine'),
-      $container->get('entity_print.pdf_manager'),
+      $container->get('entity_print.print_manager'),
       $container->get('entity_type.manager')
     );
   }
@@ -92,7 +92,7 @@ class EntityPrintController extends ControllerBase {
 
     return (new StreamedResponse(function() use ($entity, $pdf_engine, $config) {
       // The PDF is sent straight to the browser.
-      $this->pdfBuilder->getEntityRenderedAsPdf($entity, $pdf_engine, $config->get('force_download'), $config->get('default_css'));
+      $this->printBuilder->getEntityRenderedAsPrint($entity, $pdf_engine, $config->get('force_download'), $config->get('default_css'));
     }))->send();
   }
 
diff --git a/src/EntityPrintPdfBuilder.php b/src/EntityPrintPdfBuilder.php
deleted file mode 100644
index 00512c5..0000000
--- a/src/EntityPrintPdfBuilder.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Drupal\entity_print;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\entity_print\Event\PdfEvents;
-use Drupal\entity_print\Event\PreSendPdfEvent;
-use Drupal\entity_print\Event\PreSendPdfMultipleEvent;
-use Drupal\entity_print\Plugin\PdfEngineInterface;
-use Drupal\entity_print\Renderer\RendererFactoryInterface;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-
-class EntityPrintPdfBuilder implements PdfBuilderInterface {
-
-  /**
-   * The PDF Renderer factory.
-   *
-   * @var \Drupal\entity_print\Renderer\RendererFactoryInterface
-   */
-  protected $rendererFactory;
-
-  /**
-   * The event dispatcher.
-   *
-   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
-   */
-  protected $dispatcher;
-
-  /**
-   * Constructs a new EntityPrintPdfBuilder.
-   *
-   * @param \Drupal\entity_print\Renderer\RendererFactoryInterface $renderer_factory
-   *   The Renderer factory.
-   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
-   *   The event dispatcher.
-   */
-  public function __construct(RendererFactoryInterface $renderer_factory, EventDispatcherInterface $event_dispatcher) {
-    $this->rendererFactory = $renderer_factory;
-    $this->dispatcher = $event_dispatcher;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityRenderedAsPdf(EntityInterface $entity, PdfEngineInterface $pdf_engine, $force_download = FALSE, $use_default_css = TRUE) {
-    $pdf_engine->addPage($this->rendererFactory->create($entity)->getHtml($entity, $use_default_css, TRUE));
-
-    // Allow other modules to alter the generated PDF object.
-    $this->dispatcher->dispatch(PdfEvents::PRE_SEND, new PreSendPdfEvent($pdf_engine, $entity));
-
-    // If we're forcing a download we need a filename otherwise it's just sent
-    // straight to the browser.
-    $filename = $force_download ? $this->generateFilename($entity) : NULL;
-
-    return $pdf_engine->send($filename);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getMultipleEntitiesRenderedAsPdf(array $entities, PdfEngineInterface $pdf_engine, $force_download = FALSE, $use_default_css = TRUE) {
-    $pdf_engine->addPage($this->rendererFactory->create($entities)->getHtmlMultiple($entities, $use_default_css, TRUE));
-
-    // Allow other modules to alter the generated PDF object.
-    $this->dispatcher->dispatch(PdfEvents::PRE_SEND_MULTIPLE, new PreSendPdfMultipleEvent($pdf_engine, $entities));
-
-    // If we're forcing a download we need a filename otherwise it's just sent
-    // straight to the browser.
-    $filename = $force_download ? $this->generateMultiFilename($entities) : NULL;
-
-    return $pdf_engine->send($filename);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityRenderedAsHtml(EntityInterface $entity, $use_default_css = TRUE, $optimize_css = TRUE) {
-    return $this->rendererFactory->create($entity)->getHtml($entity, $use_default_css, $optimize_css);
-  }
-
-  /**
-   * Generate a filename from the entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The content entity to generate the filename.
-   * @param bool $with_extension
-   *   Allow us to exclude the PDF file extension when generating the filename.
-   *
-   * @return string
-   *   The cleaned filename from the entity label.
-   */
-  protected function generateFilename(EntityInterface $entity, $with_extension = TRUE) {
-    $filename = preg_replace("/[^A-Za-z0-9 ]/", '', $entity->label());
-    // If for some bizarre reason there isn't a valid character in the entity
-    // title or the entity doesn't provide a label then we use the entity type.
-    if (!$filename) {
-      $filename = $entity->getEntityTypeId();
-    }
-    return $with_extension ? $filename . '.pdf' : $filename;
-  }
-
-  /**
-   * @param array $entities
-   *   An array of entities to derive the filename for.
-   *
-   * @return string
-   *   The filename to use.
-   */
-  protected function generateMultiFilename(array $entities) {
-    $filename = '';
-    foreach ($entities as $entity) {
-      $filename .= $this->generateFilename($entity, FALSE) . '-';
-    }
-    return rtrim($filename, '-');
-  }
-
-}
diff --git a/src/EntityPrintPrintBuilder.php b/src/EntityPrintPrintBuilder.php
new file mode 100644
index 0000000..27a0a97
--- /dev/null
+++ b/src/EntityPrintPrintBuilder.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Drupal\entity_print;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\entity_print\Event\PdfEvents;
+use Drupal\entity_print\Event\PreSendPdfEvent;
+use Drupal\entity_print\Event\PreSendPdfMultipleEvent;
+use Drupal\entity_print\Plugin\PrintEngineInterface;
+use Drupal\entity_print\Renderer\RendererFactoryInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+class EntityPrintPrintBuilder implements PrintBuilderInterface {
+
+  /**
+   * The Print Renderer factory.
+   *
+   * @var \Drupal\entity_print\Renderer\RendererFactoryInterface
+   */
+  protected $rendererFactory;
+
+  /**
+   * The event dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
+   */
+  protected $dispatcher;
+
+  /**
+   * Constructs a new EntityPrintPrintBuilder.
+   *
+   * @param \Drupal\entity_print\Renderer\RendererFactoryInterface $renderer_factory
+   *   The Renderer factory.
+   * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
+   *   The event dispatcher.
+   */
+  public function __construct(RendererFactoryInterface $renderer_factory, EventDispatcherInterface $event_dispatcher) {
+    $this->rendererFactory = $renderer_factory;
+    $this->dispatcher = $event_dispatcher;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityRenderedAsPrint(EntityInterface $entity, PrintEngineInterface $print_engine, $force_download = FALSE, $use_default_css = TRUE) {
+    $print_engine->addPage($this->rendererFactory->create($entity)->getHtml($entity, $use_default_css, TRUE));
+
+    // Allow other modules to alter the generated Print object.
+    $this->dispatcher->dispatch(PdfEvents::PRE_SEND, new PreSendPdfEvent($print_engine, $entity));
+
+    // If we're forcing a download we need a filename otherwise it's just sent
+    // straight to the browser.
+    $filename = $force_download ? $this->generateFilename($entity) : NULL;
+
+    return $print_engine->send($filename);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMultipleEntitiesRenderedAsPrint(array $entities, PrintEngineInterface $print_engine, $force_download = FALSE, $use_default_css = TRUE) {
+    $print_engine->addPage($this->rendererFactory->create($entities)->getHtmlMultiple($entities, $use_default_css, TRUE));
+
+    // Allow other modules to alter the generated Print object.
+    $this->dispatcher->dispatch(PdfEvents::PRE_SEND_MULTIPLE, new PreSendPdfMultipleEvent($print_engine, $entities));
+
+    // If we're forcing a download we need a filename otherwise it's just sent
+    // straight to the browser.
+    $filename = $force_download ? $this->generateMultiFilename($entities) : NULL;
+
+    return $print_engine->send($filename);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityRenderedAsHtml(EntityInterface $entity, $use_default_css = TRUE, $optimize_css = TRUE) {
+    return $this->rendererFactory->create($entity)->getHtml($entity, $use_default_css, $optimize_css);
+  }
+
+  /**
+   * Generate a filename from the entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The content entity to generate the filename.
+   * @param bool $with_extension
+   *   Allow us to exclude the Print file extension when generating the filename.
+   *
+   * @return string
+   *   The cleaned filename from the entity label.
+   */
+  protected function generateFilename(EntityInterface $entity, $with_extension = TRUE) {
+    $filename = preg_replace("/[^A-Za-z0-9 ]/", '', $entity->label());
+    // If for some bizarre reason there isn't a valid character in the entity
+    // title or the entity doesn't provide a label then we use the entity type.
+    if (!$filename) {
+      $filename = $entity->getEntityTypeId();
+    }
+    // @TODO abstract the .pdf extension.
+    return $with_extension ? $filename . '.pdf' : $filename;
+  }
+
+  /**
+   * @param array $entities
+   *   An array of entities to derive the filename for.
+   *
+   * @return string
+   *   The filename to use.
+   */
+  protected function generateMultiFilename(array $entities) {
+    $filename = '';
+    foreach ($entities as $entity) {
+      $filename .= $this->generateFilename($entity, FALSE) . '-';
+    }
+    return rtrim($filename, '-');
+  }
+
+}
diff --git a/src/PdfBuilderInterface.php b/src/PdfBuilderInterface.php
deleted file mode 100644
index ad49111..0000000
--- a/src/PdfBuilderInterface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\entity_print\PdfBuilderInterface
- */
-
-namespace Drupal\entity_print;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\entity_print\Plugin\PdfEngineInterface;
-
-/**
- * Interface for the PDF builder service.
- */
-interface PdfBuilderInterface {
-
-  /**
-   * Render any content entity as a PDF.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The content entity to render.
-   * @param \Drupal\entity_print\Plugin\PdfEngineInterface $pdf_engine
-   *   The plugin id of the PDF engine to use.
-   * @param bool $force_download
-   *   (optional) TRUE to try and force the PDF to be downloaded rather than opened.
-   * @param bool $use_default_css
-   *   (optional) TRUE if you want the default CSS included, otherwise FALSE.
-   *
-   * @return string
-   *   FALSE or the PDF content will be sent to the browser.
-   */
-  public function getEntityRenderedAsPdf(EntityInterface $entity, PdfEngineInterface $pdf_engine, $force_download = FALSE, $use_default_css = TRUE);
-
-  /**
-   * Render any content entity as a PDF.
-   *
-   * @param array $entities
-   *   An array of content entities to render, 1 per page.
-   * @param \Drupal\entity_print\Plugin\PdfEngineInterface $pdf_engine
-   *   The plugin id of the PDF engine to use.
-   * @param bool $force_download
-   *   (optional) TRUE to try and force the PDF to be downloaded rather than opened.
-   * @param bool $use_default_css
-   *   (optional) TRUE if you want the default CSS included, otherwise FALSE.
-   *
-   * @return string
-   *   FALSE or the PDF content will be sent to the browser.
-   */
-  public function getMultipleEntitiesRenderedAsPdf(array $entities, PdfEngineInterface $pdf_engine, $force_download = FALSE, $use_default_css = TRUE);
-
-  /**
-   * Get a HTML version of the entity as used for the PDF rendering.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The content entity to render.
-   * @param bool $use_default_css
-   *   TRUE if you want the default CSS included, otherwise FALSE.
-   * @param bool $optimize_css
-   *   TRUE if you the CSS should be compressed otherwise FALSE.
-   *
-   * @return string
-   *   The rendered HTML for this entity, the same as what is used for the PDF.
-   */
-  public function getEntityRenderedAsHtml(EntityInterface $entity, $use_default_css = TRUE, $optimize_css = TRUE);
-}
diff --git a/src/Plugin/Action/PdfDownload.php b/src/Plugin/Action/PdfDownload.php
index f09f88a..dad6544 100644
--- a/src/Plugin/Action/PdfDownload.php
+++ b/src/Plugin/Action/PdfDownload.php
@@ -89,7 +89,7 @@ class PdfDownload extends ActionBase implements ContainerFactoryPluginInterface
       $plugin_id,
       $plugin_definition,
       $container->get('access_manager'),
-      $container->get('entity_print.pdf_manager'),
+      $container->get('entity_print.print_manager'),
       $container->get('plugin.manager.entity_print.pdf_engine'),
       $container->get('config.factory')->get('entity_print.settings')
     );
diff --git a/src/Plugin/PdfEngineBase.php b/src/Plugin/PdfEngineBase.php
index 0036a47..b14aa41 100644
--- a/src/Plugin/PdfEngineBase.php
+++ b/src/Plugin/PdfEngineBase.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\entity_print\Plugin\PdfEngineBase
+ * Contains \Drupal\entity_print\Plugin\PdfEngineBase.
  */
 
 namespace Drupal\entity_print\Plugin;
diff --git a/src/Plugin/PdfEngineInterface.php b/src/Plugin/PdfEngineInterface.php
index d77c576..9962560 100644
--- a/src/Plugin/PdfEngineInterface.php
+++ b/src/Plugin/PdfEngineInterface.php
@@ -24,18 +24,18 @@ interface PdfEngineInterface extends PluginInspectionInterface, PluginFormInterf
   public function addPage($content);
 
   /**
-   * Send the PDF contents to the browser.
+   * Send the Print contents to the browser.
    *
    * @param $filename
    *   (optional) The filename if we want to force the browser to download.
    *
    * @throws \Drupal\entity_print\PdfEngineException
-   *   Thrown when PDF generation fails.
+   *   Thrown when Print generation fails.
    */
   public function send($filename = NULL);
 
   /**
-   * Checks if the PDF engine dependencies are available.
+   * Checks if the Print engine dependencies are available.
    *
    * @return bool
    *   TRUE if this implementation has its dependencies met otherwise FALSE.
@@ -43,7 +43,7 @@ interface PdfEngineInterface extends PluginInspectionInterface, PluginFormInterf
   public static function dependenciesAvailable();
 
   /**
-   * Gets the installation instructions for this PDF engine.
+   * Gets the installation instructions for this Print engine.
    *
    * @return string
    *   A description of how the user can meet the dependencies for this engine.
diff --git a/src/PrintBuilderInterface.php b/src/PrintBuilderInterface.php
new file mode 100644
index 0000000..63eeeef
--- /dev/null
+++ b/src/PrintBuilderInterface.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\entity_print;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\entity_print\Plugin\PrintEngineInterface;
+
+/**
+ * Interface for the Print builder service.
+ */
+interface PrintBuilderInterface {
+
+  /**
+   * Render any content entity as a Print.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The content entity to render.
+   * @param \Drupal\entity_print\Plugin\PrintEngineInterface $print_engine
+   *   The plugin id of the Print engine to use.
+   * @param bool $force_download
+   *   (optional) TRUE to try and force the Print to be downloaded rather than opened.
+   * @param bool $use_default_css
+   *   (optional) TRUE if you want the default CSS included, otherwise FALSE.
+   *
+   * @return string
+   *   FALSE or the Print content will be sent to the browser.
+   */
+  public function getEntityRenderedAsPrint(EntityInterface $entity, PrintEngineInterface $print_engine, $force_download = FALSE, $use_default_css = TRUE);
+
+  /**
+   * Render any content entity as a Print.
+   *
+   * @param array $entities
+   *   An array of content entities to render, 1 per page.
+   * @param \Drupal\entity_print\Plugin\PrintEngineInterface $print_engine
+   *   The plugin id of the Print engine to use.
+   * @param bool $force_download
+   *   (optional) TRUE to try and force the Print to be downloaded rather than opened.
+   * @param bool $use_default_css
+   *   (optional) TRUE if you want the default CSS included, otherwise FALSE.
+   *
+   * @return string
+   *   FALSE or the Print content will be sent to the browser.
+   */
+  public function getMultipleEntitiesRenderedAsPrint(array $entities, PrintEngineInterface $print_engine, $force_download = FALSE, $use_default_css = TRUE);
+
+  /**
+   * Get a HTML version of the entity as used for the Print rendering.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The content entity to render.
+   * @param bool $use_default_css
+   *   TRUE if you want the default CSS included, otherwise FALSE.
+   * @param bool $optimize_css
+   *   TRUE if you the CSS should be compressed otherwise FALSE.
+   *
+   * @return string
+   *   The rendered HTML for this entity, the same as what is used for the Print.
+   */
+  public function getEntityRenderedAsHtml(EntityInterface $entity, $use_default_css = TRUE, $optimize_css = TRUE);
+}