diff --git a/src/Entity/SensorConfig.php b/src/Entity/SensorConfig.php
index 147db0a..3f175b6 100644
--- a/src/Entity/SensorConfig.php
+++ b/src/Entity/SensorConfig.php
@@ -174,8 +174,8 @@ class SensorConfig extends ConfigEntityBase {
    */
   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;
   }
 
   /**
diff --git a/src/Form/SensorForm.php b/src/Form/SensorForm.php
index 09420d2..f0dd44f 100644
--- a/src/Form/SensorForm.php
+++ b/src/Form/SensorForm.php
@@ -142,7 +142,7 @@ class SensorForm extends EntityForm {
       '#default_value' => $sensor_config->status(),
     );
 
-    if (isset($sensor_config->sensor_id) && $sensor = $sensor_config->getPlugin()) {
+    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 SensorPluginInterface $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 SensorPluginInterface $sensor */
-    $sensor = $sensor_config->getPlugin();
+    $plugin = $sensor_config->getPlugin();
 
-    $sensor->submitConfigurationForm($form, $form_state);
+    $plugin->submitConfigurationForm($form, $form_state);
   }
 
   /**
diff --git a/src/SensorRunner.php b/src/SensorRunner.php
index 3282648..7aa0c80 100644
--- a/src/SensorRunner.php
+++ b/src/SensorRunner.php
@@ -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,8 +185,8 @@ class SensorRunner {
 
       // Capture verbose output if requested and if we are able to do so.
       if ($this->verbose && $sensor_config->isExtendedInfo()) {
-        /** @var ExtendedInfoSensorPluginInterface $sensor */
-        $result->setVerboseOutput($sensor->resultVerbose($result));
+        /** @var ExtendedInfoSensorPluginInterface $plugin */
+        $result->setVerboseOutput($plugin->resultVerbose($result));
       }
 
       try {
@@ -198,7 +198,6 @@ class SensorRunner {
       }
     }
 
-
     return $result;
   }