diff --git a/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
index eef80c9..7afaff4 100644
--- a/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/DatabaseAggregatorSensorPlugin.php
@@ -16,12 +16,12 @@ use Drupal\Core\Entity\DependencyTrait;
 use Drupal\Component\Utility\SafeMarkup;
 
 /**
- * Simple database aggregator able to query a single db table.
+ * Database aggregator able to query a single db table.
  *
  * @SensorPlugin(
  *   id = "database_aggregator",
- *   label = @Translation("Simple Database Aggregator"),
- *   description = @Translation("Simple database aggregator able to query a single db table."),
+ *   label = @Translation("Database Aggregator"),
+ *   description = @Translation("Database aggregator able to query a single db table."),
  *   addable = TRUE
  * )
  *
diff --git a/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php b/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
index 03bf1f9..30b0f8e 100644
--- a/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
+++ b/src/Plugin/monitoring/SensorPlugin/WatchdogAggregatorSensorPlugin.php
@@ -20,8 +20,8 @@ use Drupal\Component\Utility\SafeMarkup;
  *
  * @SensorPlugin(
  *   id = "watchdog_aggregator",
- *   label = @Translation("Simple Watchdog Aggregator"),
- *   description = @Translation("Simple aggregator able to query the watchdog table."),
+ *   label = @Translation("Watchdog Aggregator"),
+ *   description = @Translation("Aggregator able to query the watchdog table."),
  *   addable = TRUE
  * )
  *
diff --git a/src/Tests/MonitoringCoreKernelTest.php b/src/Tests/MonitoringCoreKernelTest.php
index b602a70..a9222de 100644
--- a/src/Tests/MonitoringCoreKernelTest.php
+++ b/src/Tests/MonitoringCoreKernelTest.php
@@ -290,7 +290,7 @@ class MonitoringCoreKernelTest extends MonitoringUnitTestBase {
   /**
    * Tests the node count per content type sensor.
    *
-   * @see SensorSimpleDatabaseAggregator
+   * @see SensorDatabaseAggregator
    */
   protected function testDefaultNodeTypeSensors() {
 
@@ -313,7 +313,7 @@ class MonitoringCoreKernelTest extends MonitoringUnitTestBase {
     // Run sensor for type1.
     $result = $this->runSensor('node_new_' . $type1->id());
     $this->assertEqual($result->getValue(), 2);
-    // Test for the SensorSimpleDatabaseAggregator custom message.
+    // Test for the SensorDatabaseAggregator custom message.
     $this->assertEqual($result->getMessage(), SafeMarkup::format('@count @unit in @time_interval', array(
       '@count' => $result->getValue(),
       '@unit' => strtolower($result->getSensorConfig()->getValueLabel()),