diff --git a/cloud/aws/apigateway/mode/latency.pm b/cloud/aws/apigateway/mode/latency.pm
index 1c1b75570..e9022fefc 100644
--- a/cloud/aws/apigateway/mode/latency.pm
+++ b/cloud/aws/apigateway/mode/latency.pm
@@ -31,14 +31,14 @@ my %metrics_mapping = (
         'output_unit' => 'ms',
         'perfdata_unit' => 'ms',
         'label' => 'client-latency',
-        'nlabel' => 'apigateway.client.latency.ms'
+        'nlabel' => 'apigateway.client.latency.milliseconds'
     },
     'IntegrationLatency' => {
         'output' => 'Integration Latency',
         'output_unit' => 'ms',
         'perfdata_unit' => 'ms',
         'label' => 'backend-latency',
-        'nlabel' => 'apigateway.backend.latency.ms'
+        'nlabel' => 'apigateway.backend.latency.milliseconds'
     },
 );
 
diff --git a/cloud/aws/apigateway/mode/requests.pm b/cloud/aws/apigateway/mode/requests.pm
index f773225c7..49fada1b6 100644
--- a/cloud/aws/apigateway/mode/requests.pm
+++ b/cloud/aws/apigateway/mode/requests.pm
@@ -28,18 +28,18 @@ use warnings;
 my %metrics_mapping = (
     'Count' => {
         'output' => 'Client Requests',
-        'label' => 'request-count',
-        'nlabel' => 'requests.count'
+        'label' => 'request-client',
+        'nlabel' => 'apigateway.requests.client.count'
     },
     '4XXError' => {
         'output' => 'HTTP 4XX Errors',
-        'label' => 'httpcode-4xx-errors',
-        'nlabel' => 'requests.httpcode.4xx.count'
+        'label' => 'requests-4xx-errors',
+        'nlabel' => 'apigateway.requests.errors.4xx.count'
     },
     '5XXError' => {
         'output' => 'HTTP 5XX Errors',
-        'label' => 'httpcode-5xx-errors',
-        'nlabel' => 'requests.httpcode.5xx.count'
+        'label' => 'requests-5xx-errors',
+        'nlabel' => 'apigateway.requests.errors.5xx.count'
     },
 );
 
@@ -191,12 +191,12 @@ Filter metrics (Can be: 'Count', '4XXError', '5XXError')
 =item B<--warning-*>
 
 Thresholds warning 
-star substitusion possibilities: request-count, httpcode-4xx-errors, httpcode-5xx-errors
+star substitusion possibilities: request-client, requests-4xx-errors, requests-5xx-errors
 
 =item B<--critical-*>
 
 Thresholds critical
-star substitusion possibilities: request-count, httpcode-4xx-errors, httpcode-5xx-errors
+star substitusion possibilities: request-client, requests-4xx-errors, requests-5xx-errors
 
 =back
 
