diff --git a/entity_print.install b/entity_print.install
index 8e9960c..b5d9681 100644
--- a/entity_print.install
+++ b/entity_print.install
@@ -36,7 +36,7 @@ function entity_print_requirements($phase) {
   $definitions = \Drupal::service('plugin.manager.entity_print.print_engine')->getDefinitions();
   $has_one_engine = FALSE;
   foreach ($definitions as $definition) {
-    /** @var \Drupal\entity_print\Plugin\PdfEngineInterface $class */
+    /** @var \Drupal\entity_print\Plugin\PrintEngineInterface $class */
     $class = $definition['class'];
     if ($class::dependenciesAvailable()) {
       $has_one_engine = TRUE;
diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php
index dd5f445..e2cb09d 100644
--- a/src/Form/SettingsForm.php
+++ b/src/Form/SettingsForm.php
@@ -198,7 +198,7 @@ class SettingsForm extends ConfigFormBase {
   public function validateForm(array &$form, FormStateInterface $form_state) {
     parent::validateForm($form, $form_state);
 
-    if ($plugin_id = $form_state->getValue('print_engine')) {
+    if ($plugin_id = $form_state->getValue('pdf_engine')) {
       // Load the config entity, submit the relevant plugin form and then save
       // it.
       $entity = $this->loadConfigEntity($plugin_id);
@@ -212,7 +212,7 @@ class SettingsForm extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    if ($plugin_id = $form_state->getValue('print_engine')) {
+    if ($plugin_id = $form_state->getValue('pdf_engine')) {
       // Load the config entity, submit the relevant plugin form and then save
       // it.
       $entity = $this->loadConfigEntity($plugin_id);
diff --git a/src/Tests/EntityPrintAdminTest.php b/src/Tests/EntityPrintAdminTest.php
index 957e34d..3d14a7c 100644
--- a/src/Tests/EntityPrintAdminTest.php
+++ b/src/Tests/EntityPrintAdminTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_print\Tests\EntityPrintAdminTest
- */
-
 namespace Drupal\entity_print\Tests;
 
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
@@ -37,13 +32,19 @@ class EntityPrintAdminTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
     // Create a content type and a dummy node.
-    $this->drupalCreateContentType(array(
+    $this->drupalCreateContentType([
       'type' => 'page',
       'name' => 'Page',
-    ));
+    ]);
     $this->node = $this->drupalCreateNode();
 
-    $account = $this->drupalCreateUser(['bypass entity print access', 'administer entity print', 'access content', 'administer content types', 'administer node display']);
+    $account = $this->drupalCreateUser([
+      'bypass entity print access',
+      'administer entity print',
+      'access content',
+      'administer content types',
+      'administer node display',
+    ]);
     $this->drupalLogin($account);
   }
 
@@ -81,7 +82,7 @@ class EntityPrintAdminTest extends WebTestBase {
     ], 'Save configuration');
 
     /** @var \Drupal\entity_print\Entity\PrintEngineInterface $config_entity */
-    $config_entity = \Drupal::entityTypeManager()->getStorage('print_engine')->load('testprintengine');
+    $config_entity = \Drupal::entityTypeManager()->getStorage('pdf_engine')->load('testprintengine');
 
     // Assert the expected settings were stored.
     $this->assertEqual('testprintengine', $config_entity->id());
diff --git a/src/Tests/EntityPrintTest.php b/src/Tests/EntityPrintTest.php
index 6c04d84..1bca1f1 100644
--- a/src/Tests/EntityPrintTest.php
+++ b/src/Tests/EntityPrintTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\entity_print\Tests\EntityPrintTest.
- */
-
 namespace Drupal\entity_print\Tests;
 
 use Drupal\simpletest\WebTestBase;
diff --git a/tests/modules/entity_print_test/entity_print_test.module b/tests/modules/entity_print_test/entity_print_test.module
index 180cc65..075950d 100644
--- a/tests/modules/entity_print_test/entity_print_test.module
+++ b/tests/modules/entity_print_test/entity_print_test.module
@@ -22,7 +22,7 @@ function entity_print_test_entity_print_pdf_engine_alter(&$definitions) {
   $disabled_engines = ['dompdf', 'phpwkhtmltopdf'];
   foreach ($disabled_engines as $id) {
     if (isset($definitions[$id]['class'])) {
-      $definitions[$id]['class'] = 'Drupal\entity_print_test\Plugin\EntityPrint\PdfEngine\NotAvailablePdfEngine';
+      $definitions[$id]['class'] = 'Drupal\entity_print_test\Plugin\EntityPrint\PrintEngine\NotAvailablePrintEngine';
     }
   }
 }
diff --git a/tests/src/Unit/EntityPrintTest.php b/tests/src/Unit/EntityPrintTest.php
index 568a2da..751fa31 100644
--- a/tests/src/Unit/EntityPrintTest.php
+++ b/tests/src/Unit/EntityPrintTest.php
@@ -23,13 +23,13 @@ class EntityPrintTest extends UnitTestCase {
    */
   public function testGenerateFilename($entity_label, $expected_filename) {
     $entity = $this->getMockEntity($entity_label);
-    $pdf_builder = $this->getMockPdfBuilder();
+    $print_builder = $this->getMockPrintBuilder();
 
-    $reflection = new \ReflectionClass($pdf_builder);
+    $reflection = new \ReflectionClass($print_builder);
     $method = $reflection->getMethod('generateFilename');
-    $method->setAccessible(true);
+    $method->setAccessible(TRUE);
 
-    $this->assertEquals($expected_filename, $method->invoke($pdf_builder, $entity));
+    $this->assertEquals($expected_filename, $method->invoke($print_builder, $entity));
   }
 
   /**
@@ -53,13 +53,13 @@ class EntityPrintTest extends UnitTestCase {
    * @return \Drupal\entity_print\PrintBuilder
    *   The entity pdf builder mock.
    */
-  protected function getMockPdfBuilder() {
-    $pdf_builder = $this->getMockBuilder('Drupal\entity_print\PrintBuilder')
+  protected function getMockPrintBuilder() {
+    $print_builder = $this->getMockBuilder('Drupal\entity_print\PrintBuilder')
       ->disableOriginalConstructor()
       ->setMethods([])
       ->getMock();
 
-    return $pdf_builder;
+    return $print_builder;
   }
 
   /**