diff --git a/cloud/aws/ebs/mode/volumeio.pm b/cloud/aws/ebs/mode/volumeio.pm
index ed149b350..e0b1cba48 100644
--- a/cloud/aws/ebs/mode/volumeio.pm
+++ b/cloud/aws/ebs/mode/volumeio.pm
@@ -174,7 +174,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (!defined($self->{option_results}->{volume_id}) || $self->{option_results}->{volume_id} eq '') {
-        $self->{output}->add_option_msg(short_msg => "Need to specify --volumeid option.");
+        $self->{output}->add_option_msg(short_msg => "Need to specify --volume-id option.");
         $self->{output}->option_exit();
     };
 
@@ -255,7 +255,7 @@ See 'https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cloudwatch_ebs.ht
 
 =over 8
 
-=item B<--volumeid>
+=item B<--volume-id>
 
 Set the VolumeId (Required).
 
diff --git a/cloud/aws/ebs/mode/volumeiops.pm b/cloud/aws/ebs/mode/volumeiops.pm
index f6ddb8fd1..ea08aeb76 100644
--- a/cloud/aws/ebs/mode/volumeiops.pm
+++ b/cloud/aws/ebs/mode/volumeiops.pm
@@ -283,7 +283,7 @@ See 'https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cloudwatch_ebs.ht
 
 =over 8
 
-=item B<--volumeid>
+=item B<--volume-id>
 
 Set the VolumeId (Required).
 
@@ -294,11 +294,11 @@ Can be: VolumeReadOps, VolumeWriteOps, VolumeThroughputPercentage, VolumeConsume
 
 =item B<--warning-$metric$>
 
-Warning thresholds ($metric$ can be: 'iops-read', 'iops-write', 'iops-throughput', 'iops-consumed-rw', 'iops-queue-length').
+Warning thresholds ($metric$ can be: 'iops-read', 'iops-write', 'iops-throughput', 'iops-consumed', 'iops-queue-length').
 
 =item B<--critical-$metric$>
 
-Critical thresholds ($metric$ can be: 'iops-read', 'iops-write', 'iops-throughput', 'iops-consumed-rw', 'iops-queue-length').
+Critical thresholds ($metric$ can be: 'iops-read', 'iops-write', 'iops-throughput', 'iops-consumed', 'iops-queue-length').
 
 =item B<--per-sec>
 
diff --git a/cloud/aws/ebs/mode/volumetime.pm b/cloud/aws/ebs/mode/volumetime.pm
index 4e3fbcff1..283fe4d3e 100644
--- a/cloud/aws/ebs/mode/volumetime.pm
+++ b/cloud/aws/ebs/mode/volumetime.pm
@@ -29,8 +29,8 @@ my %metrics_mapping = (
     'VolumeTotalReadTime' => {
         'output'    => 'Total Read Time',
         'label'     => 'total-read-time',
-        'nlabel'    => { 
-            'absolute' => 'ebs.volume.totalread.time.second' 
+        'nlabel'    => {
+            'absolute' => 'ebs.volume.totalread.time.second'
         },
         'unit'      => 's'
     },
@@ -38,7 +38,7 @@ my %metrics_mapping = (
         'output'    => 'Total Write Time',
         'label'     => 'total-write-time',
         'nlabel'    => {
-            'absolute' => 'ebs.volume.totalwrite.time.second' 
+            'absolute' => 'ebs.volume.totalwrite.time.second'
         },
         'unit'      => 's'
     },
@@ -46,7 +46,7 @@ my %metrics_mapping = (
         'output'          => 'Idle Time',
         'label'           => 'idle-time',
         'nlabel'          => {
-            'absolute' => 'ebs.volume.idle.time.second' 
+            'absolute' => 'ebs.volume.idle.time.second'
         },
         'unit'            => 's',
         'display_percent' => 1
@@ -172,7 +172,7 @@ sub check_options {
     $self->SUPER::check_options(%options);
 
     if (!defined($self->{option_results}->{volume_id}) || $self->{option_results}->{volume_id} eq '') {
-        $self->{output}->add_option_msg(short_msg => "Need to specify --volumeid option.");
+        $self->{output}->add_option_msg(short_msg => "Need to specify --volume-id option.");
         $self->{output}->option_exit();
     };
 
@@ -254,7 +254,7 @@ See 'https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using_cloudwatch_ebs.ht
 
 =over 8
 
-=item B<--volumeid>
+=item B<--volume-id>
 
 Set the VolumeId (Required).