diff --git a/rabbit_hole.services.yml b/rabbit_hole.services.yml
index 4d5b9ca..57c8882 100644
--- a/rabbit_hole.services.yml
+++ b/rabbit_hole.services.yml
@@ -1,4 +1,4 @@
 services:
-  plugin.manager.rabbit_hole_behavior:
-    class: Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorManager
+  plugin.manager.rabbit_hole_behavior_plugin:
+    class: Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager
     parent: default_plugin_manager
diff --git a/src/Annotation/RabbitHoleBehavior.php b/src/Annotation/RabbitHoleBehaviorPlugin.php
similarity index 53%
rename from src/Annotation/RabbitHoleBehavior.php
rename to src/Annotation/RabbitHoleBehaviorPlugin.php
index 660af2d..f7fcde8 100644
--- a/src/Annotation/RabbitHoleBehavior.php
+++ b/src/Annotation/RabbitHoleBehaviorPlugin.php
@@ -2,22 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Annotation\RabbitHoleBehavior.
+ * Contains \Drupal\rabbit_hole\Annotation\RabbitHoleBehaviorPlugin.
  */
 
 namespace Drupal\rabbit_hole\Annotation;
 
-use Drupal\Component\Annotation;
+use Drupal\Component\Annotation\Plugin;
 
 /**
- * Defines a Rabbit hole action item annotation object.
+ * Defines a Rabbit hole behavior plugin item annotation object.
  *
- * @see \Drupal\rabbit_hole\Plugin\RabbitHoleActionManager
+ * @see \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager
  * @see plugin_api
  *
  * @Annotation
  */
