diff --git a/packaging/centreon-plugin-Network-Routers-Juniper-Mseries-Snmp/pkg.json b/packaging/centreon-plugin-Network-Routers-Juniper-Mseries-Snmp/pkg.json
index ee7fd9b96..cc3ce5916 100644
--- a/packaging/centreon-plugin-Network-Routers-Juniper-Mseries-Snmp/pkg.json
+++ b/packaging/centreon-plugin-Network-Routers-Juniper-Mseries-Snmp/pkg.json
@@ -1,7 +1,7 @@
 {
     "pkg_name": "centreon-plugin-Network-Routers-Juniper-Mseries-Snmp",
     "pkg_summary": "Centreon Plugin",
-    "plugin_name": "centreon_juniper_mseries.pl",
+    "plugin_name": "centreon_juniper_mseries_snmp.pl",
     "files": [
         "centreon/plugins/script_snmp.pm",
         "centreon/plugins/snmp.pm",
diff --git a/src/network/juniper/common/junos/netconf/mode/ldp.pm b/src/network/juniper/common/junos/netconf/mode/ldp.pm
index 46e51175d..612230cda 100644
--- a/src/network/juniper/common/junos/netconf/mode/ldp.pm
+++ b/src/network/juniper/common/junos/netconf/mode/ldp.pm
@@ -276,7 +276,7 @@ You can use the following variables: C<%{id}>, C<%{remoteAddress}>, C<%{connecti
 
 =item B<--critical-status>
 
-Define the conditions to match for the status to be CRITICAL (default: C<'%{lspState} !~ /up/i'>).
+Define the conditions to match for the status to be CRITICAL (default: C<'%{connectionState} !~ /open$/i || %{sessionState} !~ /operational/i'>).
 You can use the following variables: C<%{id}>, C<%{remoteAddress}>, C<%{connectionState}>, C<%{sessionState}>
 
 =item B<--warning-ldp-session-messages-address-received>
diff --git a/src/network/juniper/ggsn/snmp/plugin.pm b/src/network/juniper/ggsn/snmp/plugin.pm
index c5aefe6fc..9b4342ebe 100644
--- a/src/network/juniper/ggsn/snmp/plugin.pm
+++ b/src/network/juniper/ggsn/snmp/plugin.pm
@@ -30,8 +30,8 @@ sub new {
     bless $self, $class;
 
     $self->{modes} = {
-        'apn-stats'    => 'network::juniper::ggsn::mode::apnstats',
-        'global-stats' => 'network::juniper::ggsn::mode::globalstats'
+        'apn-stats'    => 'network::juniper::ggsn::snmp::mode::apnstats',
+        'global-stats' => 'network::juniper::ggsn::snmp::mode::globalstats'
     };
 
     return $self;
diff --git a/src/network/juniper/srx/snmp/plugin.pm b/src/network/juniper/srx/snmp/plugin.pm
index 530ab6eea..d9727ab14 100644
--- a/src/network/juniper/srx/snmp/plugin.pm
+++ b/src/network/juniper/srx/snmp/plugin.pm
@@ -35,10 +35,10 @@ sub new {
         'cpu-forwarding'    => 'network::juniper::common::junos::snmp::mode::cpuforwarding', # packet forwarding engine
         'memory'            => 'network::juniper::common::junos::snmp::mode::memory',
         'memory-forwarding' => 'network::juniper::common::junos::snmp::mode::memoryforwarding', # packet forwarding engine
-        'cp-sessions'       => 'network::juniper::common::junos::mode::snmp::cpsessions', # CP = 'central point'
-        'flow-sessions'     => 'network::juniper::common::junos::mode::snmp::flowsessions',
-        'interfaces'        => 'network::juniper::common::junos::mode::snmp::interfaces',
-        'ipsec-tunnel'      => 'network::juniper::common::junos::mode::snmp::ipsectunnel',
+        'cp-sessions'       => 'network::juniper::common::junos::snmp::mode::cpsessions', # CP = 'central point'
+        'flow-sessions'     => 'network::juniper::common::junos::snmp::mode::flowsessions',
+        'interfaces'        => 'network::juniper::common::junos::snmp::mode::interfaces',
+        'ipsec-tunnel'      => 'network::juniper::common::junos::snmp::mode::ipsectunnel',
         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
         'list-storages'     => 'snmp_standard::mode::liststorages',
         'storage'           => 'snmp_standard::mode::storage'
diff --git a/tests/network/juniper/mseries/netconf/interfaces.robot b/tests/network/juniper/mseries/netconf/interfaces.robot
index 03f4ebda3..e50205e7f 100644
--- a/tests/network/juniper/mseries/netconf/interfaces.robot
+++ b/tests/network/juniper/mseries/netconf/interfaces.robot
@@ -39,6 +39,8 @@ Interface ${tc}
             ...    WARNING: Interface 'ge-0/2/0' status : down (admin: up) - Interface 'ge-0/2/0.199' status : down (admin: up) - Interface 'ge-0/2/0.32767' status : down (admin: up) - Interface 'ge-0/2/7' status : down (admin: up) - Interface 'ge-0/2/8' status : down (admin: up) - Interface 'ge-0/2/9' status : down (admin: up) - Interface 'ge-0/3/0' status : down (admin: up) - Interface 'ge-0/3/0.0' status : down (admin: up) - Interface 'ge-0/3/1' status : down (admin: up) - Interface 'ge-0/3/1.2301' status : down (admin: up) - Interface 'ge-0/3/1.32767' status : down (admin: up) - Interface 'ge-0/3/1.4002' status : down (admin: up) - Interface 'ge-0/3/2' status : down (admin: down) - Interface 'ge-0/3/2.2301' status : down (admin: down) - Interface 'ge-0/3/2.32767' status : down (admin: down) - Interface 'ge-0/3/2.4002' status : down (admin: down) - Interface 'ge-0/3/4' status : down (admin: up) - Interface 'ge-0/3/4.118' status : down (admin: up) - Interface 'ge-0/3/4.32767' status : down (admin: up) - Interface 'ge-0/3/5' status : down (admin: up) - Interface 'ge-0/3/5.32767' status : down (admin: up) - Interface 'ge-0/3/5.4002' status : down (admin: up) - Interface 'ge-0/3/6' status : down (admin: up) - Interface 'ge-0/3/7' status : down (admin: up) - Interface 'ge-0/3/8' status : down (admin: up) - Interface 'ge-0/3/9' status : down (admin: up) - Interface 'xe-2/0/3' status : down (admin: up) - Interface 'xe-2/0/3.16386' status : down (admin: up)
             ...    7     --critical-status='\\\%{opstatus} eq "down"'
             ...    CRITICAL: Interface 'ge-0/2/0' status : down (admin: up) - Interface 'ge-0/2/0.199' status : down (admin: up) - Interface 'ge-0/2/0.32767' status : down (admin: up) - Interface 'ge-0/2/7' status : down (admin: up) - Interface 'ge-0/2/8' status : down (admin: up) - Interface 'ge-0/2/9' status : down (admin: up) - Interface 'ge-0/3/0' status : down (admin: up) - Interface 'ge-0/3/0.0' status : down (admin: up) - Interface 'ge-0/3/1' status : down (admin: up) - Interface 'ge-0/3/1.2301' status : down (admin: up) - Interface 'ge-0/3/1.32767' status : down (admin: up) - Interface 'ge-0/3/1.4002' status : down (admin: up) - Interface 'ge-0/3/2' status : down (admin: down) - Interface 'ge-0/3/2.2301' status : down (admin: down) - Interface 'ge-0/3/2.32767' status : down (admin: down) - Interface 'ge-0/3/2.4002' status : down (admin: down) - Interface 'ge-0/3/4' status : down (admin: up) - Interface 'ge-0/3/4.118' status : down (admin: up) - Interface 'ge-0/3/4.32767' status : down (admin: up) - Interface 'ge-0/3/5' status : down (admin: up) - Interface 'ge-0/3/5.32767' status : down (admin: up) - Interface 'ge-0/3/5.4002' status : down (admin: up) - Interface 'ge-0/3/6' status : down (admin: up) - Interface 'ge-0/3/7' status : down (admin: up) - Interface 'ge-0/3/8' status : down (admin: up) - Interface 'ge-0/3/9' status : down (admin: up) - Interface 'xe-2/0/3' status : down (admin: up) - Interface 'xe-2/0/3.16386' status : down (admin: up)
+            ...    8     --filter-use=name --filter-interface=ge-0/2/0
+            ...    CRITICAL: Interface 'ge-0/2/0' status : down (admin: up) - Interface 'ge-0/2/0.199' status : down (admin: up) - Interface 'ge-0/2/0.32767' status : down (admin: up)
 
 Interface regex ${tc}
     [Tags]    network    juniper    mseries    netconf