diff --git a/modules/demo/monitoring_demo.install b/modules/demo/monitoring_demo.install
index 5b088a1..a0ee536 100644
--- a/modules/demo/monitoring_demo.install
+++ b/modules/demo/monitoring_demo.install
@@ -19,7 +19,7 @@ function monitoring_demo_install() {
 
   // Enable REST API for monitoring resources.
   $settings = array(
-    'monitoring-sensor-info' => array(
+    'monitoring-sensor' => array(
       'GET' => array(
         'supported_formats' => array('hal_json'),
         'supported_auth' => array('cookie'),
diff --git a/modules/demo/src/Controller/FrontPage.php b/modules/demo/src/Controller/FrontPage.php
index 430e341..0e5f5ce 100644
--- a/modules/demo/src/Controller/FrontPage.php
+++ b/modules/demo/src/Controller/FrontPage.php
@@ -61,8 +61,8 @@ class FrontPage extends ControllerBase {
         'list' => array(
           '#theme' => 'item_list',
           '#items' => array(
-            t('Drush integration - open up your console and type in # drush monitoring-info or # drush monitoring-run. See the drush help for more info and commands.'),
-            t('REST resource for both the info about sensors and running the sensors via the service. Open up your REST client and visit /monitoring-sensor-info/{sensor_name} and /monitoring-sensor-result/{sensor_name}'),
+            t('Drush integration - open up your console and type in # drush monitoring-sensor-config or # drush monitoring-run. See the drush help for more info and commands.'),
+            t('REST resource for both the info about sensors and running the sensors via the service. Open up your REST client and visit /monitoring-sensor/{sensor_name} and /monitoring-sensor-result/{sensor_name}'),
           )
         ),
       ),
diff --git a/modules/multigraph/src/Tests/MultigraphServicesTest.php b/modules/multigraph/src/Tests/MultigraphServicesTest.php
index 7cc2ac8..9452124 100644
--- a/modules/multigraph/src/Tests/MultigraphServicesTest.php
+++ b/modules/multigraph/src/Tests/MultigraphServicesTest.php
@@ -87,7 +87,7 @@ class MultigraphServicesTest extends RESTTestBase {
 
     // Test response for non-existing multigraph.
     $name = 'multigraph_that_does_not_exist';
-    $this->doRequest('monitoring-sensor-info/' . $name);
+    $this->doRequest('monitoring-sensor/' . $name);
     $this->assertResponse(404);
 
     // Test the predefined multigraph.
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 d13bd4e..4bfdf83 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
@@ -1,4 +1,4 @@
-id: test_sensor_info
+id: test_sensor_config
 label: 'Test sensor config'
 description: 'To test correct sensor config hook implementation precedence.'
 plugin_id: test_sensor
diff --git a/monitoring.drush.inc b/monitoring.drush.inc
index 1417140..b478fa5 100644
--- a/monitoring.drush.inc
+++ b/monitoring.drush.inc
@@ -32,7 +32,7 @@ define('MONITORING_DRUSH_SENSOR_STATUS_OK', 0);
  * Implements hook_drush_command().
  *
  * Provides commands:
- * - monitoring-info
+ * - monitoring-sensor-config
  * - monitoring-run
  * - monitoring-enable
  * - monitoring-disable
@@ -41,15 +41,15 @@ define('MONITORING_DRUSH_SENSOR_STATUS_OK', 0);
 function monitoring_drush_command() {
   $items = array();
 
-  $items['monitoring-info'] = array(
-    'callback' => 'monitoring_drush_info',
+  $items['monitoring-sensor-config'] = array(
+    'callback' => 'monitoring_drush_sensor_config',
     'description' => 'Displays information about available sensors. If a sensor name provided as argument a detailed sensor config is provided.',
     'arguments' => array(
       'sensor_name' => 'Specific sensor name for which we want to display info.'
     ),
     'examples' => array(
-      'drush monitoring-info' => 'Prints sensor config for all available sensors.',
-      'drush monitoring-info node_new' => 'Prints info of the node_new sensor.',
+      'drush monitoring-sensor-config' => 'Prints sensor config for all available sensors.',
+      'drush monitoring-sensor-config node_new' => 'Prints info of the node_new sensor.',
     ),
     'drupal dependencies' => array('monitoring'),
   );
@@ -64,7 +64,7 @@ function monitoring_drush_command() {
       'verbose' => 'Display verbose information.',
       'force' => 'If the sensor execution should be forced in case cached result is available.',
       'output' => 'The output format. Currently "table" and "json" available. Defaults to "table".',
-      'expand' => 'Relevant only for the json output. Currently "sensor_info" value supported.',
+      'expand' => 'Relevant only for the json output. Currently "sensor" value supported.',
       'show-exec-time' => 'Relevant for the table output listing all results. Will expand the table with execution time info.'
     ),
     'examples' => array(
@@ -124,19 +124,19 @@ function monitoring_drush_command() {
  * @param string $sensor_name
  *   Sensor name for which to print info.
  */
-function monitoring_drush_info($sensor_name = NULL) {
+function monitoring_drush_sensor_config($sensor_name = NULL) {
   if (empty($sensor_name)) {
-    monitoring_drush_info_all();
+    monitoring_drush_sensor_config_all();
   }
   else {
-    monitoring_drush_info_single($sensor_name);
+    monitoring_drush_sensor_config_single($sensor_name);
   }
 }
 
 /**
  * Provides info about available sensors.
  */
-function monitoring_drush_info_all() {
+function monitoring_drush_sensor_config_all() {
   $sensors_config_all = monitoring_sensor_manager()->getAllSensorConfig();
 
   $rows[] = array(dt('Label'), dt('Name'), dt('Category'), dt('Enabled'));
@@ -160,7 +160,7 @@ function monitoring_drush_info_all() {
  * @param string $sensor_name
  *   Sensor name for which to print info.
  */
-function monitoring_drush_info_single($sensor_name) {
+function monitoring_drush_sensor_config_single($sensor_name) {
   $sensor_config = NULL;
   try {
     $sensor_config = monitoring_sensor_manager()->getSensorConfigByName($sensor_name);
@@ -259,9 +259,10 @@ function monitoring_drush_run($sensor_name = NULL) {
 function monitoring_drush_result_output_json(array $results, $expand = NULL) {
   $json_output = array();
   foreach ($results as $result) {
-    $json_output[$result->getSensorId()] = $result->toArray();
-    if ($expand == 'sensor_info') {
-      $json_output[$result->getSensorId()]['sensor_info'] = $result->getSensorConfig()->toArray();
+    $sensor_name = $result->getSensorName();
+    $json_output[$sensor_name] = $result->toArray();
+    if ($expand == 'sensor') {
+      $json_output[$sensor_name]['sensor'] = $result->getSensorConfig()->toArray();
     }
   }
   drush_print(Json::encode($json_output));
diff --git a/src/Entity/SensorConfig.php b/src/Entity/SensorConfig.php
index 91df435..c014cfb 100644
--- a/src/Entity/SensorConfig.php
+++ b/src/Entity/SensorConfig.php
@@ -147,7 +147,7 @@ class SensorConfig extends ConfigEntityBase implements SensorConfigInterface {
    * {@inheritdoc}
    */
   public function getPlugin() {
-    $configuration = array('sensor_info' => $this);
+    $configuration = array('sensor_config' => $this);
     $plugin = monitoring_sensor_manager()->createInstance($this->plugin_id, $configuration);
     return $plugin;
   }
diff --git a/src/Form/SensorDetailForm.php b/src/Form/SensorDetailForm.php
index bd61dc6..bce1bdf 100644
--- a/src/Form/SensorDetailForm.php
+++ b/src/Form/SensorDetailForm.php
@@ -79,7 +79,7 @@ class SensorDetailForm extends EntityForm {
     }
 
     if ($sensor_config->getDescription()) {
-      $form['sensor_info']['description'] = array(
+      $form['sensor_config']['description'] = array(
         '#type' => 'item',
         '#title' => $this->t('Description'),
         '#markup' => $sensor_config->getDescription(),
@@ -87,7 +87,7 @@ class SensorDetailForm extends EntityForm {
     }
 
     if ($sensor_config->getCategory()) {
-      $form['sensor_info']['category'] = array(
+      $form['sensor_config']['category'] = array(
         '#type' => 'item',
         '#title' => $this->t('Category'),
         '#markup' => $sensor_config->getCategory(),
@@ -128,7 +128,7 @@ class SensorDetailForm extends EntityForm {
       $form['sensor_result']['force_run'] = array(
         '#type' => 'submit',
         '#value' => $this->t('Run now'),
-	'#access' => \Drupal::currentUser()->hasPermission('monitoring force run'),
+        '#access' => \Drupal::currentUser()->hasPermission('monitoring force run'),
       );
     }
     elseif ($sensor_config->getCachingTime()) {
diff --git a/src/Form/SensorForm.php b/src/Form/SensorForm.php
index eb08759..0281c4b 100644
--- a/src/Form/SensorForm.php
+++ b/src/Form/SensorForm.php
@@ -10,7 +10,6 @@ use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\monitoring\SensorConfigInterface;
-use Drupal\monitoring\SensorPlugin\SensorPluginBase;
 use Drupal\monitoring\SensorPlugin\SensorPluginInterface;
 
 /**
@@ -198,12 +197,12 @@ class SensorForm extends EntityForm {
   public function validate(array $form, FormStateInterface $form_state) {
     parent::validate($form, $form_state);
 
-    /** @var SensorPluginInterface $plugin */
+    /** @var SensorConfigInterface $sensor_config */
     $sensor_config = $this->entity;
     /** @var SensorPluginInterface $plugin */
     if ($sensor_config->isNew()) {
-      $plugin = $form_state->getValue('plugin_id');
-      $plugin = monitoring_sensor_manager()->createInstance($plugin, array('sensor_info' => $this->entity));
+      $plugin_id = $form_state->getValue('plugin_id');
+      $plugin = monitoring_sensor_manager()->createInstance($plugin_id, array('sensor_config' => $this->entity));
     }
     else {
       $plugin = $sensor_config->getPlugin();
@@ -238,7 +237,7 @@ class SensorForm extends EntityForm {
   /**
    * Settings form page title callback.
    *
-   * @param SensorConfig $monitoring_sensor_config
+   * @param SensorConfigInterface $monitoring_sensor_config
    *   The Sensor config.
    *
    * @return string
diff --git a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
index 6a1a9ba..10001ae 100644
--- a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
@@ -21,7 +21,7 @@ use Psr\Log\LoggerInterface;
  * Provides a resource for monitoring sensors.
  *
  * @RestResource(
- *   id = "monitoring-sensor-info",
+ *   id = "monitoring-sensor",
  *   label = @Translation("Monitoring sensor config")
  * )
  */
@@ -101,14 +101,14 @@ class MonitoringSensorConfigResource extends ResourceBase {
         throw new NotFoundHttpException($e->getMessage(), $e);
       }
       $response = $sensor_config->getDefinition();
-      $response['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor-info/' . $sensor_name);
+      $response['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor/' . $sensor_name);
       return new ResourceResponse($response);
     }
 
     $list = array();
     foreach ($this->sensorManager->getAllSensorConfig() as $sensor_name => $sensor_config) {
       $list[$sensor_name] = $sensor_config->getDefinition();
-      $list[$sensor_name]['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor-info/' . $sensor_name);
+      $list[$sensor_name]['uri'] = \Drupal::request()->getUriForPath('/monitoring-sensor/' . $sensor_name);
     }
     return new ResourceResponse($list);
   }
diff --git a/src/Plugin/rest/resource/MonitoringSensorResultResource.php b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
index ca069a7..9a7993c 100644
--- a/src/Plugin/rest/resource/MonitoringSensorResultResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
@@ -112,8 +112,8 @@ class MonitoringSensorResultResource extends ResourceBase {
         $result = $this->sensorRunner->runSensors($sensor_config);
         $response = $result[$sensor_name]->toArray();
         $response['uri'] = $request->getUriForPath('/monitoring-sensor-result/' . $sensor_name);
-        if ($request->get('expand') == 'sensor_info') {
-          $response['sensor_info'] = $result[$sensor_name]->getSensorConfig()->toArray();
+        if ($request->get('expand') == 'sensor') {
+          $response['sensor'] = $result[$sensor_name]->getSensorConfig()->toArray();
         }
         return new ResourceResponse($response);
       }
@@ -129,8 +129,8 @@ class MonitoringSensorResultResource extends ResourceBase {
       foreach ($this->sensorRunner->runSensors() as $sensor_name => $result) {
         $list[$sensor_name] = $result->toArray();
         $list[$sensor_name]['uri'] = $request->getUriForPath('/monitoring-sensor-result/' . $sensor_name);
-        if ($request->get('expand') == 'sensor_info') {
-          $list[$sensor_name]['sensor_info'] = $result->getSensorConfig()->toArray();
+        if ($request->get('expand') == 'sensor') {
+          $list[$sensor_name]['sensor'] = $result->getSensorConfig()->toArray();
         }
       }
       return new ResourceResponse($list);
diff --git a/src/Sensor/SensorManager.php b/src/Sensor/SensorManager.php
index 6b9aa3c..d221e2a 100644
--- a/src/Sensor/SensorManager.php
+++ b/src/Sensor/SensorManager.php
@@ -67,7 +67,7 @@ class SensorManager extends DefaultPluginManager {
   public function createInstance($plugin_id, array $configuration = array()) {
     // Configuration contains SensorConfig object. Extracting
     // it to use for sensor object creation.
-    $sensor_config = $configuration['sensor_info'];
+    $sensor_config = $configuration['sensor_config'];
     $definition = $this->getDefinition($plugin_id);
     // SensorPlugin class from the sensor definition.
     /** @var SensorPluginInterface $class */
diff --git a/src/Tests/MonitoringApiTest.php b/src/Tests/MonitoringApiTest.php
index e266ad7..2e8590b 100644
--- a/src/Tests/MonitoringApiTest.php
+++ b/src/Tests/MonitoringApiTest.php
@@ -47,7 +47,7 @@ class MonitoringApiTest extends MonitoringUnitTestBase {
   public function testAPI() {
 
     // == Test sensor config. == //
-    $sensor_config = SensorConfig::load('test_sensor_info');
+    $sensor_config = SensorConfig::load('test_sensor_config');
 
     $this->assertEqual($sensor_config->getLabel(), 'Test sensor config');
     $this->assertEqual($sensor_config->getDescription(), 'To test correct sensor config hook implementation precedence.');
diff --git a/src/Tests/MonitoringServicesTest.php b/src/Tests/MonitoringServicesTest.php
index fc8f3f0..5004bed 100644
--- a/src/Tests/MonitoringServicesTest.php
+++ b/src/Tests/MonitoringServicesTest.php
@@ -48,7 +48,7 @@ class MonitoringServicesTest extends RESTTestBase {
     // Enable REST API for monitoring resources.
     $config = \Drupal::config('rest.settings');
     $settings = array(
-      'monitoring-sensor-info' => array(
+      'monitoring-sensor' => array(
         'GET' => array(
           'supported_formats' => array($this->defaultFormat),
           'supported_auth' => $this->defaultAuth,
@@ -65,7 +65,7 @@ class MonitoringServicesTest extends RESTTestBase {
     $config->save();
     $this->rebuildCache();
 
-    $this->servicesAccount = $this->drupalCreateUser(array('restful get monitoring-sensor-info', 'restful get monitoring-sensor-result'));
+    $this->servicesAccount = $this->drupalCreateUser(array('restful get monitoring-sensor', 'restful get monitoring-sensor-result'));
   }
 
   /**
@@ -74,7 +74,7 @@ class MonitoringServicesTest extends RESTTestBase {
   public function testSensorConfig() {
     $this->drupalLogin($this->servicesAccount);
 
-    $response_data = $this->doRequest('monitoring-sensor-info');
+    $response_data = $this->doRequest('monitoring-sensor');
     $this->assertResponse(200);
 
     foreach (monitoring_sensor_manager()->getAllSensorConfig() as $sensor_name => $sensor_config) {
@@ -87,7 +87,7 @@ class MonitoringServicesTest extends RESTTestBase {
       $this->assertEqual($response_data[$sensor_name]['caching_time'], $sensor_config->getCachingTime());
       $this->assertEqual($response_data[$sensor_name]['time_interval'], $sensor_config->getTimeIntervalValue());
       $this->assertEqual($response_data[$sensor_name]['enabled'], $sensor_config->isEnabled());
-      $this->assertEqual($response_data[$sensor_name]['uri'], Url::fromUri('base://monitoring-sensor-info/' . $sensor_config->id(), array('absolute' => TRUE))->toString());
+      $this->assertEqual($response_data[$sensor_name]['uri'], Url::fromUri('base://monitoring-sensor/' . $sensor_config->id(), array('absolute' => TRUE))->toString());
 
       if ($sensor_config->isDefiningThresholds()) {
         $this->assertEqual($response_data[$sensor_name]['thresholds'], $sensor_config->getSetting('thresholds'));
@@ -95,11 +95,11 @@ class MonitoringServicesTest extends RESTTestBase {
     }
 
     $sensor_name = 'sensor_that_does_not_exist';
-    $this->doRequest('monitoring-sensor-info/' . $sensor_name);
+    $this->doRequest('monitoring-sensor/' . $sensor_name);
     $this->assertResponse(404);
 
     $sensor_name = 'dblog_event_severity_error';
-    $response_data = $this->doRequest('monitoring-sensor-info/' . $sensor_name);
+    $response_data = $this->doRequest('monitoring-sensor/' . $sensor_name);
     $this->assertResponse(200);
     $sensor_config = SensorConfig::load($sensor_name);
     $this->assertEqual($response_data['sensor'], $sensor_config->id());
@@ -111,7 +111,7 @@ class MonitoringServicesTest extends RESTTestBase {
     $this->assertEqual($response_data['caching_time'], $sensor_config->getCachingTime());
     $this->assertEqual($response_data['time_interval'], $sensor_config->getTimeIntervalValue());
     $this->assertEqual($response_data['enabled'], $sensor_config->isEnabled());
-    $this->assertEqual($response_data['uri'], Url::fromUri('base://monitoring-sensor-info/' . $sensor_config->id(), array('absolute' => TRUE))->toString());
+    $this->assertEqual($response_data['uri'], Url::fromUri('base://monitoring-sensor/' . $sensor_config->id(), array('absolute' => TRUE))->toString());
 
     if ($sensor_config->isDefiningThresholds()) {
       $this->assertEqual($response_data['thresholds'], $sensor_config->getSetting('thresholds'));
@@ -154,17 +154,17 @@ class MonitoringServicesTest extends RESTTestBase {
     $this->assertResponse(404);
 
     $sensor_name = 'dblog_event_severity_error';
-    $response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name, array('expand' => 'sensor_info'));
+    $response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name, array('expand' => 'sensor'));
     $this->assertResponse(200);
     // The response must contain the sensor_info.
-    $this->assertTrue(isset($response_data['sensor_info']));
+    $this->assertTrue(isset($response_data['sensor']));
     $this->assertSensorResult($response_data, SensorConfig::load($sensor_name));
 
     // Try a request without expanding the sensor config and check that it is not
     // present.
     $response_data = $this->doRequest('monitoring-sensor-result/' . $sensor_name);
     $this->assertResponse(200);
-    $this->assertTrue(!isset($response_data['sensor_info']));
+    $this->assertTrue(!isset($response_data['sensor']));
   }
 
   /**