diff --git a/network/3com/snmp/mode/memory.pm b/network/3com/snmp/mode/memory.pm
index c8bc9a10a..311b74515 100644
--- a/network/3com/snmp/mode/memory.pm
+++ b/network/3com/snmp/mode/memory.pm
@@ -30,7 +30,7 @@ sub custom_usage_perfdata {
 
     $self->{output}->perfdata_add(
         label => 'used', unit => 'B',
-        nlabel =>  $self->{label},
+        nlabel =>  $self->{nlabel},
         instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{display} : undef,
         value => $self->{result_values}->{used},
         warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}, total => $self->{result_values}->{total}, cast_int => 1),
diff --git a/network/a10/ax/snmp/mode/cpu.pm b/network/a10/ax/snmp/mode/cpu.pm
index 21d2393e5..195c1cc86 100644
--- a/network/a10/ax/snmp/mode/cpu.pm
+++ b/network/a10/ax/snmp/mode/cpu.pm
@@ -33,7 +33,7 @@ sub set_counters {
     ];
     
     $self->{maps_counters}->{cpu} = [
-        { label => 'cpu-30s', nlabel => 'cpu.utilization.30s.average', set => {
+        { label => 'cpu-30s', nlabel => 'cpu.utilization.30s.percentage', set => {
                 key_values => [ { name => 'cpu_30s' }, { name => 'display' } ],
                 output_template => '30s : %s %%',
                 perfdatas => [
@@ -42,7 +42,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'cpu-1m', nlabel => 'cpu.utilization.1m.average', set => {
+        { label => 'cpu-1m', nlabel => 'cpu.utilization.1m.percentage', set => {
                 key_values => [ { name => 'cpu_1m' }, { name => 'display' } ],
                 output_template => '1m : %s %%',
                 perfdatas => [
diff --git a/network/a10/ax/snmp/mode/vserverusage.pm b/network/a10/ax/snmp/mode/vserverusage.pm
index 28dcfa9a0..0b2f85e1b 100644
--- a/network/a10/ax/snmp/mode/vserverusage.pm
+++ b/network/a10/ax/snmp/mode/vserverusage.pm
@@ -76,7 +76,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'traffic-in', nlabel => 'virtualserver.traffic.in.bitsperseconds', set => {
+        { label => 'traffic-in', nlabel => 'virtualserver.traffic.in.bitspersecond', set => {
                 key_values => [ { name => 'axVirtualServerStatBytesIn', diff => 1 }, { name => 'display' } ],
                 per_second => 1, output_change_bytes => 2,
                 output_template => 'Traffic In : %s %s/s',
@@ -86,7 +86,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'traffic-out', nlabel => 'virtualserver.traffic.out.bitsperseconds', set => {
+        { label => 'traffic-out', nlabel => 'virtualserver.traffic.out.bitspersecond', set => {
                 key_values => [ { name => 'axVirtualServerStatBytesOut', diff => 1 }, { name => 'display' } ],
                 per_second => 1, output_change_bytes => 2,
                 output_template => 'Traffic Out : %s %s/s',
diff --git a/network/aerohive/snmp/mode/connectedusers.pm b/network/aerohive/snmp/mode/connectedusers.pm
index 6f2f7be3b..72b1914d2 100644
--- a/network/aerohive/snmp/mode/connectedusers.pm
+++ b/network/aerohive/snmp/mode/connectedusers.pm
@@ -33,7 +33,7 @@ sub set_counters {
         { name => 'ssid', type => 1, cb_prefix_output => 'prefix_ssid_output', message_multiple => 'All users by SSID are ok' },
     ];
     $self->{maps_counters}->{global} = [
-        { label => 'total', nlabel => 'users.total.count', set => {
+        { label => 'total', nlabel => 'users.current.count', set => {
                 key_values => [ { name => 'total' } ],
                 output_template => 'Total Users : %s',
                 perfdatas => [
@@ -44,7 +44,7 @@ sub set_counters {
         },
     ];
     $self->{maps_counters}->{ssid} = [
-        { label => 'ssid', nlabel => 'ssid.users.total.count', set => {
+        { label => 'ssid', nlabel => 'ssid.users.cuurent.count', set => {
                 key_values => [ { name => 'total' }, { name => 'display' } ],
                 output_template => 'users : %s',
                 perfdatas => [