diff --git a/network/cisco/ironport/snmp/mode/components/fan.pm b/network/cisco/ironport/snmp/mode/components/fan.pm
index a67d78ac6..4bf9d53ec 100644
--- a/network/cisco/ironport/snmp/mode/components/fan.pm
+++ b/network/cisco/ironport/snmp/mode/components/fan.pm
@@ -47,7 +47,7 @@ my $oid_fanEntry = '.1.3.6.1.4.1.15497.1.1.1.10.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_fanEntry, end => $mapping->{fanRPMs}->{oid} };
+    push @{$options{request}}, { oid => $oid_fanEntry, start => $mapping->{fanRPMs}->{oid} };
 }
 
 sub check {
diff --git a/network/cisco/ironport/snmp/mode/components/psu.pm b/network/cisco/ironport/snmp/mode/components/psu.pm
index 0ac23f2ea..1cf571173 100644
--- a/network/cisco/ironport/snmp/mode/components/psu.pm
+++ b/network/cisco/ironport/snmp/mode/components/psu.pm
@@ -54,7 +54,7 @@ my $oid_powerSupplyEntry = '.1.3.6.1.4.1.15497.1.1.1.8.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_powerSupplyEntry, end => $mapping->{powerSupplyStatus}->{oid} };
+    push @{$options{request}}, { oid => $oid_powerSupplyEntry, start => $mapping->{powerSupplyStatus}->{oid} };
 }
 
 sub check {
diff --git a/network/cisco/ironport/snmp/mode/components/raid.pm b/network/cisco/ironport/snmp/mode/components/raid.pm
index 05fddaae7..bad4aa054 100644
--- a/network/cisco/ironport/snmp/mode/components/raid.pm
+++ b/network/cisco/ironport/snmp/mode/components/raid.pm
@@ -53,7 +53,7 @@ my $oid_raidEntry = '.1.3.6.1.4.1.15497.1.1.1.18.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_raidEntry, end => $mapping->{raidStatus}->{oid} };
+    push @{$options{request}}, { oid => $oid_raidEntry, start => $mapping->{raidStatus}->{oid} };
 }
 
 sub check {
@@ -73,7 +73,7 @@ sub check {
         $self->{components}->{raid}->{total}++;
         $self->{output}->output_add(long_msg => sprintf("Raid '%s' status is '%s' [instance = %s]",
                                                         $result->{raidID}, $result->{raidStatus}, $instance));
-        my $exit = $self->get_severity(section => 'psu', value => $result->{raidStatus});
+        my $exit = $self->get_severity(section => 'raid', value => $result->{raidStatus});
         if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
             $self->{output}->output_add(severity => $exit,
                                        short_msg => sprintf("Raid '%s' status is '%s'", $result->{raidID}, $result->{raidStatus}));
diff --git a/network/cisco/ironport/snmp/mode/components/temperature.pm b/network/cisco/ironport/snmp/mode/components/temperature.pm
index 3217357db..e85a03248 100644
--- a/network/cisco/ironport/snmp/mode/components/temperature.pm
+++ b/network/cisco/ironport/snmp/mode/components/temperature.pm
@@ -61,7 +61,7 @@ my $oid_temperatureEntry = '.1.3.6.1.4.1.15497.1.1.1.9.1';
 sub load {
     my (%options) = @_;
     
-    push @{$options{request}}, { oid => $oid_temperatureEntry, end => $mapping->{degreesCelsius}->{oid} };
+    push @{$options{request}}, { oid => $oid_temperatureEntry, start => $mapping->{degreesCelsius}->{oid} };
 }
 
 sub check {
diff --git a/network/cisco/ironport/snmp/mode/cpu.pm b/network/cisco/ironport/snmp/mode/cpu.pm
index c31fcc105..e443c1b21 100644
--- a/network/cisco/ironport/snmp/mode/cpu.pm
+++ b/network/cisco/ironport/snmp/mode/cpu.pm
@@ -93,7 +93,7 @@ sub run {
         my $exit_code = $self->{perfdata}->threshold_check(value => $result->{$oid_cacheCpuUsage}, 
                                                            threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
         $self->{output}->output_add(severity => $exit_code,
-                                    short_msg => sprintf("CPU Mail usage is: %.2f%%", $result->{$oid_cacheCpuUsage}));
+                                    short_msg => sprintf("CPU WebSecurity usage is: %.2f%%", $result->{$oid_cacheCpuUsage}));
         $self->{output}->perfdata_add(label => 'cpu_websecurity', unit => '%',
                                       value => sprintf("%.2f", $result->{$oid_cacheCpuUsage}),
                                       warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),