3 files changed, 5 insertions, 5 deletions

diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index c3085e1..2c89beb 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -7,7 +7,7 @@
 # Country Name (2 letter code) [AU]:UK
 # State or Province Name (full name) [Some-State]:Derbyshire
 # Locality Name (eg, city) []:Belper
-# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins
+# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins
 # Organizational Unit Name (eg, section) []:
 # Common Name (eg, YOUR name) []:Ton Voon
 # Email Address []:tonvoon@mac.com
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 1ef0b20..dafc34f 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -59,7 +59,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
 }
 
 # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
-$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp";
+$ENV{'MP_STATE_PATH'} ||= "/var/tmp";
 
 my $res;
 
@@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
 "And now have fun with with this: \"C:\\\\\"
 because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
 
-system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*");
+system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*");
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
 is($res->return_code, 0, "Returns OK");
 is($res->output, "No previous data to calculate rate - assume okay");
diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian
index 0d7d7bc..37a2d35 100644
--- a/plugins/tests/var/ps_axwo.debian
+++ b/plugins/tests/var/ps_axwo.debian
@@ -31,7 +31,7 @@ S        0  6907     1  2308  892  0.0 mysqld_safe      /bin/sh /usr/bin/mysqld_
 S      103  6944  6907 123220 27724  0.0 mysqld         /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock
 S        0  6945  6907  1488  420  0.0 logger           logger -p daemon.err -t mysqld_safe -i -t mysqld
 S     1001 17778     1  6436 1588  0.0 snmpd            /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid
-Ss       0 17789     1  9496 5556  0.0 snmptrapd        /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid
+Ss       0 17789     1  9496 5556  0.0 snmptrapd        /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid
 Ss       0   847  2319 14452 1752  0.0 sshd             sshd: tonvoon [priv]
 S     1000   857   847 14616 1832  0.0 sshd             sshd: tonvoon@pts/3
 Ss    1000   860   857  2984 1620  0.0 bash             -bash
@@ -79,6 +79,6 @@ Ss    1001 23783     1  3220  764  0.0 ndo2db           /usr/local/nagios/bin/nd
 Ss    1001 23784     1  6428 4948  0.0 import_ndologsd  import_ndologsd
 S+    1001  9803 18955  4132 1936  0.0 ssh              ssh altinity@cube02.lei.altinity
 S     1001 22505 22324 20256 1616  0.0 nagios           ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg
-S     1001 22506 22505  1676  608  0.0 check_ping       /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1
+S     1001 22506 22505  1676  608  0.0 check_ping       /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1
 S     1001 22507 22506  1660  492  0.0 ping             /bin/ping -n -U -w 10 -c 1 192.168.10.23
 R+    1001 22508 23370  2308  680  0.0 ps               ps axwo stat uid pid ppid vsz rss pcpu comm args