diff --git a/modules/multigraph/src/Plugin/rest/resource/MonitoringMultigraphResource.php b/modules/multigraph/src/Plugin/rest/resource/MonitoringMultigraphResource.php
index d5598d4..575dd62 100644
--- a/modules/multigraph/src/Plugin/rest/resource/MonitoringMultigraphResource.php
+++ b/modules/multigraph/src/Plugin/rest/resource/MonitoringMultigraphResource.php
@@ -53,7 +53,7 @@ class MonitoringMultigraphResource extends ResourceBase {
   /**
    * Responds to multigraph GET requests.
    *
-   * @param string $multigraph_name
+   * @param string $id
    *   (optional) The multigraph name, returns a list of all multigraphs when
    *   empty.
    *
@@ -62,21 +62,21 @@ class MonitoringMultigraphResource extends ResourceBase {
    *
    * @throws \Symfony\Component\HttpKernel\Exception\HttpException
    */
-  public function get($multigraph_name = NULL) {
+  public function get($id = NULL) {
 
     $request = \Drupal::request();
     $format = $request->getRequestFormat('ĵson');
 
-    if ($multigraph_name) {
+    if ($id) {
       /** @var \Drupal\monitoring_multigraph\Entity\Multigraph $multigraph */
       $multigraph = \Drupal::entityManager()
         ->getStorage('monitoring_multigraph')
-        ->load($multigraph_name);
+        ->load($id);
       if ($multigraph == NULL) {
-        throw new NotFoundHttpException('No multigraph with name "' . $multigraph_name . '"');
+        throw new NotFoundHttpException('No multigraph with name "' . $id . '"');
       }
       $response = $multigraph->getDefinition();
-      $url = Url::fromRoute('rest.monitoring-multigraph.GET.' . $format , ['id' => $multigraph_name, '_format' => $format])->setAbsolute()->toString(TRUE);
+      $url = Url::fromRoute('rest.monitoring-multigraph.GET.' . $format , ['id' => $id, '_format' => $format])->setAbsolute()->toString(TRUE);
       $response['uri'] = $url->getGeneratedUrl();
       $response = new ResourceResponse($response);
       $response->addCacheableDependency($multigraph);
diff --git a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
index cd1931f..502221f 100644
--- a/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorConfigResource.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\monitoring\Plugin\rest\resource;
 
-use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Url;
 use Drupal\monitoring\Sensor\NonExistingSensorException;
@@ -83,7 +82,7 @@ class MonitoringSensorConfigResource extends ResourceBase {
   /**
    * Responds to sensor INFO GET requests.
    *
-   * @param string $sensor_name
+   * @param string $id
    *   (optional) The sensor name, returns a list of all sensors when empty.
    *
    * @return \Drupal\rest\ResourceResponse
@@ -91,17 +90,17 @@ class MonitoringSensorConfigResource extends ResourceBase {
    *
    * @throws \Symfony\Component\HttpKernel\Exception\HttpException
    */
-  public function get($sensor_name = NULL) {
+  public function get($id = NULL) {
     $format = \Drupal::request()->getRequestFormat('ĵson');
-    if ($sensor_name) {
+    if ($id) {
       try {
-        $sensor_config = $this->sensorManager->getSensorConfigByName($sensor_name);
+        $sensor_config = $this->sensorManager->getSensorConfigByName($id);
       }
       catch (NonExistingSensorException $e) {
         throw new NotFoundHttpException($e->getMessage(), $e);
       }
       $response = $sensor_config->getDefinition();
-      $url = Url::fromRoute('rest.monitoring-sensor.GET.' . $format, ['id' => $sensor_name, '_format' => $format])->setAbsolute()->toString(TRUE);
+      $url = Url::fromRoute('rest.monitoring-sensor.GET.' . $format, ['id' => $id, '_format' => $format])->setAbsolute()->toString(TRUE);
       $response['uri'] = $url->getGeneratedUrl();
       $response = new ResourceResponse($response);
       $response->addCacheableDependency($url);
@@ -111,10 +110,10 @@ class MonitoringSensorConfigResource extends ResourceBase {
 
     $list = array();
     $cacheable_metadata = new CacheableMetadata();
-    foreach ($this->sensorManager->getAllSensorConfig() as $sensor_name => $sensor_config) {
-      $list[$sensor_name] = $sensor_config->getDefinition();
-      $url = Url::fromRoute('rest.monitoring-sensor.GET.' . $format, ['id' => $sensor_name, '_format' => $format])->setAbsolute()->toString(TRUE);
-      $list[$sensor_name]['uri'] = $url->getGeneratedUrl();
+    foreach ($this->sensorManager->getAllSensorConfig() as $id => $sensor_config) {
+      $list[$id] = $sensor_config->getDefinition();
+      $url = Url::fromRoute('rest.monitoring-sensor.GET.' . $format, ['id' => $id, '_format' => $format])->setAbsolute()->toString(TRUE);
+      $list[$id]['uri'] = $url->getGeneratedUrl();
 
       $cacheable_metadata = $cacheable_metadata->merge($url);
       $cacheable_metadata = $cacheable_metadata->merge(CacheableMetadata::createFromObject($sensor_config));
diff --git a/src/Plugin/rest/resource/MonitoringSensorResultResource.php b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
index ff56f4f..9aa208e 100644
--- a/src/Plugin/rest/resource/MonitoringSensorResultResource.php
+++ b/src/Plugin/rest/resource/MonitoringSensorResultResource.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\monitoring\Plugin\rest\resource;
 
-use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Render\RendererInterface;
@@ -20,7 +19,6 @@ use Drupal\rest\Plugin\ResourceBase;
 use Drupal\rest\ResourceResponse;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Tests\DependencyInjection\RendererService;
 use Symfony\Component\Routing\Route;
 use Psr\Log\LoggerInterface;
 
@@ -104,7 +102,7 @@ class MonitoringSensorResultResource extends ResourceBase {
   /**
    * Responds to sensor INFO GET requests.
    *
-   * @param string $sensor_name
+   * @param string $id
    *   (optional) The sensor name, returns a list of all sensors when empty.
    *
    * @return \Drupal\rest\ResourceResponse
@@ -112,14 +110,14 @@ class MonitoringSensorResultResource extends ResourceBase {
    *
    * @throws \Symfony\Component\HttpKernel\Exception\HttpException
    */
-  public function get($sensor_name = NULL) {
+  public function get($id = NULL) {
     $request = \Drupal::request();
 
     $format = $request->getRequestFormat('ĵson');
 
-    if ($sensor_name) {
+    if ($id) {
       try {
-        $sensor_config[$sensor_name] = $this->sensorManager->getSensorConfigByName($sensor_name);
+        $sensor_config[$id] = $this->sensorManager->getSensorConfigByName($id);
 
         // Some sensors might render or do things that we can not properly
         // collect cacheability metadata for. So, run it in our own render
@@ -130,14 +128,14 @@ class MonitoringSensorResultResource extends ResourceBase {
         $result = $this->renderer->executeInRenderContext($context, function() use ($sensor_runner, $sensor_config) {
           return $sensor_runner->runSensors($sensor_config);
         });
-        $response = $result[$sensor_name]->toArray();
-        $url = Url::fromRoute('rest.monitoring-sensor-result.GET.' . $format, ['id' => $sensor_name, '_format' => $format])->setAbsolute()->toString(TRUE);
+        $response = $result[$id]->toArray();
+        $url = Url::fromRoute('rest.monitoring-sensor-result.GET.' . $format, ['id' => $id, '_format' => $format])->setAbsolute()->toString(TRUE);
         $response['uri'] = $url->getGeneratedUrl();
         if ($request->get('expand') == 'sensor') {
-          $response['sensor'] = $result[$sensor_name]->getSensorConfig()->toArray();
+          $response['sensor'] = $result[$id]->getSensorConfig()->toArray();
         }
         $response = new ResourceResponse($response);
-        $response->addCacheableDependency($result[$sensor_name]->getSensorConfig());
+        $response->addCacheableDependency($result[$id]->getSensorConfig());
         $response->addCacheableDependency($url);
         $response->addCacheableDependency(CacheableMetadata::createFromRenderArray([
           '#cache' => [
@@ -172,12 +170,12 @@ class MonitoringSensorResultResource extends ResourceBase {
         return $sensor_runner->runSensors();
       });
 
-      foreach ($results as $sensor_name => $result) {
-        $list[$sensor_name] = $result->toArray();
-        $url = Url::fromRoute('rest.monitoring-sensor-result.GET.' . $format, ['id' => $sensor_name, '_format' => $format])->setAbsolute()->toString(TRUE);
-        $list[$sensor_name]['uri'] = $url->getGeneratedUrl();
+      foreach ($results as $id => $result) {
+        $list[$id] = $result->toArray();
+        $url = Url::fromRoute('rest.monitoring-sensor-result.GET.' . $format, ['id' => $id, '_format' => $format])->setAbsolute()->toString(TRUE);
+        $list[$id]['uri'] = $url->getGeneratedUrl();
         if ($request->get('expand') == 'sensor') {
-          $list[$sensor_name]['sensor'] = $result->getSensorConfig()->toArray();
+          $list[$id]['sensor'] = $result->getSensorConfig()->toArray();
         }
         $cacheable_metadata = $cacheable_metadata->merge($url);
         $cacheable_metadata = $cacheable_metadata->merge(CacheableMetadata::createFromObject($result->getSensorConfig()));