diff --git a/apps/protocols/http/mode/expectedcontent.pm b/apps/protocols/http/mode/expectedcontent.pm
index a489df549..b848e9ab5 100644
--- a/apps/protocols/http/mode/expectedcontent.pm
+++ b/apps/protocols/http/mode/expectedcontent.pm
@@ -26,12 +26,12 @@ use strict;
 use warnings;
 use centreon::plugins::http;
 use Time::HiRes qw(gettimeofday tv_interval);
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub custom_content_threshold {
     my ($self, %options) = @_;
 
-    $self->{instance_mode}->{content_status} = catalog_status_threshold($self, %options);
+    $self->{instance_mode}->{content_status} = catalog_status_threshold_ng($self, %options);
     return $self->{instance_mode}->{content_status};
 }
 
@@ -74,30 +74,30 @@ sub set_counters {
                 closure_custom_threshold_check =>  $self->can('custom_content_threshold'),
             }
         },
-        { label => 'size', display_ok => 0, set => {
+        { label => 'size', nlabel => 'http.content.size.bytes', display_ok => 0, set => {
                 key_values => [ { name => 'size' } ],
                 output_template => 'Content size : %s',
                 perfdatas => [
-                    { label => 'size', value => 'size', template => '%s', min => 0, unit => 'B' },
-                ],
+                    { label => 'size', template => '%s', min => 0, unit => 'B' }
+                ]
             }
         },
-        { label => 'time', display_ok => 0, set => {
+        { label => 'time', nlabel => 'http.response.time.seconds', display_ok => 0, set => {
                 key_values => [ { name => 'time' } ],
                 output_template => 'Response time : %.3fs',
                 perfdatas => [
-                    { label => 'time', value => 'time', template => '%.3f', min => 0, unit => 's' },
-                ],
+                    { label => 'time', template => '%.3f', min => 0, unit => 's' }
+                ]
             }
         },
-        { label => 'extracted', display_ok => 0, set => {
+        { label => 'extracted', nlabel => 'http.extracted.value', display_ok => 0, set => {
                 key_values => [ { name => 'extracted' } ],
                 output_template => 'Extracted value : %s',
                 perfdatas => [
-                    { label => 'value', value => 'extracted', template => '%s' },
-                ],
+                    { label => 'value', template => '%s' }
+                ]
             }
-        },
+        }
     ];
 }
 
diff --git a/apps/protocols/http/mode/response.pm b/apps/protocols/http/mode/response.pm
index 99a291f83..76ba0b80d 100644
--- a/apps/protocols/http/mode/response.pm
+++ b/apps/protocols/http/mode/response.pm
@@ -24,7 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng catalog_status_calc);
 use Time::HiRes qw(gettimeofday tv_interval);
 use centreon::plugins::http;
 
@@ -49,7 +49,7 @@ sub set_counters {
                 closure_custom_calc => \&catalog_status_calc,
                 closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold
+                closure_custom_threshold_check => \&catalog_status_threshold_ng
             }
         },
         { label => 'time', nlabel => 'http.response.time.seconds', set => {
diff --git a/apps/protocols/http/plugin.pm b/apps/protocols/http/plugin.pm
index 22fe46f30..b48c5c3e5 100644
--- a/apps/protocols/http/plugin.pm
+++ b/apps/protocols/http/plugin.pm
@@ -30,12 +30,12 @@ sub new {
     bless $self, $class;
 
     $self->{version} = '0.1';
-    %{$self->{modes}} = (
-        'expected-content'  => 'apps::protocols::http::mode::expectedcontent',
-        'json-content'      => 'apps::protocols::http::mode::jsoncontent',
-        'response'          => 'apps::protocols::http::mode::response',
-        'soap-content'      => 'apps::protocols::http::mode::soapcontent',
-    );
+    $self->{modes} = (
+        'expected-content' => 'apps::protocols::http::mode::expectedcontent',
+        'json-content'     => 'apps::protocols::http::mode::jsoncontent',
+        'response'         => 'apps::protocols::http::mode::response',
+        'soap-content'     => 'apps::protocols::http::mode::soapcontent'
+    };
 
     return $self;
 }