diff --git a/README.txt b/README.txt
index 34224b7..0ba7be7 100644
--- a/README.txt
+++ b/README.txt
@@ -20,7 +20,7 @@
  * * Watchdog
  * * Cron execution
  * * Content and User activity
- * Sensor interface that can be easily implemented to provide custom sensors.
+ * SensorPluginInterface that can be easily implemented to provide custom sensor plugins.
  * Integration with Munin.
  * Integration with Icinga/Nagios
 
@@ -50,6 +50,6 @@
  variable, for example in settings.php. This allows to enforce environment
  specific settings, like disabling a certain sensor.
 
- $conf['monitoring_sensor_info']['name_of_the_sensor']['settings']['enabled'] = FALSE;
+ @todo needs documentation with config overrides.
 
  Anything defined through the hook can be overridden.
diff --git a/config/schema/monitoring.schema.yml b/config/schema/monitoring.schema.yml
index f6910fa..615b460 100644
--- a/config/schema/monitoring.schema.yml
+++ b/config/schema/monitoring.schema.yml
@@ -18,7 +18,7 @@ monitoring.sensor_config.*:
       label: 'Category'
     sensor_id:
       type: string
-      label: 'Sensor ID'
+      label: 'Sensor plugin ID'
     result_class:
       type: string
       label: 'Result Class'
diff --git a/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml b/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
index 62c7f63..c85868d 100644
--- a/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
+++ b/modules/test/config/install/monitoring.sensor_config.test_sensor_info.yml
@@ -5,4 +5,3 @@ sensor_id: test_sensor
 value_type: 'number'
 value_label: 'Test label'
 settings:
-
diff --git a/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php b/modules/test/src/Plugin/monitoring/SensorPlugin/TestSensorPlugin.php
similarity index 85%
rename from modules/test/src/Plugin/monitoring/Sensor/TestSensor.php
rename to modules/test/src/Plugin/monitoring/SensorPlugin/TestSensorPlugin.php
index 00b3a97..a6106c3 100644
--- a/modules/test/src/Plugin/monitoring/Sensor/TestSensor.php
+++ b/modules/test/src/Plugin/monitoring/SensorPlugin/TestSensorPlugin.php
@@ -1,28 +1,28 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring_test\Plugin\monitoring\Sensor\TestSensor.
+ * Contains \Drupal\monitoring_test\Plugin\monitoring\SensorPlugin\TestSensorPlugin.
  */
 
-namespace Drupal\monitoring_test\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring_test\Plugin\monitoring\SensorPlugin;
 
-use Drupal\monitoring\Sensor\SensorExtendedInfoInterface;
+use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
 use Drupal\monitoring\Entity\SensorConfig;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
+use Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase;
 
 /**
  * Test sensor to report status as provided by external arguments.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "test_sensor",
- *   label = @Translation("Test Sensor"),
+ *   label = @Translation("Test SensorPlugin"),
  *   description = @Translation("Test sensor to report status as provided by external arguments."),
  *   addable = TRUE
  * )
  *
  */
