diff --git a/network/cisco/aci/apic/restapi/custom/api.pm b/network/cisco/aci/apic/restapi/custom/api.pm
index 3309ba4d9..110be3c1e 100644
--- a/network/cisco/aci/apic/restapi/custom/api.pm
+++ b/network/cisco/aci/apic/restapi/custom/api.pm
@@ -135,40 +135,15 @@ sub settings {
     $self->{http}->set_options(%{$self->{option_results}});
 }
 
-sub refresh_token {
-    my ($self, %options) = @_;
-
-    $self->settings();
-
-    my $content = $self->{http}->request(method => 'GET', url_path => '/api/aaaRefresh.json');
-
-    my $decoded;
-    eval {
-        $decoded = JSON::XS->new->utf8->decode($content);
-    };
-    if (defined($decoded->{imdata}->[0]->{error}->{attributes}) && $decoded->{imdata}->[0]->{error}->{attributes}->{code} == 403
-       && $decoded->{imdata}->[0]->{error}->{attributes}->{text} eq 'Token was invalid (Error: Token timeout)') {
-       return 1
-    }
-
-    return 0
-}
-
 sub get_access_token {
     my ($self, %options) = @_;
 
     my $has_cache_file = $options{statefile}->read(statefile => 'cisco_aci_apic_' . md5_hex($self->{hostname}) . '_' . md5_hex($self->{username}));
     my $expires_on = $options{statefile}->get(name => 'expires_on');
     my $access_token = $options{statefile}->get(name => 'access_token');
-    my $refresh_timeout = $options{statefile}->get(name => 'refresh_timeout');
     my $last_timestamp = $options{statefile}->get(name => 'last_timestamp');
-    my $renew_token = 0;
 
-    if (defined($last_timestamp) && (time() - $last_timestamp > 400) && (time() - $last_timestamp < $refresh_timeout)) {
-        $renew_token = $self->refresh_token();
-    }
-
-    if ($has_cache_file == 0 || !defined($access_token) || (($expires_on - time()) < 10) || $renew_token == 1) {
+    if ($has_cache_file == 0 || !defined($access_token) || (($expires_on - time()) < 10)) {
         my $login = { aaaUser => { attributes => { name => $self->{username}, pwd => $self->{password} } } };
         my $post_json = JSON::XS->new->utf8->encode($login);
 
@@ -191,17 +166,15 @@ sub get_access_token {
         }
         if (defined($decoded->{imdata}->[0]->{error}->{attributes})) {
             $self->{output}->add_option_msg(short_msg => "Error '" . uc($decoded->{imdata}->[0]->{error}->{attributes}->{code}) . " "
-                         . $decoded->{imdata}->[0]->{error}->{attributes}->{text} . "'");
+                . $decoded->{imdata}->[0]->{error}->{attributes}->{text} . "'");
             $self->{output}->option_exit();
         }
 
         $access_token = $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{token};
         my $datas = {
             last_timestamp => time(),
-            refresh_timeout => $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{refreshTimeoutSeconds},
             access_token => $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{token}, 
-            expires_on => $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{creationTime}
-                + $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{maximumLifetimeSeconds}
+            expires_on => time() + $decoded->{imdata}->[0]->{aaaLogin}->{attributes}->{refreshTimeoutSeconds}
         };
         $options{statefile}->write(data => $datas);
     }
diff --git a/network/cisco/aci/apic/restapi/mode/fabric.pm b/network/cisco/aci/apic/restapi/mode/fabric.pm
index bdbac6641..239d1a67b 100644
--- a/network/cisco/aci/apic/restapi/mode/fabric.pm
+++ b/network/cisco/aci/apic/restapi/mode/fabric.pm
@@ -39,7 +39,7 @@ sub custom_health_perfdata {
     foreach ('current', 'previous') {
         $self->{output}->perfdata_add(
             label => $_,
-            nlabel => 'fabric.health.' . $_, 
+            nlabel => 'fabric.health.' . $_ . '.percentage', 
             instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{dn} : undef,
             value => $self->{result_values}->{$_},
             unit => '%', min => 0, max => 100
diff --git a/network/cisco/aci/apic/restapi/mode/node.pm b/network/cisco/aci/apic/restapi/mode/node.pm
index a8b033e27..3dcd4a643 100644
--- a/network/cisco/aci/apic/restapi/mode/node.pm
+++ b/network/cisco/aci/apic/restapi/mode/node.pm
@@ -34,7 +34,7 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{nodes} = [
-        { label => 'health-current', nlabel => 'node.health.current', set => {
+        { label => 'health-current', nlabel => 'node.health.current.percentage', set => {
                 key_values => [ { name => 'current' }, { name => 'dn' } ],
                 output_template => 'current: %s %%', output_error_template => "current: %s %%",
                 perfdatas => [
@@ -43,7 +43,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'health-minimum', nlabel => 'node.health.minimum', set => {
+        { label => 'health-minimum', nlabel => 'node.health.minimum.percentage', set => {
                 key_values => [ { name => 'min' }, { name => 'dn' } ],
                 output_template => 'min: %s %%', output_error_template => "min: %s %%",
                 perfdatas => [
@@ -52,7 +52,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'health-average', nlabel => 'node.health.average', set => {
+        { label => 'health-average', nlabel => 'node.health.average.percentage', set => {
                 key_values => [ { name => 'avg' }, { name => 'dn' } ],
                 output_template => 'average: %s %%', output_error_template => "average %s %%",
                 perfdatas => [
diff --git a/network/cisco/aci/apic/restapi/mode/tenant.pm b/network/cisco/aci/apic/restapi/mode/tenant.pm
index 86ddf1a7a..34856e43d 100644
--- a/network/cisco/aci/apic/restapi/mode/tenant.pm
+++ b/network/cisco/aci/apic/restapi/mode/tenant.pm
@@ -39,7 +39,7 @@ sub custom_health_perfdata {
     foreach ('current', 'previous') {
         $self->{output}->perfdata_add(
             label => $_,
-            nlabel => 'tenant.health.' . $_, 
+            nlabel => 'tenant.health.' . $_ . '.percentage', 
             instances => $self->use_instances(extra_instance => $options{extra_instance}) ? $self->{result_values}->{dn} : undef,
             value => $self->{result_values}->{$_},
             unit => '%', min => 0, max => 100