-class RabbitHoleBehavior extends Plugin {
+class RabbitHoleBehaviorPlugin extends Plugin {
 
   /**
    * The plugin ID.
diff --git a/src/Plugin/RabbitHoleBehavior/DisplayPage.php b/src/Plugin/RabbitHoleBehavior/DisplayPage.php
deleted file mode 100644
index 320e20c..0000000
--- a/src/Plugin/RabbitHoleBehavior/DisplayPage.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\DisplayPage.
- */
-
-namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehavior;
-use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorBase;
-
-/**
- * Does nothing (displays a page).
- *
- * @Plugin(
- *   id = "display_page",
- *   label = @Translation("Display the page")
- * )
- */
-class DisplayPage extends RabbitHoleBehaviorBase {
-  // Empty class: just does RabbitHoleBehaviorBase's defaults, which is nothing.
-}
diff --git a/src/Plugin/RabbitHoleBehavior/AccessDenied.php b/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
similarity index 53%
rename from src/Plugin/RabbitHoleBehavior/AccessDenied.php
rename to src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
index 3d56e6a..b8c0890 100644
--- a/src/Plugin/RabbitHoleBehavior/AccessDenied.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/AccessDenied.php
@@ -1,23 +1,23 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\AccessDenied.
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\AccessDenied.
  */
 
-namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehavior;
+namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorBase;
+use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase;
 
 /**
  * Denies access to a page.
  *
- * @Plugin(
+ * @RabbitHoleBehaviorPlugin(
  *   id = "access_denied",
  *   label = @Translation("Access denied")
  * )
  */
-class AccessDenied extends RabbitHoleBehaviorBase {
+class AccessDenied extends RabbitHoleBehaviorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php b/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php
new file mode 100644
index 0000000..170f8c5
--- /dev/null
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/DisplayPage.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @file
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\DisplayPage.
+ */
+
+namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
+
+use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase;
+
+/**
+ * Does nothing (displays a page).
+ *
+ * @RabbitHoleBehaviorPlugin(
+ *   id = "display_page",
+ *   label = @Translation("Display the page")
+ * )
+ */
+class DisplayPage extends RabbitHoleBehaviorPluginBase {
+
+  // Empty class: just does RabbitHoleBehaviorBase's defaults, which is nothing.
+
+}
diff --git a/src/Plugin/RabbitHoleBehavior/PageNotFound.php b/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
similarity index 52%
rename from src/Plugin/RabbitHoleBehavior/PageNotFound.php
rename to src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
index 984170c..30d96b6 100644
--- a/src/Plugin/RabbitHoleBehavior/PageNotFound.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/PageNotFound.php
@@ -1,23 +1,23 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\PageNotFound.
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageNotFound.
  */
 
-namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehavior;
+namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorBase;
+use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase;
 
 /**
  * Denies access to a page.
  *
- * @Plugin(
+ * @RabbitHoleBehaviorPlugin(
  *   id = "page_not_found",
  *   label = @Translation("Page not found")
  * )
  */
-class PageNotFound extends RabbitHoleBehaviorBase {
+class PageNotFound extends RabbitHoleBehaviorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/RabbitHoleBehavior/PageRedirect.php b/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
similarity index 78%
rename from src/Plugin/RabbitHoleBehavior/PageRedirect.php
rename to src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
index 88c0dd2..a31b280 100644
--- a/src/Plugin/RabbitHoleBehavior/PageRedirect.php
+++ b/src/Plugin/RabbitHoleBehaviorPlugin/PageRedirect.php
@@ -1,24 +1,24 @@
 <?php
 /**
  * @file
- *
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageRedirect.
  */
 
-namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehavior;
+namespace Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorBase;
+use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Redirects to another page.
  *
- * @Plugin(
+ * @RabbitHoleBehaviorPlugin(
  *   id = "page_redirect",
  *   label = @Translation("Page redirect")
  * )
  */
-class PageRedirect extends RabbitHoleBehaviorBase {
+class PageRedirect extends RabbitHoleBehaviorPluginBase {
   use StringTranslationTrait;
 
   /**
@@ -55,14 +55,13 @@ class PageRedirect extends RabbitHoleBehaviorBase {
   public function settingsForm(&$form, &$form_state, $form_id) {
     $form['redirect'] = [
       '#type' => 'details',
-      '#title' => $this->t('Redirect settings')
+      '#title' => $this->t('Redirect settings'),
     ];
     $form['redirect']['redirect_path'] = [
       '#type' => 'text',
       '#title' => $this->t('Redirect path'),
-      '#description' => $this->t('Enter the relative path or the full URL that the user should get redirected to. Query strings and fragments are supported, such as %example_url. You may enter tokens in this field.', [
-        '%example_url' => 'http://www.example.com/?query=value#fragment',
-      ]),
+      '#description' => $this->t('Enter the relative path or the full URL that the user should get redirected to. Query strings and fragments are supported, such as %example_url. You may enter tokens in this field.',
+        ['%example_url' => 'http://www.example.com/?query=value#fragment']),
       '#default_value' => $this->path,
     ];
     $form['redirect']['redirect_response'] = [
diff --git a/src/Plugin/RabbitHoleBehaviorBase.php b/src/Plugin/RabbitHoleBehaviorPluginBase.php
similarity index 51%
rename from src/Plugin/RabbitHoleBehaviorBase.php
rename to src/Plugin/RabbitHoleBehaviorPluginBase.php
index 7c1844d..ce5b771 100644
--- a/src/Plugin/RabbitHoleBehaviorBase.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginBase.php
@@ -1,18 +1,17 @@
 <?php
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorBase.
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginBase.
  */
 
 namespace Drupal\rabbit_hole\Plugin;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorInterface;
 
 /**
- * Base class for Rabbit hole Behavior plugins.
+ * Base class for Rabbit hole behavior plugin plugins.
  */
-abstract class RabbitHoleBehaviorBase extends PluginBase implements RabbitHoleBehaviorInterface {
+abstract class RabbitHoleBehaviorPluginBase extends PluginBase implements RabbitHoleBehaviorPluginInterface {
 
   /**
    * {@inheritdoc}
@@ -25,7 +24,7 @@ abstract class RabbitHoleBehaviorBase extends PluginBase implements RabbitHoleBe
    * {@inheritdoc}
    */
   public function settingsForm(&$form, &$form_state, $form_id) {
-    // Add no settings.
+    // Present no settings form.
   }
 
 }
diff --git a/src/Plugin/RabbitHoleBehaviorInterface.php b/src/Plugin/RabbitHoleBehaviorPluginInterface.php
similarity index 50%
rename from src/Plugin/RabbitHoleBehaviorInterface.php
rename to src/Plugin/RabbitHoleBehaviorPluginInterface.php
index 24c7b88..20dc525 100644
--- a/src/Plugin/RabbitHoleBehaviorInterface.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorInterface.
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginInterface.
  */
 
 namespace Drupal\rabbit_hole\Plugin;
@@ -10,24 +10,24 @@ namespace Drupal\rabbit_hole\Plugin;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 
 /**
- * Defines an interface for Rabbit hole Behavior plugins.
+ * Defines an interface for Rabbit hole behavior plugin plugins.
  */
-interface RabbitHoleBehaviorInterface extends PluginInspectionInterface {
+interface RabbitHoleBehaviorPluginInterface extends PluginInspectionInterface {
 
   /**
-   * Perform this behavior.
+   * Perform the rabbit hole action.
    */
   public function performAction();
 
   /**
-   * Prompt for settings related to this behavior.
+   * Return a settings form for the rabbit hole action.
    *
    * @param array &$form
    *   The form array to modify.
    * @param array &$form_state
-   *   The form state array.
+   *   The form state array to modify.
    * @param string $form_id
-   *   The ID of the form being modified.
+   *   The form ID.
    */
   public function settingsForm(&$form, &$form_state, $form_id);
 
diff --git a/src/Plugin/RabbitHoleBehaviorManager.php b/src/Plugin/RabbitHoleBehaviorPluginManager.php
similarity index 55%
rename from src/Plugin/RabbitHoleBehaviorManager.php
rename to src/Plugin/RabbitHoleBehaviorPluginManager.php
index 34738f9..333b71c 100644
--- a/src/Plugin/RabbitHoleBehaviorManager.php
+++ b/src/Plugin/RabbitHoleBehaviorPluginManager.php
@@ -1,8 +1,7 @@
 <?php
-
 /**
  * @file
- * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorManager.
+ * Contains \Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager.
  */
 
 namespace Drupal\rabbit_hole\Plugin;
@@ -12,12 +11,12 @@ use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 
 /**
- * Provides the Rabbit hole Behavior plugin manager.
+ * Provides the Rabbit hole behavior plugin plugin manager.
  */
-class RabbitHoleBehaviorManager extends DefaultPluginManager {
+class RabbitHoleBehaviorPluginManager extends DefaultPluginManager {
 
   /**
-   * Constructor for RabbitHoleBehaviorManager objects.
+   * Constructor for RabbitHoleBehaviorPluginManager objects.
    *
    * @param \Traversable $namespaces
    *   An object that implements \Traversable which contains the root paths
@@ -28,10 +27,10 @@ class RabbitHoleBehaviorManager extends DefaultPluginManager {
    *   The module handler to invoke the alter hook with.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/RabbitHoleBehavior', $namespaces, $module_handler, 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorInterface', 'Drupal\rabbit_hole\Annotation\RabbitHoleBehavior');
+    parent::__construct('Plugin/RabbitHoleBehaviorPlugin', $namespaces, $module_handler, 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginInterface', 'Drupal\rabbit_hole\Annotation\RabbitHoleBehaviorPlugin');
 
-    $this->alterInfo('rabbit_hole_behavior_info');
-    $this->setCacheBackend($cache_backend, 'rabbit_hole_behavior_plugins');
+    $this->alterInfo('rabbit_hole_rabbit_hole_behavior_plugin_info');
+    $this->setCacheBackend($cache_backend, 'rabbit_hole_rabbit_hole_behavior_plugin_plugins');
   }
 
 }
diff --git a/src/Tests/RabbitHoleBehaviorPluginTest.php b/src/Tests/RabbitHoleBehaviorPluginTest.php
index 3d32cfd..13c3ab3 100644
--- a/src/Tests/RabbitHoleBehaviorPluginTest.php
+++ b/src/Tests/RabbitHoleBehaviorPluginTest.php
@@ -6,28 +6,21 @@
 
 namespace Drupal\rabbit_hole\Tests;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\system\Tests\Plugin\PluginTestBase;
 
 /**
  * Test the functionality of the RabbitHoleBehavior plugin.
  *
  * @group rabbit_hole
  */
-class RabbitHoleBehaviorPluginTest extends WebTestBase {
+class RabbitHoleBehaviorPluginTest extends PluginTestBase {
 
   /**
    * Modules to enable.
    *
    * @var array
    */
-  public static $modules = ['rabbit_hole'];
-
-  /**
-   * The installation profile to use with this test.
-   *
-   * @var string
-   */
-  protected $profile = 'minimal';
+  public static $modules = array('rabbit_hole');
 
   /**
    * The plugin manager.
@@ -39,11 +32,9 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp() {
     parent::setUp();
-
-    // Set up the plugin manager.
-    $this->manager = \Drupal::service('plugin.manager.rabbit_hole_behavior');
+    $this->manager = $this->container->get('plugin.manager.rabbit_hole_behavior_plugin');
   }
 
   /**
@@ -54,7 +45,7 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
     $this->assertNotNull($this->manager, 'Drupal plugin service returned a rabbit hole behavior service.');
 
     // Check that the behavior plugin manager is the type we expect.
-    $this->assertEqual(get_class($this->manager), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorManager');
+    $this->assertEqual(get_class($this->manager), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPluginManager');
 
     // Check the rabbit_hole module defines the expected number of behaviors.
     $behaviors = $this->manager->getDefinitions();
@@ -78,7 +69,7 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
   public function testAccessDeniedPlugin() {
     // Check we can create an instance of the plugin.
     $plugin = $this->manager->createInstance('access_denied', ['of' => 'configuration values']);
-    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\AccessDenied', 'The access denied plugin is the correct type.');
+    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\AccessDenied', 'The access denied plugin is the correct type.');
 
     // Test the settings form.
     $form = $form_state = [];
@@ -97,7 +88,7 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
   public function testDisplayPagePlugin() {
     // Check we can create an instance of the plugin.
     $plugin = $this->manager->createInstance('display_page', ['of' => 'configuration values']);
-    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\DisplayPage', 'The display page plugin is the correct type.');
+    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\DisplayPage', 'The display page plugin is the correct type.');
 
     // Test the settings form.
     $form = $form_state = [];
@@ -108,7 +99,6 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
     // Check that the plugin performs the expected action.
     // TODO: Check that $plugin->performAction() throws nothing and returns
     // nothing.
-
   }
 
   /**
@@ -117,7 +107,7 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
   public function testPageNotFoundPlugin() {
     // Check we can create an instance of the plugin.
     $plugin = $this->manager->createInstance('page_not_found', ['of' => 'configuration values']);
-    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\PageNotFound', 'The page not found plugin is the correct type.');
+    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageNotFound', 'The page not found plugin is the correct type.');
 
     // Test the settings form.
     $form = $form_state = [];
@@ -136,7 +126,7 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
   public function testPageRedirectPlugin() {
     // Check we can create an instance of the plugin.
     $plugin = $this->manager->createInstance('page_redirect', ['of' => 'configuration values']);
-    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehavior\PageRedirect', 'The page redirect plugin is the correct type.');
+    $this->assertEqual(get_class($plugin), 'Drupal\rabbit_hole\Plugin\RabbitHoleBehaviorPlugin\PageRedirect', 'The page redirect plugin is the correct type.');
 
     // Test the settings form.
     $form = $form_state = [];
@@ -148,4 +138,5 @@ class RabbitHoleBehaviorPluginTest extends WebTestBase {
     // TODO: Check that $plugin->performAction() does what it's supposed to,
     // whatever that is.
   }
+
 }