-class TestSensor extends ThresholdsSensorBase implements SensorExtendedInfoInterface {
+class TestSensorPlugin extends ThresholdsSensorPluginBase implements ExtendedInfoSensorPluginInterface {
 
   protected $testSensorResultData;
 
diff --git a/src/Annotation/Sensor.php b/src/Annotation/SensorPlugin.php
similarity index 79%
rename from src/Annotation/Sensor.php
rename to src/Annotation/SensorPlugin.php
index 19e8660..f09637d 100644
--- a/src/Annotation/Sensor.php
+++ b/src/Annotation/SensorPlugin.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\monitoring\Annotation\Sensor.
+ * Contains \Drupal\monitoring\Annotation\SensorPlugin.
  */
 
 namespace Drupal\monitoring\Annotation;
@@ -10,11 +10,11 @@ namespace Drupal\monitoring\Annotation;
 use Drupal\Component\Annotation\Plugin;
 
 /**
- * Defines Sensor annotation object for reference by Sensor Plugins.
+ * Defines SensorPlugin annotation object for reference by SensorPlugin Plugins.
  *
  * @Annotation
  */
-class Sensor extends Plugin {
+class SensorPlugin extends Plugin {
 
    /**
    * The plugin ID.
diff --git a/src/Controller/ConfigAutocompleteController.php b/src/Controller/ConfigAutocompleteController.php
index 4b87343..3e500b6 100644
--- a/src/Controller/ConfigAutocompleteController.php
+++ b/src/Controller/ConfigAutocompleteController.php
@@ -14,12 +14,12 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Returns autocomplete responses for config.
+ * Returns auto complete responses for config.
  */
 class ConfigAutocompleteController {
 
   /**
-   * Retrieves suggestions for config autocompletion.
+   * Retrieves suggestions for config auto completion.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The current request.
diff --git a/src/Entity/SensorConfig.php b/src/Entity/SensorConfig.php
index 93bc990..3f175b6 100644
--- a/src/Entity/SensorConfig.php
+++ b/src/Entity/SensorConfig.php
@@ -14,6 +14,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
  * Represents a sensor config entity class.
  *
  * @todo more
+ *
  * @ConfigEntityType(
  *   id = "monitoring_sensor_config",
  *   label = @Translation("Monitoring Sensor"),
@@ -121,11 +122,11 @@ class SensorConfig extends ConfigEntityBase {
   public $status = TRUE;
 
   /**
-   * The sensor ID.
+   * Gets Sensor ID.
    *
-   * @var string
+   * @return string
+   *   Sensor ID.
    */
-
   public function getName() {
     return $this->id;
   }
@@ -155,10 +156,10 @@ class SensorConfig extends ConfigEntityBase {
   }
 
   /**
-   * Gets sensor class.
+   * Gets sensor plugin class.
    *
    * @return string
-   *   Sensor class
+   *   SensorPlugin class
    */
   public function getSensorClass() {
     $definition = monitoring_sensor_manager()->getDefinition($this->sensor_id);
@@ -168,13 +169,13 @@ class SensorConfig extends ConfigEntityBase {
   /**
    * Gets the sensor plugin.
    *
-   * @return \Drupal\monitoring\Sensor\SensorInterface
+   * @return \Drupal\monitoring\SensorPlugin\SensorPluginInterface
    *   Instantiated sensor.
    */
   public function getPlugin() {
     $configuration = array('sensor_info' => $this);
-    $sensor = monitoring_sensor_manager()->createInstance($this->sensor_id, $configuration);
-    return $sensor;
+    $plugin = monitoring_sensor_manager()->createInstance($this->sensor_id, $configuration);
+    return $plugin;
   }
 
   /**
@@ -341,7 +342,7 @@ class SensorConfig extends ConfigEntityBase {
    * @return bool
    */
   public function isExtendedInfo() {
-    return in_array('Drupal\monitoring\Sensor\SensorExtendedInfoInterface', class_implements($this->getSensorClass()));
+    return in_array('Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface', class_implements($this->getSensorClass()));
   }
 
   /**
@@ -350,7 +351,7 @@ class SensorConfig extends ConfigEntityBase {
    * @return bool
    */
   public function isDefiningThresholds() {
-    return in_array('Drupal\monitoring\Sensor\ThresholdsSensorInterface', class_implements($this->getSensorClass()));
+    return in_array('Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginInterface', class_implements($this->getSensorClass()));
   }
 
   /**
@@ -383,6 +384,10 @@ class SensorConfig extends ConfigEntityBase {
    * {@inheritdoc}
    */
   public static function sort(ConfigEntityInterface $a, ConfigEntityInterface $b) {
+    /**
+     * @var SensorConfig $a
+     * @var SensorConfig $b
+     */
     // Checks whether both labels and categories are equal.
     if ($a->getLabel() == $b->getLabel() && $a->getCategory() == $b->getCategory()) {
       return 0;
diff --git a/src/Entity/SensorResultEntity.php b/src/Entity/SensorResultEntity.php
index 0e7d5fb..f206503 100644
--- a/src/Entity/SensorResultEntity.php
+++ b/src/Entity/SensorResultEntity.php
@@ -7,7 +7,6 @@
 namespace Drupal\monitoring\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 
diff --git a/src/Form/SensorForm.php b/src/Form/SensorForm.php
index 28ae259..f0dd44f 100644
--- a/src/Form/SensorForm.php
+++ b/src/Form/SensorForm.php
@@ -10,8 +10,8 @@ use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\monitoring\Entity\SensorConfig;
-use Drupal\monitoring\Sensor\SensorBase;
-use Drupal\monitoring\Sensor\SensorInterface;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
+use Drupal\monitoring\SensorPlugin\SensorPluginInterface;
 
 /**
  * Sensor settings form controller.
@@ -121,6 +121,7 @@ class SensorForm extends EntityForm {
       );
     }
 
+    $value_types = [];
     foreach (monitoring_value_types() as $value_type => $info) {
       $value_types[$value_type] = $info['label'];
     }
@@ -141,8 +142,7 @@ class SensorForm extends EntityForm {
       '#default_value' => $sensor_config->status(),
     );
 
-    if (isset($sensor_config->sensor_id) && $sensor = $sensor_config->getPlugin()) {
-      /** @var SensorBase $sensor */
+    if (isset($sensor_config->sensor_id) && $plugin = $sensor_config->getPlugin()) {
       $form['settings'] = array(
         '#type' => 'details',
         '#open' => TRUE,
@@ -150,7 +150,7 @@ class SensorForm extends EntityForm {
         '#prefix' => '<div id="monitoring-sensor-plugin">',
         '#suffix' => '</div>',
       );
-      $form['settings'] += (array) $sensor->buildConfigurationForm($form['settings'], $form_state);
+      $form['settings'] += (array) $plugin->buildConfigurationForm($form['settings'], $form_state);
     }
     else {
       // Placeholder for ajax settings.
@@ -200,16 +200,16 @@ class SensorForm extends EntityForm {
 
     /* @var SensorConfig $sensor_config */
     $sensor_config = $this->entity;
-    /** @var SensorInterface $sensor */
+    /** @var SensorPluginInterface $plugin */
     if ($sensor_config->isNew()) {
       $plugin = $form_state->getValue('sensor_id');
-      $sensor = monitoring_sensor_manager()->createInstance($plugin, array('sensor_info' => $this->entity));
+      $plugin = monitoring_sensor_manager()->createInstance($plugin, array('sensor_info' => $this->entity));
     }
     else {
-      $sensor = $sensor_config->getPlugin();
+      $plugin = $sensor_config->getPlugin();
     }
 
-    $sensor->validateConfigurationForm($form, $form_state);
+    $plugin->validateConfigurationForm($form, $form_state);
   }
 
   /**
@@ -220,10 +220,9 @@ class SensorForm extends EntityForm {
 
     /** @var SensorConfig $sensor_config */
     $sensor_config = $this->entity;
-    /** @var SensorInterface $sensor */
-    $sensor = $sensor_config->getPlugin();
+    $plugin = $sensor_config->getPlugin();
 
-    $sensor->submitConfigurationForm($form, $form_state);
+    $plugin->submitConfigurationForm($form, $form_state);
   }
 
   /**
diff --git a/src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
similarity index 93%
rename from src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php
rename to src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
index 89d58c6..936c02c 100644
--- a/src/Plugin/monitoring/Sensor/CommerceTurnoverSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/CommerceTurnoverSensorPlugin.php
@@ -1,10 +1,11 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\CommerceTurnoverSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\CommerceTurnoverSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
+
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
 
@@ -13,7 +14,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  *
  * Based on SensorEntityDatabaseAggregator using commerce_order table.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "commerce_turnover",
  *   label = @Translation("Commerce order turnover"),
  *   description = @Translation("Monitors how much money was earned with commerce orders."),
@@ -22,7 +23,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  * )
  *
  */
-class CommerceTurnoverSensor extends EntityAggregatorSensor {
+class CommerceTurnoverSensorPlugin extends EntityAggregatorSensorPlugin {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/ConfigValueSensor.php b/src/Plugin/monitoring/SensorPlugin/ConfigValueSensorPlugin.php
similarity index 87%
rename from src/Plugin/monitoring/Sensor/ConfigValueSensor.php
rename to src/Plugin/monitoring/SensorPlugin/ConfigValueSensorPlugin.php
index 54c7b76..f415452 100644
--- a/src/Plugin/monitoring/Sensor/ConfigValueSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/ConfigValueSensorPlugin.php
@@ -2,25 +2,25 @@
 
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\ConfigValueSensor
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\ConfigValueSensorPlugin
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\monitoring\Sensor\ValueComparisonSensorBase;
+use Drupal\monitoring\SensorPlugin\ValueComparisonSensorPluginBase;
 
 /**
  * Generic sensor that checks for a configuration value.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "config_value",
  *   label = @Translation("Config Value"),
  *   description = @Translation("Checks for a specific configuration value."),
  *   addable = TRUE
  * )
  */
-class ConfigValueSensor extends ValueComparisonSensorBase {
+class ConfigValueSensorPlugin extends ValueComparisonSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/CoreRequirementsSensor.php b/src/Plugin/monitoring/SensorPlugin/CoreRequirementsSensorPlugin.php
similarity index 93%
rename from src/Plugin/monitoring/Sensor/CoreRequirementsSensor.php
rename to src/Plugin/monitoring/SensorPlugin/CoreRequirementsSensorPlugin.php
index 9afbddf..dafb893 100644
--- a/src/Plugin/monitoring/Sensor/CoreRequirementsSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/CoreRequirementsSensorPlugin.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\CoreRequirementsSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\CoreRequirementsSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Component\Utility\String;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorBase;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
 use Drupal\Core\Entity\DependencyTrait;
 
 /**
  * Monitors a specific module hook_requirements.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "core_requirements",
  *   label = @Translation("Core Requirements"),
  *   description = @Translation("Monitors a specific module hook_requirements."),
@@ -23,7 +23,7 @@ use Drupal\Core\Entity\DependencyTrait;
  *
  * @todo Shorten sensor message and add improved verbose output.
  */
-class CoreRequirementsSensor extends SensorBase {
+class CoreRequirementsSensorPlugin extends SensorPluginBase {
 
   use DependencyTrait;
 
diff --git a/src/Plugin/monitoring/Sensor/CronLastRunAgeSensor.php b/src/Plugin/monitoring/SensorPlugin/CronLastRunAgeSensorPlugin.php
similarity index 70%
rename from src/Plugin/monitoring/Sensor/CronLastRunAgeSensor.php
rename to src/Plugin/monitoring/SensorPlugin/CronLastRunAgeSensorPlugin.php
index f59d902..a33951c 100644
--- a/src/Plugin/monitoring/Sensor/CronLastRunAgeSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/CronLastRunAgeSensorPlugin.php
@@ -1,19 +1,19 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\CronLastRunAgeSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\CronLastRunAgeSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
+use Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase;
 use Drupal\monitoring\Result\SensorResultInterface;
 use Drupal;
 
 /**
  * Monitors the last cron run time.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "cron_last_run_time",
  *   label = @Translation("Cron Last Run Age"),
  *   description = @Translation("Monitors the last cron run time."),
@@ -22,7 +22,7 @@ use Drupal;
  *
  * Based on the drupal core system state cron_last.
  */
-class CronLastRunAgeSensor extends ThresholdsSensorBase {
+class CronLastRunAgeSensorPlugin extends ThresholdsSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/DatabaseAggregatorSensor.php b/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
similarity index 90%
rename from src/Plugin/monitoring/Sensor/DatabaseAggregatorSensor.php
rename to src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
index 5b506c0..523e224 100644
--- a/src/Plugin/monitoring/Sensor/DatabaseAggregatorSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
@@ -1,22 +1,22 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\DatabaseAggregatorSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\DatabaseAggregatorSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorExtendedInfoInterface;
-use Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase;
+use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
+use Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase;
 use Drupal\Core\Entity\DependencyTrait;
 
 /**
  * Simple database aggregator able to query a single db table.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "database_aggregator",
  *   label = @Translation("Simple Database Aggregator"),
  *   description = @Translation("Simple database aggregator able to query a single db table."),
@@ -24,7 +24,7 @@ use Drupal\Core\Entity\DependencyTrait;
  * )
  *
  */
-class DatabaseAggregatorSensor extends DatabaseAggregatorSensorBase implements SensorExtendedInfoInterface {
+class DatabaseAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase implements ExtendedInfoSensorPluginInterface {
 
   use DependencyTrait;
 
diff --git a/src/Plugin/monitoring/Sensor/Dblog404Sensor.php b/src/Plugin/monitoring/SensorPlugin/Dblog404SensorPlugin.php
similarity index 81%
rename from src/Plugin/monitoring/Sensor/Dblog404Sensor.php
rename to src/Plugin/monitoring/SensorPlugin/Dblog404SensorPlugin.php
index 45ca09b..daed921 100644
--- a/src/Plugin/monitoring/Sensor/Dblog404Sensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/Dblog404SensorPlugin.php
@@ -1,17 +1,17 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\Dblog404Sensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\Dblog404SensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
 
 /**
  * Monitors 404 page errors from dblog.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "dblog_404",
  *   provider = "dblog",
  *   label = @Translation("404 page errors (database log)"),
@@ -21,7 +21,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  *
  * Displays URL with highest occurrence as message.
  */
-class Dblog404Sensor extends DatabaseAggregatorSensor {
+class Dblog404SensorPlugin extends DatabaseAggregatorSensorPlugin {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/DisappearedSensorsSensor.php b/src/Plugin/monitoring/SensorPlugin/DisappearedSensorsSensorPlugin.php
similarity index 95%
rename from src/Plugin/monitoring/Sensor/DisappearedSensorsSensor.php
rename to src/Plugin/monitoring/SensorPlugin/DisappearedSensorsSensorPlugin.php
index 175a454..9831ec7 100644
--- a/src/Plugin/monitoring/Sensor/DisappearedSensorsSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/DisappearedSensorsSensorPlugin.php
@@ -1,19 +1,19 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\DisappearedSensorsSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\DisappearedSensorsSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorBase;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
 
 /**
  * Monitors if sensors disappeared without prior being disabled.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "monitoring_disappeared_sensors",
  *   label = @Translation("Disappeared Sensors"),
  *   description = @Translation("Monitors if sensors disappeared without prior being disabled."),
@@ -24,7 +24,7 @@ use Drupal\monitoring\Sensor\SensorBase;
  * and compares it to the current sensor config retrieved via
  * monitoring_sensor_config() callback.
  */
-class DisappearedSensorsSensor extends SensorBase {
+class DisappearedSensorsSensorPlugin extends SensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/ElysiaCronSensor.php b/src/Plugin/monitoring/SensorPlugin/ElysiaCronSensorPlugin.php
similarity index 80%
rename from src/Plugin/monitoring/Sensor/ElysiaCronSensor.php
rename to src/Plugin/monitoring/SensorPlugin/ElysiaCronSensorPlugin.php
index 052fcd7..85f9643 100644
--- a/src/Plugin/monitoring/Sensor/ElysiaCronSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/ElysiaCronSensorPlugin.php
@@ -1,18 +1,18 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\ElysiaCronSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\ElysiaCronSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
+use Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase;
 
 /**
  * Monitors elysia cron channels for last execution.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "elysia_cron",
  *   label = @Translation("Elysia Cron"),
  *   description = @Translation("Monitors elysia cron channels for last execution."),
@@ -21,7 +21,7 @@ use Drupal\monitoring\Sensor\ThresholdsSensorBase;
  * )
  *
  */
-class ElysiaCronSensor extends ThresholdsSensorBase {
+class ElysiaCronSensorPlugin extends ThresholdsSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/EnabledModulesSensor.php b/src/Plugin/monitoring/SensorPlugin/EnabledModulesSensorPlugin.php
similarity index 96%
rename from src/Plugin/monitoring/Sensor/EnabledModulesSensor.php
rename to src/Plugin/monitoring/SensorPlugin/EnabledModulesSensorPlugin.php
index 05be6d3..24060ab 100644
--- a/src/Plugin/monitoring/Sensor/EnabledModulesSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/EnabledModulesSensorPlugin.php
@@ -1,21 +1,21 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\EnabledModulesSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\EnabledModulesSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Component\Utility\String;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorBase;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
 use Drupal;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Monitors installed modules.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "monitoring_enabled_modules",
  *   label = @Translation("Enabled Modules"),
  *   description = @Translation("Monitors installed modules."),
@@ -23,8 +23,7 @@ use Drupal\Core\Form\FormStateInterface;
  * )
  *
  */
-class EnabledModulesSensor extends SensorBase {
-
+class EnabledModulesSensorPlugin extends SensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/EntityAggregatorSensor.php b/src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php
similarity index 94%
rename from src/Plugin/monitoring/Sensor/EntityAggregatorSensor.php
rename to src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php
index 12ff770..fdd3e6c 100644
--- a/src/Plugin/monitoring/Sensor/EntityAggregatorSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/EntityAggregatorSensorPlugin.php
@@ -1,16 +1,16 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\EntityAggregatorSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\EntityAggregatorSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorExtendedInfoInterface;
-use Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase;
+use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
+use Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -23,14 +23,14 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *
  * It utilises the entity query aggregate functionality.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "entity_aggregator",
  *   label = @Translation("Entity Aggregator"),
  *   description = @Translation("Utilises the entity query aggregate functionality."),
  *   addable = TRUE
  * )
  */
-class EntityAggregatorSensor extends DatabaseAggregatorSensorBase implements SensorExtendedInfoInterface {
+class EntityAggregatorSensorPlugin extends DatabaseAggregatorSensorPluginBase implements ExtendedInfoSensorPluginInterface {
 
   use DependencySerializationTrait;
   use DependencyTrait;
diff --git a/src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php b/src/Plugin/monitoring/SensorPlugin/GitDirtyTreeSensorPlugin.php
similarity index 81%
rename from src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php
rename to src/Plugin/monitoring/SensorPlugin/GitDirtyTreeSensorPlugin.php
index c6e0d69..09c6b04 100644
--- a/src/Plugin/monitoring/Sensor/GitDirtyTreeSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/GitDirtyTreeSensorPlugin.php
@@ -1,19 +1,19 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\GitDirtyTreeSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\GitDirtyTreeSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorBase;
-use Drupal\monitoring\Sensor\SensorExtendedInfoInterface;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
+use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
 
 /**
  * Monitors the git repository for dirty files.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "monitoring_git_dirty_tree",
  *   label = @Translation("Git Dirty Tree"),
  *   description = @Translation("Monitors the git repository for dirty files."),
@@ -27,7 +27,7 @@ use Drupal\monitoring\Sensor\SensorExtendedInfoInterface;
  * - Does not work as long as submodules are not initialized.
  * - Does not check branch / tag.
  */
-class GitDirtyTreeSensor extends SensorBase implements SensorExtendedInfoInterface {
+class GitDirtyTreeSensorPlugin extends SensorPluginBase implements ExtendedInfoSensorPluginInterface {
 
   /**
    * The executed command output.
diff --git a/src/Plugin/monitoring/Sensor/ImageMissingStyleSensor.php b/src/Plugin/monitoring/SensorPlugin/ImageMissingStyleSensorPlugin.php
similarity index 90%
rename from src/Plugin/monitoring/Sensor/ImageMissingStyleSensor.php
rename to src/Plugin/monitoring/SensorPlugin/ImageMissingStyleSensorPlugin.php
index f62ad42..05c3fb3 100644
--- a/src/Plugin/monitoring/Sensor/ImageMissingStyleSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/ImageMissingStyleSensorPlugin.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\ImageMissingStyleSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\ImageMissingStyleSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
 use Drupal;
@@ -12,7 +12,7 @@ use Drupal;
 /**
  * Monitors image derivate creation errors from dblog.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "image_style_missing",
  *   label = @Translation("Image Missing Style"),
  *   description = @Translation("Monitors image derivate creation errors from database log."),
@@ -22,7 +22,7 @@ use Drupal;
  *
  * Displays image derivate with highest occurrence as message.
  */
-class ImageMissingStyleSensor extends DatabaseAggregatorSensor {
+class ImageMissingStyleSensorPlugin extends DatabaseAggregatorSensorPlugin {
 
   /**
    * The path of the most failed image.
diff --git a/src/Plugin/monitoring/Sensor/PaymentCountSensor.php b/src/Plugin/monitoring/SensorPlugin/PaymentCountSensorPlugin.php
similarity index 71%
rename from src/Plugin/monitoring/Sensor/PaymentCountSensor.php
rename to src/Plugin/monitoring/SensorPlugin/PaymentCountSensorPlugin.php
index f495286..b57b039 100644
--- a/src/Plugin/monitoring/Sensor/PaymentCountSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/PaymentCountSensorPlugin.php
@@ -1,25 +1,25 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\PaymentCountSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\PaymentCountSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase;
+use Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase;
 
 /**
  * Monitors payment count.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "payment_count",
  *   label = @Translation("Payment Count"),
  *   description = @Translation("Monitors the number of successful transactions for payments with effective date."),
  *   addable = TRUE
  * )
  */
-class PaymentCountSensor extends DatabaseAggregatorSensorBase {
+class PaymentCountSensorPlugin extends DatabaseAggregatorSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/PaymentTurnoverSensor.php b/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
similarity index 78%
rename from src/Plugin/monitoring/Sensor/PaymentTurnoverSensor.php
rename to src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
index 7bb87de..afabfc2 100644
--- a/src/Plugin/monitoring/Sensor/PaymentTurnoverSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/PaymentTurnoverSensorPlugin.php
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\SensorPaymentTurnover.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\SensorPaymentTurnover.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase;
+use Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase;
 
 /**
  * Monitors payment turnover stats.
@@ -15,14 +15,14 @@ use Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase;
  * A custom database query is used here instead of entity manager for
  * performance reasons.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "payment_turnover",
  *   label = @Translation("Payment Turnover"),
  *   description = @Translation("Monitors how much money was transferred for payments with effective date."),
  *   addable = TRUE
  * )
  */
-class PaymentTurnoverSensor extends DatabaseAggregatorSensorBase {
+class PaymentTurnoverSensorPlugin extends DatabaseAggregatorSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/QueueSizeSensor.php b/src/Plugin/monitoring/SensorPlugin/QueueSizeSensorPlugin.php
similarity index 80%
rename from src/Plugin/monitoring/Sensor/QueueSizeSensor.php
rename to src/Plugin/monitoring/SensorPlugin/QueueSizeSensorPlugin.php
index 9e48960..e15ec5b 100644
--- a/src/Plugin/monitoring/Sensor/QueueSizeSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/QueueSizeSensorPlugin.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\QueueSizeSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\QueueSizeSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
+use Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase;
 use Drupal;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Monitors number of items for a given core queue.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "queue_size",
  *   label = @Translation("Queue Size"),
  *   description = @Translation("Monitors number of items for a given core queue."),
@@ -26,7 +26,7 @@ use Drupal\Core\Form\FormStateInterface;
  *
  * @see \DrupalQueue
  */
-class QueueSizeSensor extends ThresholdsSensorBase {
+class QueueSizeSensorPlugin extends ThresholdsSensorPluginBase {
 
   /**
    * Adds UI to select Queue for the sensor.
diff --git a/src/Plugin/monitoring/Sensor/SearchApiUnindexedSensor.php b/src/Plugin/monitoring/SensorPlugin/SearchApiUnindexedSensorPlugin.php
similarity index 74%
rename from src/Plugin/monitoring/Sensor/SearchApiUnindexedSensor.php
rename to src/Plugin/monitoring/SensorPlugin/SearchApiUnindexedSensorPlugin.php
index e1f0d26..a3710ac 100644
--- a/src/Plugin/monitoring/Sensor/SearchApiUnindexedSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/SearchApiUnindexedSensorPlugin.php
@@ -1,19 +1,19 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\SearchApiUnindexedSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\SearchApiUnindexedSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
+use Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase;
 use Drupal\search_api\Entity\Index;
 
 /**
  * Monitors unindexed items for a search api index.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "search_api_unindexed",
  *   label = @Translation("Unindexed Search Items"),
  *   description = @Translation("Monitors unindexed items for a search api index."),
@@ -27,7 +27,7 @@ use Drupal\search_api\Entity\Index;
  *
  * @see search_api_index_status()
  */
-class SearchApiUnindexedSensor extends ThresholdsSensorBase {
+class SearchApiUnindexedSensorPlugin extends ThresholdsSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/StateValueSensor.php b/src/Plugin/monitoring/SensorPlugin/StateValueSensorPlugin.php
similarity index 76%
rename from src/Plugin/monitoring/Sensor/StateValueSensor.php
rename to src/Plugin/monitoring/SensorPlugin/StateValueSensorPlugin.php
index f2b4b7c..5bac9de 100644
--- a/src/Plugin/monitoring/Sensor/StateValueSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/StateValueSensorPlugin.php
@@ -2,24 +2,24 @@
 
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\StateValueSensor
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\StateValueSensorPlugin
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
-use Drupal\monitoring\Sensor\ValueComparisonSensorBase;
+use Drupal\monitoring\SensorPlugin\ValueComparisonSensorPluginBase;
 
 /**
  * Generic sensor that checks for a state value.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "state_value",
  *   label = @Translation("State Value"),
  *   description = @Translation("Checks for a specific state value."),
  *   addable = FALSE
  * )
  */
-class StateValueSensor extends ValueComparisonSensorBase {
+class StateValueSensorPlugin extends ValueComparisonSensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/UpdateStatusSensor.php b/src/Plugin/monitoring/SensorPlugin/UpdateStatusSensorPlugin.php
similarity index 94%
rename from src/Plugin/monitoring/Sensor/UpdateStatusSensor.php
rename to src/Plugin/monitoring/SensorPlugin/UpdateStatusSensorPlugin.php
index 1b616f5..2794bd3 100644
--- a/src/Plugin/monitoring/Sensor/UpdateStatusSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/UpdateStatusSensorPlugin.php
@@ -1,18 +1,18 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\UpdateStatusSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\UpdateStatusSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
-use Drupal\monitoring\Sensor\SensorBase;
+use Drupal\monitoring\SensorPlugin\SensorPluginBase;
 
 /**
  * Monitors for available updates of Drupal core and installed contrib modules.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "update_status",
  *   label = @Translation("Update status"),
  *   description = @Translation("Monitors for available updates of Drupal core and installed contrib modules."),
@@ -22,7 +22,7 @@ use Drupal\monitoring\Sensor\SensorBase;
  *
  * Based on drupal core update module.
  */
-class UpdateStatusSensor extends SensorBase {
+class UpdateStatusSensorPlugin extends SensorPluginBase {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/monitoring/Sensor/UserFailedLoginsSensor.php b/src/Plugin/monitoring/SensorPlugin/UserFailedLoginsSensorPlugin.php
similarity index 80%
rename from src/Plugin/monitoring/Sensor/UserFailedLoginsSensor.php
rename to src/Plugin/monitoring/SensorPlugin/UserFailedLoginsSensorPlugin.php
index cf620d1..3e550d5 100644
--- a/src/Plugin/monitoring/Sensor/UserFailedLoginsSensor.php
+++ b/src/Plugin/monitoring/SensorPlugin/UserFailedLoginsSensorPlugin.php
@@ -1,18 +1,17 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Plugin\monitoring\Sensor\UserFailedLoginsSensor.
+ * Contains \Drupal\monitoring\Plugin\monitoring\SensorPlugin\UserFailedLoginsSensorPlugin.
  */
 
-namespace Drupal\monitoring\Plugin\monitoring\Sensor;
+namespace Drupal\monitoring\Plugin\monitoring\SensorPlugin;
 
-use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
 
 /**
  * Monitors user failed login from dblog messages.
  *
- * @Sensor(
+ * @SensorPlugin(
  *   id = "user_failed_logins",
  *   label = @Translation("User Failed Logins"),
  *   description = @Translation("Monitors user failed login from dblog messages."),
@@ -21,7 +20,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  *
  * Helps to identify bots or brute force attacks.
  */
-class UserFailedLoginsSensor extends DatabaseAggregatorSensor {
+class UserFailedLoginsSensorPlugin extends DatabaseAggregatorSensorPlugin {
 
   /**
    * {@inheritdoc}
diff --git a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
index 05cf084..6a1a9ba 100644
--- a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\monitoring\Plugin\rest\resource\MonitoringSensorInfoResource.
+ * Definition of Drupal\monitoring\Plugin\rest\resource\MonitoringSensorResource.
  */
 
 namespace Drupal\monitoring\Plugin\rest\resource;
diff --git a/src/Result/SensorResult.php b/src/Result/SensorResult.php
index 10fbbb9..3a11aad 100644
--- a/src/Result/SensorResult.php
+++ b/src/Result/SensorResult.php
@@ -501,5 +501,4 @@ class SensorResult implements SensorResultInterface {
     return $this->verboseOutput;
   }
 
-
 }
diff --git a/src/Result/SensorResultInterface.php b/src/Result/SensorResultInterface.php
index 8cfb749..24f4486 100644
--- a/src/Result/SensorResultInterface.php
+++ b/src/Result/SensorResultInterface.php
@@ -120,7 +120,7 @@ interface SensorResultInterface {
    *
    * If the status is STATUS_UNKNOWN, this will attempt to set the status
    * based on expected value and threshold configurations. See
-   * \Drupal\monitoring\Sensor\SensorInterface::runSensor() for details.
+   * \Drupal\monitoring\SensorPlugin\SensorPluginInterface::runSensor() for details.
    *
    * @throws \Drupal\monitoring\Sensor\SensorCompilationException
    *   Thrown if an error occurs during the sensor result compilation.
@@ -187,7 +187,7 @@ interface SensorResultInterface {
    * Sets sensor execution time in ms.
    *
    * @param float $time
-   *   Sensor execution time in ms
+   *   Sensor execution time in ms.
    */
   public function setExecutionTime($time);
 
diff --git a/src/Sensor/SensorManager.php b/src/Sensor/SensorManager.php
index 86008a4..cb52d44 100644
--- a/src/Sensor/SensorManager.php
+++ b/src/Sensor/SensorManager.php
@@ -6,14 +6,13 @@
 
 namespace Drupal\monitoring\Sensor;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\monitoring\SensorRunner;
 use Drupal\Core\Plugin\DefaultPluginManager;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\monitoring\Entity\SensorConfig;
+use Drupal\monitoring\SensorPlugin\SensorPluginInterface;
 
 /**
  * Manages sensor definitions and settings.
@@ -56,7 +55,7 @@ class SensorManager extends DefaultPluginManager {
    *   The module handler to invoke the alter hook with.
    */
   function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, ConfigFactoryInterface $config) {
-    parent::__construct('Plugin/monitoring/Sensor', $namespaces, $module_handler, '\Drupal\monitoring\Sensor\SensorInterface', 'Drupal\monitoring\Annotation\Sensor');
+    parent::__construct('Plugin/monitoring/SensorPlugin', $namespaces, $module_handler, '\Drupal\monitoring\SensorPlugin\SensorPluginInterface', 'Drupal\monitoring\Annotation\SensorPlugin');
     $this->alterInfo('block');
     $this->setCacheBackend($cache_backend, 'monitoring_sensor_plugins');
     $this->config = $config;
@@ -66,13 +65,14 @@ class SensorManager extends DefaultPluginManager {
    * {@inheritdoc}
    */
   public function createInstance($plugin_id, array $configuration = array()) {
-    // Configuration contains sensor_info object. Extracting
+    // Configuration contains SensorConfig object. Extracting
     // it to use for sensor object creation.
     $sensor_config = $configuration['sensor_info'];
     $definition = $this->getDefinition($plugin_id);
-    // Sensor class from the sensor definition.
+    // SensorPlugin class from the sensor definition.
+    /** @var SensorPluginInterface $class */
     $class = $definition['class'];
-    // Creating instance of the sensor. Refer Sensor.php for arguments.
+    // Creating instance of the sensor. Refer SensorPlugin.php for arguments.
     return $class::create(\Drupal::getContainer(), $sensor_config, $plugin_id, $definition);
   }
 
@@ -137,7 +137,7 @@ class SensorManager extends DefaultPluginManager {
    * @param bool $enabled
    *   Sensor isEnabled flag.
    *
-   * @return \Drupal\monitoring\Entity\SensorConfig[]
+   * @return \Drupal\monitoring\Entity\SensorConfig[][]
    *   Sensor config.
    */
   public function getSensorConfigByCategories($enabled = TRUE) {
diff --git a/src/Sensor/DatabaseAggregatorSensorBase.php b/src/SensorPlugin/DatabaseAggregatorSensorPluginBase.php
similarity index 95%
rename from src/Sensor/DatabaseAggregatorSensorBase.php
rename to src/SensorPlugin/DatabaseAggregatorSensorPluginBase.php
index 57018c7..e10c7d7 100644
--- a/src/Sensor/DatabaseAggregatorSensorBase.php
+++ b/src/SensorPlugin/DatabaseAggregatorSensorPluginBase.php
@@ -1,15 +1,14 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\DatabaseAggregatorSensorBase.
+ * Contains \Drupal\monitoring\SensorPlugin\DatabaseAggregatorSensorPluginBase.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Entity\SensorConfig;
 use Drupal\monitoring\Form\SensorForm;
-use Drupal\monitoring\Sensor\ThresholdsSensorBase;
 
 /**
  * Base class for database aggregator sensors.
@@ -25,7 +24,7 @@ use Drupal\monitoring\Sensor\ThresholdsSensorBase;
  *
  * Adds time interval to sensor settings form.
  */
-abstract class DatabaseAggregatorSensorBase extends ThresholdsSensorBase {
+abstract class DatabaseAggregatorSensorPluginBase extends ThresholdsSensorPluginBase {
 
   /**
    * Gets conditions to be used in the select query.
diff --git a/src/Sensor/SensorExtendedInfoInterface.php b/src/SensorPlugin/ExtendedInfoSensorPluginInterface.php
similarity index 72%
rename from src/Sensor/SensorExtendedInfoInterface.php
rename to src/SensorPlugin/ExtendedInfoSensorPluginInterface.php
index 86e39e4..f2d24f7 100644
--- a/src/Sensor/SensorExtendedInfoInterface.php
+++ b/src/SensorPlugin/ExtendedInfoSensorPluginInterface.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Sensor Extended Info interface.
+ * Contains \Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\monitoring\Result\SensorResultInterface;
 
@@ -13,7 +13,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  *
  * Implemented by sensors with verbose information.
  */
-interface SensorExtendedInfoInterface {
+interface ExtendedInfoSensorPluginInterface {
 
   /**
    * Provide additional info about sensor call.
diff --git a/src/Sensor/SensorBase.php b/src/SensorPlugin/SensorPluginBase.php
similarity index 90%
rename from src/Sensor/SensorBase.php
rename to src/SensorPlugin/SensorPluginBase.php
index a81533a..5a283f7 100644
--- a/src/Sensor/SensorBase.php
+++ b/src/SensorPlugin/SensorPluginBase.php
@@ -1,23 +1,22 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\SensorBase.
+ * Contains \Drupal\monitoring\SensorPlugin\SensorPluginBase.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\monitoring\Entity\SensorConfig;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Abstract SensorInterface implementation with common behaviour and will be extended by
+ * Abstract SensorPluginInterface implementation with common behaviour and will be extended by
  * sensor plugins.
  *
  * @todo more
  */
-abstract class SensorBase implements SensorInterface {
+abstract class SensorPluginBase implements SensorPluginInterface {
 
   /**
    * Current sensor config object.
diff --git a/src/Sensor/SensorInterface.php b/src/SensorPlugin/SensorPluginInterface.php
similarity index 88%
rename from src/Sensor/SensorInterface.php
rename to src/SensorPlugin/SensorPluginInterface.php
index 2ee2b71..d763726 100644
--- a/src/Sensor/SensorInterface.php
+++ b/src/SensorPlugin/SensorPluginInterface.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\SensorInterface.
+ * Contains \Drupal\monitoring\SensorPlugin\SensorPluginInterface.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\monitoring\Entity\SensorConfig;
@@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  *
  * @todo more
  */
-interface SensorInterface extends PluginInspectionInterface, PluginFormInterface {
+interface SensorPluginInterface extends PluginInspectionInterface, PluginFormInterface {
 
   /**
    * Service setter.
@@ -57,9 +57,9 @@ interface SensorInterface extends PluginInspectionInterface, PluginFormInterface
    *  - Set the sensor status to critical, warning, ok, info or unknown with
    *    SensorResultInterface::setStatus(). Defaults to unknown.
    *  - Set the sensor value with SensorResultInterface::setValue(). This can
-   *    be a number or a string. Note that hook_monitoring_sensor_info()
-   *    defaults to numeric. If a sensor does not return a numeric result,
-   *    it must be defined accordingly.
+   *    be a number or a string. Note that value_type defaults to numeric.
+   *    If a sensor does not return a numeric result, it must be defined
+   *    accordingly.
    *  - Set the expected sensor value with SensorResultInterface::setExpectedValue().
    *    When doing so, it is not necessary to set the sensor status explicitly,
    *    as that will happen implicitly. See below.
@@ -77,17 +77,16 @@ interface SensorInterface extends PluginInspectionInterface, PluginFormInterface
    * Sensors with unknown status can either be set based on an expected value or
    * thresholds. If the value does not match the expected value, the status
    * is set to critical. Sensors that support thresholds should either subclass
-   * \Drupal\monitoring\Sensor\ThresholdsSensorBase or implement
-   * \Drupal\monitoring\ThresholdsSensorInterface and provide their own
-   * configuration form.
+   * \Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase or implement
+   * \Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginInterface and provide
+   * their own configuration form.
    *
    * The default sensor message will include information about the sensor value,
    * expected value, thresholds, the configured time interval and additional
    * status messages defined.
    * Provided value labels and value types will be considered for displaying the
-   * sensor value, see hook_monitoring_sensor_info() for their documentation. If
-   * neither value nor status messages are provided, the message will default to
-   * "No value".
+   * sensor value. If neither value nor status messages are provided, the
+   * message will default to "No value".
    *
    * Compiled message examples:
    *  - $90.00 in 1 day, expected $100.00.
diff --git a/src/Sensor/ThresholdsSensorBase.php b/src/SensorPlugin/ThresholdsSensorPluginBase.php
similarity index 96%
rename from src/Sensor/ThresholdsSensorBase.php
rename to src/SensorPlugin/ThresholdsSensorPluginBase.php
index 27ecf0c..1a76e46 100644
--- a/src/Sensor/ThresholdsSensorBase.php
+++ b/src/SensorPlugin/ThresholdsSensorPluginBase.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\ThresholdsSensorBase.
+ * Contains \Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginBase.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Abstract class providing configuration form for Sensor with thresholds.
+ * Abstract class with configuration form for Sensor plugins with thresholds.
  *
  * Sensors may provide thresholds that apply by default.
  * Threshold values are validated for sequence.
  */
-abstract class ThresholdsSensorBase extends SensorBase implements ThresholdsSensorInterface {
+abstract class ThresholdsSensorPluginBase extends SensorPluginBase implements ThresholdsSensorPluginInterface {
 
   /**
    * {@inheritdoc}
diff --git a/src/Sensor/ThresholdsSensorInterface.php b/src/SensorPlugin/ThresholdsSensorPluginInterface.php
similarity index 46%
rename from src/Sensor/ThresholdsSensorInterface.php
rename to src/SensorPlugin/ThresholdsSensorPluginInterface.php
index ea82c48..7a19e92 100644
--- a/src/Sensor/ThresholdsSensorInterface.php
+++ b/src/SensorPlugin/ThresholdsSensorPluginInterface.php
@@ -1,16 +1,16 @@
 <?php
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\SensorThresholdsInterface.
+ * Contains \Drupal\monitoring\SensorPlugin\ThresholdsSensorPluginInterface.
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 /**
  * Interface for a sensor with thresholds.
  *
  * Sensors implementing this interface can have thresholds.
  */
-interface ThresholdsSensorInterface {
+interface ThresholdsSensorPluginInterface {
 
 }
diff --git a/src/Sensor/ValueComparisonSensorBase.php b/src/SensorPlugin/ValueComparisonSensorPluginBase.php
similarity index 91%
rename from src/Sensor/ValueComparisonSensorBase.php
rename to src/SensorPlugin/ValueComparisonSensorPluginBase.php
index 9fe727e..a466175 100644
--- a/src/Sensor/ValueComparisonSensorBase.php
+++ b/src/SensorPlugin/ValueComparisonSensorPluginBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\monitoring\Sensor\ValueComparisonSensorBase
+ * Contains \Drupal\monitoring\SensorPlugin\ValueComparisonSensorPluginBase
  */
 
-namespace Drupal\monitoring\Sensor;
+namespace Drupal\monitoring\SensorPlugin;
 
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
@@ -17,7 +17,7 @@ use Drupal\monitoring\Result\SensorResultInterface;
  * value will be compared to. You can prepopulate this offset with initial
  * value that will be used as the expected one on the sensor enable.
  */
-abstract class ValueComparisonSensorBase extends SensorBase {
+abstract class ValueComparisonSensorPluginBase extends SensorPluginBase {
 
   /**
    * Gets the value description that will be shown in the settings form.
diff --git a/src/SensorRunner.php b/src/SensorRunner.php
index 057164a..7aa0c80 100644
--- a/src/SensorRunner.php
+++ b/src/SensorRunner.php
@@ -13,8 +13,8 @@ use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\monitoring\Result\SensorResultInterface;
 use Drupal\monitoring\Sensor\DisabledSensorException;
 use Drupal\monitoring\Entity\SensorConfig;
-use Drupal;
 use Drupal\monitoring\Sensor\SensorManager;
+use Drupal\monitoring\SensorPlugin\ExtendedInfoSensorPluginInterface;
 
 /**
  * Instantiate and run requested sensors.
@@ -103,7 +103,7 @@ class SensorRunner {
   }
 
   /**
-   * Runs the defined sensableors.
+   * Runs the defined sensors.
    *
    * @param \Drupal\monitoring\Entity\SensorConfig[] $sensors_config_all
    *   List of sensor config object that we want to run.
@@ -156,9 +156,9 @@ class SensorRunner {
    * @see \Drupal\monitoring\Sensor\SensorInterface::runSensor()
    */
   protected function runSensor(SensorConfig $sensor_config) {
-    $sensor = $sensor_config->getPlugin();
+    $plugin = $sensor_config->getPlugin();
     // Check if sensor is enabled.
-    if (!$sensor->isEnabled()) {
+    if (!$plugin->isEnabled()) {
       throw new DisabledSensorException(String::format('Sensor @sensor_name is not enabled and must not be run.', array('@sensor_name' => $sensor_config->getName())));
     }
 
@@ -168,7 +168,7 @@ class SensorRunner {
     if (!$result->isCached()) {
       Timer::start($sensor_config->getName());
       try {
-        $sensor->runSensor($result);
+        $plugin->runSensor($result);
       } catch (\Exception $e) {
         // In case the sensor execution results in an exception, mark it as
         // critical and set the sensor status message.
@@ -185,7 +185,8 @@ class SensorRunner {
 
       // Capture verbose output if requested and if we are able to do so.
       if ($this->verbose && $sensor_config->isExtendedInfo()) {
-        $result->setVerboseOutput($sensor->resultVerbose($result));
+        /** @var ExtendedInfoSensorPluginInterface $plugin */
+        $result->setVerboseOutput($plugin->resultVerbose($result));
       }
 
       try {
@@ -197,7 +198,6 @@ class SensorRunner {
       }
     }
 
-
     return $result;
   }
 
@@ -243,7 +243,6 @@ class SensorRunner {
   protected function needsLogging($result, $old_status = NULL, $new_status = NULL) {
     $log_activity = $result->getSensorConfig()->getSetting('result_logging', FALSE);
 
-
     // We log if requested or on status change.
     if ($this->config->get('sensor_call_logging') == 'on_request') {
       return $log_activity || ($old_status != $new_status);
diff --git a/src/Tests/MonitoringApiTest.php b/src/Tests/MonitoringApiTest.php
index f928eec..496ce21 100644
--- a/src/Tests/MonitoringApiTest.php
+++ b/src/Tests/MonitoringApiTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \MonitoringApiTest.
+ * Contains \Drupal\monitoring\Tests\MonitoringApiTest.
  */
 
 namespace Drupal\monitoring\Tests;
@@ -78,7 +78,6 @@ class MonitoringApiTest extends MonitoringUnitTestBase {
     // Test value type without value label.
     $sensor_config->value_type = 'bool';
     $sensor_config->save();
-    $value_types = monitoring_value_types();
     $this->assertEqual($sensor_config->getValueLabel(), NULL);
     $this->assertFalse($sensor_config->isNumeric());
     $this->assertTrue($sensor_config->isBool());
diff --git a/src/Tests/MonitoringCoreTest.php b/src/Tests/MonitoringCoreTest.php
index 16dff98..6232b5f 100644
--- a/src/Tests/MonitoringCoreTest.php
+++ b/src/Tests/MonitoringCoreTest.php
@@ -1,9 +1,10 @@
 <?php
 /**
  * @file
- * Contains \MonitoringCoreTest.
+ * Contains \Drupal\monitoring\Tests\MonitoringCoreTest.
  */
 namespace Drupal\monitoring\Tests;
+
 use Drupal\Component\Utility\String;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -37,7 +38,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
    */
   public function testSensors() {
 
-    // ======= CronLastRunAgeSensor tests ======= //
+    // ======= CronLastRunAgeSensorPlugin tests ======= //
 
     $time_shift = (60 * 60 * 24 + 1);
     \Drupal::state()->set('system.cron_last', REQUEST_TIME - $time_shift);
@@ -94,7 +95,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     $result = $this->runSensor('core_queue_monitoring_test');
     $this->assertEqual($result->getValue(), 2);
 
-    // ======= CoreRequirementsSensor tests ======= //
+    // ======= CoreRequirementsSensorPlugin tests ======= //
 
     // @todo - This should not be necessary after sensor requirements are updated.
     $sensor_config = SensorConfig::create(array(
@@ -189,7 +190,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     $this->assertEqual($result->getValue(), 101);
     $this->assertTrue($result->isCritical());
 
-    // ======= ImageMissingStyleSensor tests ======= //
+    // ======= ImageMissingStyleSensorPlugin tests ======= //
 
     $file = file_save_data($this->randomMachineName());
     /** @var FileUsageInterface $usage */
@@ -232,7 +233,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     $result = $this->runSensor('dblog_event_severity_' . $severities[RfcLogLevel::ALERT]);
     $this->assertEqual($result->getValue(), 1);
 
-    // ======= UserFailedLoginsSensor tests ======= //
+    // ======= UserFailedLoginsSensorPlugin tests ======= //
 
     \Drupal::logger('user')->notice('Login attempt failed for %user.', array('%user' => 'user1'));
     \Drupal::logger('user')->notice('Login attempt failed for %user.', array('%user' => 'user1'));
@@ -243,7 +244,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     $this->assertTrue(strpos($result->getMessage(), 'user1: 2') !== FALSE);
     $this->assertTrue(strpos($result->getMessage(), 'user2: 1') !== FALSE);
 
-    // ======= Sensor user_session_logouts tests ======= //
+    // ======= SensorPlugin user_session_logouts tests ======= //
 
     \Drupal::logger('user')->notice('Session closed for %name.', array('%user' => 'user1'));
     \Drupal::logger('user')->notice('Session closed for %name.', array('%user' => 'user1'));
@@ -253,7 +254,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
     $this->assertEqual($result->getValue(), 3);
     $this->assertEqual($result->getMessage(), '3 logouts in 1 day');
 
-    // ======= GitDirtyTreeSensor tests ======= //
+    // ======= GitDirtyTreeSensorPlugin tests ======= //
 
     // Enable the sensor and set cmd to output something
     $sensor_config = SensorConfig::load('monitoring_git_dirty_tree');
@@ -325,9 +326,9 @@ class MonitoringCoreTest extends MonitoringTestBase {
   }
 
   /**
-   * Tests for DisappearedSensorsSensor.
+   * Tests for DisappearedSensorsSensorPlugin.
    *
-   * We provide a separate test method for the DisappearedSensorsSensor as we
+   * We provide a separate test method for the DisappearedSensorsSensorPlugin as we
    * need to enable and disable additional modules.
    */
   public function testSensorDisappearedSensors() {
@@ -492,7 +493,7 @@ class MonitoringCoreTest extends MonitoringTestBase {
   }
 
   /**
-   * Test cases for EnabledModulesSensor sensor.
+   * Test cases for EnabledModulesSensorPlugin sensor.
    *
    * We use separate test method as we need to enable/disable modules.
    */
diff --git a/src/Tests/MonitoringServicesTest.php b/src/Tests/MonitoringServicesTest.php
index 9b8040e..57b8de8 100644
--- a/src/Tests/MonitoringServicesTest.php
+++ b/src/Tests/MonitoringServicesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \MonitoringServicesTest.
+ * Contains \Drupal\monitoring\Tests\MonitoringServicesTest.
  */
 
 namespace Drupal\monitoring\Tests;
diff --git a/src/Tests/MonitoringUITest.php b/src/Tests/MonitoringUITest.php
index 33bd380..5bfecbe 100644
--- a/src/Tests/MonitoringUITest.php
+++ b/src/Tests/MonitoringUITest.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * @file
- * Contains \MonitoringUITest.
+ * Contains \Drupal\monitoring\Tests\MonitoringUITest.
  */
 
 namespace Drupal\monitoring\Tests;
 
 use Drupal\Component\Utility\String;
 use Drupal\monitoring\Entity\SensorConfig;
-use Drupal\monitoring\SensorRunner;
 
 /**
  * Tests for the Monitoring UI.
diff --git a/src/Tests/MonitoringUnitTestBase.php b/src/Tests/MonitoringUnitTestBase.php
index 9ebdbcd..9d3a730 100644
--- a/src/Tests/MonitoringUnitTestBase.php
+++ b/src/Tests/MonitoringUnitTestBase.php
@@ -6,12 +6,12 @@
 
 namespace Drupal\monitoring\Tests;
 
-use Drupal\simpletest\DrupalUnitTestBase;
+use Drupal\simpletest\KernelTestBase;
 
 /**
  * Base class for all monitoring tests.
  */
-abstract class MonitoringUnitTestBase extends DrupalUnitTestBase {
+abstract class MonitoringUnitTestBase extends KernelTestBase {
 
   /**
    * Modules to enable.