diff --git a/cloud/aws/kinesis/mode/recordsstats.pm b/cloud/aws/kinesis/mode/recordsstats.pm
index 9ff5857c9..d4bda8d0a 100644
--- a/cloud/aws/kinesis/mode/recordsstats.pm
+++ b/cloud/aws/kinesis/mode/recordsstats.pm
@@ -28,54 +28,54 @@ use warnings;
 my %metrics_mapping = (
     'GetRecords.IteratorAgeMilliseconds' => {
         'output' => 'Get Records Iterator Age',
-        'label' => 'get-record-iterator-age',
-        'nlabel' => 'kinesis.stream.records.get.iteratorage.ms',
+        'label' => 'records-get-iteratorage',
+        'nlabel' => 'kinesis.stream.records.get.iteratorage.milliseconds',
         'perf_unit' => 'ms',
         'change_bytes' => '0',
         'stats' => { 'sum' => 'false' }
     },
     'GetRecords.Bytes' => {
         'output' => 'Get Records Bytes',
-        'label' => 'get-record-bytes',
-        'nlabel' => 'kinesis.stream.get.records.bytes',
+        'label' => 'records-get-volume',
+        'nlabel' => 'kinesis.stream.records.get.volume.bytes',
         'perf_unit' => 'B',
         'change_bytes' => '2',
     },
     'GetRecords.Latency' => {
         'output' => 'Get Records Latency',
-        'label' => 'get-record-latency',
-        'nlabel' => 'kinesis.stream.get.records.latency.ms',
+        'label' => 'records-get-latency',
+        'nlabel' => 'kinesis.stream.records.get.latency.milliseconds',
         'perf_unit' => 'ms',
         'change_bytes' => '0',
         'stats' => { 'sum' => 'false' }
     },
     'GetRecords.Success' => {
         'output' => 'Get Records Success',
-        'label' => 'get-record-success',
-        'nlabel' => 'kinesis.stream.get.records.success.count',
+        'label' => 'records-get-success',
+        'nlabel' => 'kinesis.stream.records.get.success.count',
         'perf_unit' => '',
         'change_bytes' => '0',
         'stats' => { 'average' => 'false' }
     },
     'PutRecord.Latency' => {
         'output' => 'Put Records Latency',
-        'label' => 'put-record-latency',
-        'nlabel' => 'kinesis.stream.put.records.latency.ms',
+        'label' => 'records-put-latency',
+        'nlabel' => 'kinesis.stream.records.put.latency.milliseconds',
         'perf_unit' => 'ms',
         'change_bytes' => '0',
         'stats' => { 'sum' => 'false' }
     },
     'PutRecord.Bytes' => {
         'output' => 'Put Records Bytes',
-        'label' => 'put-record-bytes',
-        'nlabel' => 'kinesis.stream.put.records.bytes',
+        'label' => 'records-put-volume',
+        'nlabel' => 'kinesis.stream.records.put.volume.bytes',
         'perf_unit' => 'B',
         'change_bytes' => '2'
     },
     'PutRecord.Success' => {
         'output' => 'Put Records Success',
-        'label' => 'put-record-success',
-        'nlabel' => 'kinesis.stream.put.records.success.count',
+        'label' => 'records-put-success',
+        'nlabel' => 'kinesis.stream.records.put.success.count',
         'perf_unit' => '',
         'change_bytes' => '0',
         'stats' => { 'average' => 'false' }
@@ -228,14 +228,14 @@ Filter metrics (Can be: 'GetRecords.IteratorAgeMilliseconds', 'GetRecords.Bytes'
 =item B<--warning-*>
 
 Thresholds warning
-can be: 'get-record-iterator-age', 'get-record-bytes', 'get-record-success', 'get-record-latency',
-'put-record-bytes', 'put-record-success', 'put-record-latency'
+can be: 'records-get-iteratorage', 'records-get-volume', 'records-get-latency', 'records-get-success',
+'records-put-volume', 'records-put-latency', 'records-get-success',
 
 =item B<--critical-*>
 
 Thresholds critical
-can be: 'get-record-iterator-age', 'get-record-bytes', 'get-record-success', 'get-record-latency',
-'put-record-bytes', 'put-record-success', 'put-record-latency'
+can be: 'records-get-iteratorage', 'records-get-volume', 'records-get-latency', 'records-get-success',
+'records-put-volume', 'records-put-latency', 'records-get-success',
 
 =back
 
diff --git a/cloud/aws/kinesis/mode/streams.pm b/cloud/aws/kinesis/mode/streams.pm
index 93dbf9564..2f64f9191 100644
--- a/cloud/aws/kinesis/mode/streams.pm
+++ b/cloud/aws/kinesis/mode/streams.pm
@@ -28,30 +28,30 @@ use warnings;
 my %metrics_mapping = (
     'IncomingBytes' => {
         'output' => 'Incoming Bytes',
-        'label' => 'incoming-bytes',
-        'nlabel' => 'kinesis.stream.incoming.bytes',
+        'label' => 'incoming-volume',
+        'nlabel' => 'kinesis.stream.incoming.volume.bytes',
         'perf_unit' => 'B',
         'change_bytes' => '2'
     },
     'IncomingRecords' => {
         'output' => 'Incoming Records',
         'label' => 'incoming-records',
-        'nlabel' => 'kinesis.stream.incoming.records',
+        'nlabel' => 'kinesis.stream.incoming.records.count',
         'perf_unit' => '',
         'change_bytes' => '0',
         'stats' => { 'average' => 'false' }
     },
     'OutgoingBytes' => {
         'output' => 'Outgoing Bytes',
-        'label' => 'outgoing-bytes',
-        'nlabel' => 'kinesis.stream.outgoing.bytes',
+        'label' => 'outgoing-volume',
+        'nlabel' => 'kinesis.stream.outgoing.volume.bytes',
         'perf_unit' => 'B',
         'change_bytes' => '2'
     },
     'OutgoingRecords' => {
         'output' => 'Outgoing Records',
         'label' => 'outgoing-records',
-        'nlabel' => 'kinesis.stream.outgoing.records',
+        'nlabel' => 'kinesis.stream.outgoing.records.count',
         'perf_unit' => '',
         'change_bytes' => '0',
         'stats' => { 'average' => 'false' }
@@ -205,12 +205,12 @@ Filter metrics (Can be: 'IncomingBytes', 'IncomingRecords', 'OutgoingBytes', 'Ou
 =item B<--warning-*>
 
 Thresholds warning
-can be: 'incoming-bytes', 'incoming-records', 'outgoing-bytes', 'outgoing-records'.
+can be: 'incoming-bytes', 'incoming-records', 'outgoing-volume', 'outgoing-volume'.
 
 =item B<--critical-*>
 
 Thresholds critical
-can be: 'incoming-bytes', 'incoming-records', 'outgoing-bytes', 'outgoing-records'.
+can be: 'incoming-bytes', 'incoming-records', 'outgoing-volume', 'outgoing-volume'.
 
 =back