Moved probes, matchers and ciscoRttMonMIB modules to lib/Smokeping.

34 files changed, 205 insertions, 202 deletions

diff --git a/Makefile b/Makefile
index c28b6ac..299386a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ GROFF = groff
 
 POD := $(wildcard doc/*.pod)
 PM :=  lib/ISG/ParseConfig.pm lib/Smokeping.pm 
-PODPROBE :=  $(wildcard lib/probes/*.pm)
-PODMATCH :=  $(wildcard lib/matchers/*.pm)
+PODPROBE :=  $(wildcard lib/Smokeping/probes/*.pm)
+PODMATCH :=  $(wildcard lib/Smokeping/matchers/*.pm)
 
 BASE = $(subst .pod,,$(POD)) \
 	$(subst .pm,,$(subst lib/,doc/,$(PM))) \
-	$(subst .pm,,$(subst lib/probes,doc/probes,$(PODPROBE))) \
+	$(subst .pm,,$(subst lib/Smokeping/probes,doc/probes,$(PODPROBE))) \
 	$(addprefix doc/matchers/,$(subst .pm,,$(notdir $(PODMATCH)))) \
 	doc/smokeping
 MAN = $(addsuffix .1,$(BASE))
@@ -30,13 +30,13 @@ doc/%.1: doc/%.pod
 	$(POD2MAN)
 doc/%.1: lib/%.pm
 	$(POD2MAN)
-doc/probes/%.pod: lib/probes/%.pm
-	$(MAKEPOD) probes::$* > $@
+doc/probes/%.pod: lib/Smokeping/probes/%.pm
+	$(MAKEPOD) Smokeping::probes::$* > $@
 doc/probes/%.1: doc/probes/%.pod
 	$(POD2MAN)
-doc/matchers/%.1: lib/matchers/%
+doc/matchers/%.1: lib/Smokeping/matchers/%.pm
 	$(POD2MAN)
-doc/%.1: lib/ISG/%
+doc/ISG/%.1: lib/Smokeping/ISG/%
 	$(POD2MAN)
 doc/smokeping.1: bin/smokeping.dist
 	$(POD2MAN)
@@ -47,8 +47,11 @@ doc/%.html: lib/%.pm
 	$(POD2HTML)
 doc/probes/%.html: doc/probes/%.pod
 	$(POD2HTML)
-doc/matchers/%.html: lib/matchers/%
+doc/matchers/%.html: lib/Smokeping/matchers/%.pm
 	$(POD2HTML)
+doc/ISG/%.html: lib/Smokeping/ISG/%
+	$(POD2MAN)
+
 doc/smokeping.html: bin/smokeping.dist
 	$(POD2MAN)
 
diff --git a/doc/smokeping_extend.pod b/doc/smokeping_extend.pod
index 536ac77..4d3f24d 100644
--- a/doc/smokeping_extend.pod
+++ b/doc/smokeping_extend.pod
@@ -17,17 +17,17 @@ source of this document are most appreciated.
 
 The first thing you should decide is which base class you should
 use for your probe. For most (if not all) uses it's a choice between
-C<probes::base> and C<probes::basefork>. The former is intended for probes
+C<Smokeping::probes::base> and C<Smokeping::probes::basefork>. The former is intended for probes
 that can measure their targets all in one go, while the latter is for
 probing them one at a time, possibly in several concurrent subprocesses.
 
-At the moment, the only probes that use C<probes::base> are the FPing
-derivatives. All the others use C<probes::basefork>, and chances are
+At the moment, the only probes that use C<Smokeping::probes::base> are the FPing
+derivatives. All the others use C<Smokeping::probes::basefork>, and chances are
 you should too. This document will thus concentrate on the latter case.
 
 =head1 SKELETON FILE
 
-The C<probes::skel> module is a non-functional probe that is intended
+The C<Smokeping::probes::skel> module is a non-functional probe that is intended
 to make a good basis for a new probe module. Copy the file, 
 C<lib/probes/skel.pm>, to a new name and just fill out the blanks :)
 Note that real probe modules must have at least one capital letter
@@ -63,7 +63,7 @@ C<probevars> method for probe-specific variables and a C<targetvars>
 method for target-specific variables. If you don't know the difference
 between these yet, see the L<smokeping_examples> document.
 
-(The probes that are derived from C<probes::base> don't support
+(The probes that are derived from C<Smokeping::probes::base> don't support
 target-specific variables, so they only use the C<probevars> method.)
 
 The base classes offer these methods too to provide the variables that
@@ -88,7 +88,7 @@ convenience method called C<_makevars> that does this, and the common idiom is
 The variables are declared in a syntax that comes from the module used
 for parsing the configuration file, C<ISG::ParseConfig>. Each variable
 should be a hash that uses the "special variable keys" documented in
-the C<ISG::ParseConfig> manual. See the C<probes::skel> and the other
+the C<ISG::ParseConfig> manual. See the C<Smokeping::probes::skel> and the other
 probes for examples. 
 
 For reference, here are the keys the hash should have. Much of this
@@ -154,13 +154,13 @@ If you must do something at probe initialization time, like check that
 the external program you're going to use behaves as you expect, you should
 do it in the C<new> method. You should probably also take care that
 you don't run the tests needlessly while in CGI mode. The usual way to 
-do this is to test for $ENV{SERVER_SOFTWARE}. See the C<probes::skel>
+do this is to test for $ENV{SERVER_SOFTWARE}. See the C<Smokeping::probes::skel>
 module for an example.
 
 =head1 PINGING
 
 All the real action happens in the C<pingone> method (or, for
-C<probes::base>-derived probes, in the C<ping> method.) The arguments
+C<Smokeping::probes::base>-derived probes, in the C<ping> method.) The arguments
 for C<pingone> are C<$self>, the module instance (since this is a method)
 and C<$target>, the target to be probed.
 
@@ -191,7 +191,7 @@ speak up if you think you'd use it.
 If you deal with timeouts (for example because your program offers a parameter
 for specifying the timeout for the pings), you should know a few things.
 
-First, there's timeout logic in C<probes::basefork> that kills the probe
+First, there's timeout logic in C<Smokeping::probes::basefork> that kills the probe
 when the timeout is reached. By default the timeout is (# of pings *
 5 seconds) + 1 second. If you expect that your pings can take longer,
 you should modify the default value of the probe-specific variable C<timeout>.
@@ -208,14 +208,14 @@ This would be done like this:
 
 If you want to provide a target-specific C<timeout> setting, you should
 delete the probe-specific variable and be sure to provide a default for
-your target-specific one. See eg. C<probes::AnotherDNS> for an example of
+your target-specific one. See eg. C<Smokeping::probes::AnotherDNS> for an example of
 how this is done. 
 
 Providing a target-specific C<timeout> will make the timeout in
-C<probes::basefork> be (# of pings * the maximum timeout of all targets)
+C<Smokeping::probes::basefork> be (# of pings * the maximum timeout of all targets)
 + 1 second. The 1 second is added so that the own timeout logic of the
 probe has time to kick in even in the worst case (ie. all pings are lost)
-before C<probes::basefork> starts killing the processes.
+before C<Smokeping::probes::basefork> starts killing the processes.
 
 =head1 COPYRIGHT
 
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 0606467..7bd0c3c 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -36,12 +36,12 @@ my $logging = 0; # keeps track of whether we have a logging method enabled
 
 sub find_probedir {
 	# find the directory where the probe modules are located
-	# by looking for 'probes/FPing.pm' in @INC
+	# by looking for 'Smokeping/probes/FPing.pm' in @INC
 	# 
 	# yes, this is ugly. Suggestions welcome.
 	for (@INC) {
-		-f "$_/probes/FPing.pm" or next;
-		return "$_/probes";
+		-f "$_/Smokeping/probes/FPing.pm" or next;
+		return "$_/Smokeping/probes";
 	}
 	return undef;
 }
@@ -73,7 +73,7 @@ sub load_probe ($$$$) {
 	my $name = shift;
 	$name = $modname unless defined $name;
 	my $rv;
-	eval '$rv = probes::'.$modname.'->new( $properties,$cfg,$name);';
+	eval '$rv = Smokeping::probes::'.$modname.'->new( $properties,$cfg,$name);';
         die "$@\n" if $@;
         die "Failed to load Probe $name (module $modname)\n" unless defined $rv;
 	return $rv;
@@ -184,10 +184,10 @@ sub init_alerts ($){
 		or die "ERROR: Alert $al pattern entry '$_' is invalid\n";
 	    my $matcher = $1;
 	    my $arg = $2;
-	    eval 'require matchers::'.$matcher;
+	    eval 'require Smokeping::matchers::'.$matcher;
 	    die "Matcher '$matcher' could not be loaded: $@\n" if $@;
 	    my $hand;
-	    eval "\$hand = matchers::$matcher->new($arg)";
+	    eval "\$hand = Smokeping::matchers::$matcher->new($arg)";
   	    die "ERROR: Matcher '$matcher' could not be instantiated\nwith arguments $arg:\n$@\n" if $@;
 	    $x->{length} = $hand->Length;
 	    $x->{sub} = sub { $hand->Test(shift) } ;
@@ -1296,7 +1296,7 @@ DOC
 		my ($re, $name, $grammar) = @_;
 
 		# load the probe module
-		my $class = "probes::$name";
+		my $class = "Smokeping::probes::$name";
 		eval "require $class";
 		die "require $class failed: $@\n" if $@;
 
diff --git a/lib/ciscoRttMonMIB.pm b/lib/Smokeping/ciscoRttMonMIB.pm
index 8b0abb4..88b4280 100644
--- a/lib/ciscoRttMonMIB.pm
+++ b/lib/Smokeping/ciscoRttMonMIB.pm
@@ -5,7 +5,7 @@
 # Joerg Kummer, 10/9/03
 #
 
-package ciscoRttMonMIB;
+package Smokeping::ciscoRttMonMIB;
 
 require 5.004;
 
diff --git a/lib/matchers/avgratio.pm b/lib/Smokeping/matchers/avgratio.pm
index 401845d..fab0164 100644
--- a/lib/matchers/avgratio.pm
+++ b/lib/Smokeping/matchers/avgratio.pm
@@ -1,8 +1,8 @@
-package matchers::avgratio;
+package Smokeping::matchers::avgratio;
 
 =head1 NAME
 
-matchers::avgratio - detect changes in average median latency
+Smokeping::matchers::avgratio - detect changes in average median latency
 
 =head1 OVERVIEW
  
@@ -89,7 +89,7 @@ use vars qw($VERSION);
 $VERSION = 1.0;
 
 use strict;
-use base qw(matchers::base);
+use base qw(Smokeping::matchers::base);
 use Carp;
 
 sub new(@)
diff --git a/lib/matchers/base.pm b/lib/Smokeping/matchers/base.pm
index 3631655..cd69871 100644
--- a/lib/matchers/base.pm
+++ b/lib/Smokeping/matchers/base.pm
@@ -1,8 +1,8 @@
-package matchers::base;
+package Smokeping::matchers::base;
 
 =head1 NAME
 
-matchers::base - Base Class for implementing SmokePing Matchers
+Smokeping::matchers::base - Base Class for implementing SmokePing Matchers
 
 =head1 OVERVIEW
  
diff --git a/lib/matchers/median.pm b/lib/Smokeping/matchers/median.pm
index 6b17bff..e8d43cf 100644
--- a/lib/matchers/median.pm
+++ b/lib/Smokeping/matchers/median.pm
@@ -1,8 +1,8 @@
-package matchers::median;
+package Smokeping::matchers::median;
 
 =head1 NAME
 
-matchers::median - Find persistant change in latency
+Smokeping::matchers::median - Find persistant change in latency
 
 =head1 OVERVIEW
 
@@ -51,7 +51,7 @@ Tobias Oetiker <tobi@oetiker.ch>
 =cut
 
 use strict;
-use base qw(matchers::base);
+use base qw(Smokeping::matchers::base);
 use vars qw($VERSION);
 $VERSION = 1.0;
 use Carp;
diff --git a/lib/probes/AnotherDNS.pm b/lib/Smokeping/probes/AnotherDNS.pm
index 9649514..6d5a63f 100644
--- a/lib/probes/AnotherDNS.pm
+++ b/lib/Smokeping/probes/AnotherDNS.pm
@@ -1,14 +1,14 @@
-package probes::AnotherDNS;
+package Smokeping::probes::AnotherDNS;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::AnotherDNS>
+C<smokeping -man Smokeping::probes::AnotherDNS>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::AnotherDNS>
+C<smokeping -makepod Smokeping::probes::AnotherDNS>
 
 to generate the POD document.
 
@@ -26,7 +26,7 @@ $SIG{__DIE__} = sub { };
 eval("use Net::DNS;");
 $SIG{__DIE__} = $tmp;
 
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use IPC::Open3;
 use Symbol;
 use Carp;
@@ -37,7 +37,7 @@ use IO::Select;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::AnotherDNS - Alternate DNS Probe
+Smokeping::probes::AnotherDNS - Alternate DNS Probe
 DOC
 		description => <<DOC,
 Like DNS, but uses Net::DNS and Time::HiRes instead of dig. This probe does
diff --git a/lib/probes/AnotherSSH.pm b/lib/Smokeping/probes/AnotherSSH.pm
index 1de6644..c708de9 100644
--- a/lib/probes/AnotherSSH.pm
+++ b/lib/Smokeping/probes/AnotherSSH.pm
@@ -1,21 +1,21 @@
-package probes::AnotherSSH;
+package Smokeping::probes::AnotherSSH;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::AnotherSSH>
+C<smokeping -man Smokeping::probes::AnotherSSH>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::AnotherSSH>
+C<smokeping -makepod Smokeping::probes::AnotherSSH>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Carp;
 use Time::HiRes qw(sleep ualarm gettimeofday tv_interval);
 use IO::Select;
@@ -25,7 +25,7 @@ use Fcntl;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::AnotherSSH - Another SSH probe
+Smokeping::probes::AnotherSSH - Another SSH probe
 DOC
 		description => <<DOC,
 Latency measurement using SSH. This generates Logfile messages on the other 
diff --git a/lib/probes/CiscoRTTMonDNS.pm b/lib/Smokeping/probes/CiscoRTTMonDNS.pm
index 691a39a..0f16154 100644
--- a/lib/probes/CiscoRTTMonDNS.pm
+++ b/lib/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -1,33 +1,33 @@
-package probes::CiscoRTTMonDNS;
+package Smokeping::probes::CiscoRTTMonDNS;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::CiscoRTTMonDNS>
+C<smokeping -man Smokeping::probes::CiscoRTTMonDNS>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::CiscoRTTMonDNS>
+C<smokeping -makepod Smokeping::probes::CiscoRTTMonDNS>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Symbol;
 use Carp;
 use BER;
 use SNMP_Session;
 use SNMP_util "0.97";
-use ciscoRttMonMIB "0.2";
+use Smokeping::ciscoRttMonMIB "0.2";
 
 my $e = "=";
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::CiscoRTTMonDNS.pm - Probe for SmokePing
+Smokeping::probes::CiscoRTTMonDNS.pm - Probe for SmokePing
 DOC,
 		description => <<DOC,
 A probe for smokeping, which uses the ciscoRttMon MIB functionality ("Service Assurance Agent", "SAA") of Cisco IOS to time ( recursive, type A) DNS queries to a DNS server.
@@ -45,7 +45,7 @@ This probe only works with IOS 12.0(3)T or higher.  It is recommended to test it
 
 ${e}head2 INSTALLATION
 
-To install this probe copy ciscoRttMonMIB.pm to (\$SMOKEPINGINSTALLDIR)/lib and CiscoRTTMonDNS.pm to (\$SMOKEPINGINSTALLDIR)/lib/probes.
+To install this probe copy ciscoRttMonMIB.pm to (\$SMOKEPINGINSTALLDIR)/lib/Smokeping and CiscoRTTMonDNS.pm to (\$SMOKEPINGINSTALLDIR)/lib/Smokeping/probes.
 
 The router(s) must be configured to allow read/write SNMP access. Sufficient is:
 
diff --git a/lib/probes/CiscoRTTMonEchoICMP.pm b/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm
index c497ed9..550921f 100644
--- a/lib/probes/CiscoRTTMonEchoICMP.pm
+++ b/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm
@@ -1,33 +1,33 @@
-package probes::CiscoRTTMonEchoICMP;
+package Smokeping::probes::CiscoRTTMonEchoICMP;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::CiscoRTTMonEchoICMP>
+C<smokeping -man Smokeping::probes::CiscoRTTMonEchoICMP>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::CiscoRTTMonEchoICMP>
+C<smokeping -makepod Smokeping::probes::CiscoRTTMonEchoICMP>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Symbol;
 use Carp;
 use BER;
 use SNMP_Session;
 use SNMP_util "0.97";
-use ciscoRttMonMIB "0.2";
+use Smokeping::ciscoRttMonMIB "0.2";
 
 sub pod_hash {
 	my $e = "=";
 	return {
 		name => <<DOC,
-probes::CiscoRTTMonEchoICMP - Probe for SmokePing
+Smokeping::probes::CiscoRTTMonEchoICMP - Probe for SmokePing
 DOC
 		description => <<DOC,
 A probe for smokeping, which uses the ciscoRttMon MIB functionality ("Service Assurance Agent", "SAA") of Cisco IOS to measure ICMP echo ("ping") roundtrip times between a Cisco router and any IP address. 
@@ -44,7 +44,7 @@ Aug 20 07:35:15: %RTT-3-SemaphoreInUse: %RTR: Could not obtain a lock for RTR. P
 
 ${e}head2 INSTALLATION
 
-To install this probe copy ciscoRttMonMIB.pm files to (\$SMOKEPINGINSTALLDIR)/lib and CiscoRTTMonEchoICMP.pm to (\$SMOKEPINGINSTALLDIR)/lib/probes. V0.97 or higher of Simon Leinen's SNMP_Session.pm is required.
+To install this probe copy ciscoRttMonMIB.pm files to (\$SMOKEPINGINSTALLDIR)/lib/Smokeping and CiscoRTTMonEchoICMP.pm to (\$SMOKEPINGINSTALLDIR)/lib/Smokeping/probes. V0.97 or higher of Simon Leinen's SNMP_Session.pm is required.
 
 The router(s) must be configured to allow read/write SNMP access. Sufficient is:
 
diff --git a/lib/probes/CiscoRTTMonTcpConnect.pm b/lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm
index 84f2fe6..d11f76b 100644
--- a/lib/probes/CiscoRTTMonTcpConnect.pm
+++ b/lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm
@@ -1,33 +1,33 @@
-package probes::CiscoRTTMonTcpConnect;
+package Smokeping::probes::CiscoRTTMonTcpConnect;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::CiscoRTTMonTcpConnect>
+C<smokeping -man Smokeping::probes::CiscoRTTMonTcpConnect>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::CiscoRTTMonTcpConnect>
+C<smokeping -makepod Smokeping::probes::CiscoRTTMonTcpConnect>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Symbol;
 use Carp;
 use BER;
 use SNMP_Session;
 use SNMP_util "0.97";
-use ciscoRttMonMIB "0.2";
+use Smokeping::ciscoRttMonMIB "0.2";
 
 sub pod_hash {
 	my $e = "=";
 	return {
 		name => <<DOC,
-probes::CiscoRTTMonTcpConnect - Probe for SmokePing
+Smokeping::probes::CiscoRTTMonTcpConnect - Probe for SmokePing
 DOC
 		description => <<DOC,
 A probe for smokeping, which uses the ciscoRttMon MIB functionality ("Service Assurance Agent", "SAA") of Cisco IOS to measure TCP connect times between a Cisco router and a TCP server. The measured value is the time is the time to establish a TCP session, i.e. the time between the initial "SYN" TCP packet of the router and the "SYN ACK" packet of the host. The router terminates the TCP session immediately after the reception of "SYN ACK" with a "FIN" packet.
@@ -39,7 +39,7 @@ This probe only works with Cisco IOS 12.0(3)T or higher. It is recommended to te
 
 ${e}head2 INSTALLATION
 
-To install this probe copy ciscoRttMonMIB.pm to (\$SMOKEPINGINSTALLDIR)/lib and CiscoRTTMonTcpConnect.pm to (\$SMOKEPINGINSTALLDIR)/lib/probes. V0.97 or higher of Simon Leinen's SNMP_Session.pm is required.
+To install this probe copy ciscoRttMonMIB.pm to (\$SMOKEPINGINSTALLDIR)/Smokeping/lib and CiscoRTTMonTcpConnect.pm to (\$SMOKEPINGINSTALLDIR)/lib/Smokeping/probes. V0.97 or higher of Simon Leinen's SNMP_Session.pm is required.
 
 The router(s) must be configured to allow read/write SNMP access. Sufficient is:
 
diff --git a/lib/probes/Curl.pm b/lib/Smokeping/probes/Curl.pm
index c7aaccb..2bbf476 100644
--- a/lib/probes/Curl.pm
+++ b/lib/Smokeping/probes/Curl.pm
@@ -1,28 +1,28 @@
-package probes::Curl;
+package Smokeping::probes::Curl;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::Curl>
+C<smokeping -man Smokeping::probes::Curl>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::Curl>
+C<smokeping -makepod Smokeping::probes::Curl>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Carp;
 
 my $DEFAULTBIN = "/usr/bin/curl";
 
 sub pod_hash {
     return {
-	name => "probes::Curl - a curl(1) probe for SmokePing",
+	name => "Smokeping::probes::Curl - a curl(1) probe for SmokePing",
 	overview => "Fetches an HTTP or HTTPS URL using curl(1).",
 	description => "(see curl(1) for details of the options below)",
 	authors => <<'DOC',
@@ -35,7 +35,7 @@ versions of Smokeping, and the 'host' setting did not influence it in any
 way. The variable name has now been changed to 'urlformat', and it can
 (and in most cases should) contain a placeholder for the 'host' variable.
 DOC
-	see_also => "curl(1), probes::Curl(3pm) etc., http://curl.haxx.se/",
+	see_also => "curl(1), Smokeping::probes::Curl(3pm) etc., http://curl.haxx.se/",
     }
 }
 
diff --git a/lib/probes/DNS.pm b/lib/Smokeping/probes/DNS.pm
index 1b4ec5c..1cb188f 100644
--- a/lib/probes/DNS.pm
+++ b/lib/Smokeping/probes/DNS.pm
@@ -1,21 +1,21 @@
-package probes::DNS;
+package Smokeping::probes::DNS;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::DNS>
+C<smokeping -man Smokeping::probes::DNS>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::DNS>
+C<smokeping -makepod Smokeping::probes::DNS>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use IPC::Open3;
 use Symbol;
 use Carp;
@@ -23,7 +23,7 @@ use Carp;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::DNS - Name Service Probe for SmokePing
+Smokeping::probes::DNS - Name Service Probe for SmokePing
 DOC
 		description => <<DOC,
 Integrates dig as a probe into smokeping. The variable B<binary> must
diff --git a/lib/probes/EchoPing.pm b/lib/Smokeping/probes/EchoPing.pm
index 843c9a1..f2aded2 100644
--- a/lib/probes/EchoPing.pm
+++ b/lib/Smokeping/probes/EchoPing.pm
@@ -1,21 +1,21 @@
-package probes::EchoPing;
+package Smokeping::probes::EchoPing;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPing>
+C<smokeping -man Smokeping::probes::EchoPing>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPing>
+C<smokeping -makepod Smokeping::probes::EchoPing>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Carp;
 
 my $DEFAULTBIN = "/usr/bin/echoping";
@@ -23,7 +23,7 @@ my $DEFAULTBIN = "/usr/bin/echoping";
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPing - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPing - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures TCP or UDP echo (port 7) roundtrip times for SmokePing. Can also be 
@@ -44,7 +44,7 @@ DOC
 Niko Tyni <ntyni@iki.fi>
 DOC
 		see_also => <<DOC,
-echoping(1), probes::EchoPingHttp(3pm) etc., http://echoping.sourceforge.net/
+echoping(1), Smokeping::probes::EchoPingHttp(3pm) etc., http://echoping.sourceforge.net/
 DOC
 	}
 }
diff --git a/lib/probes/EchoPingChargen.pm b/lib/Smokeping/probes/EchoPingChargen.pm
index 8f4cd9d..e0740c9 100644
--- a/lib/probes/EchoPingChargen.pm
+++ b/lib/Smokeping/probes/EchoPingChargen.pm
@@ -1,27 +1,27 @@
-package probes::EchoPingChargen;
+package Smokeping::probes::EchoPingChargen;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingChargen>
+C<smokeping -man Smokeping::probes::EchoPingChargen>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingChargen>
+C<smokeping -makepod Smokeping::probes::EchoPingChargen>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::EchoPing);
+use base qw(Smokeping::probes::EchoPing);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingChargen - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingChargen - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures TCP chargen (port 19) roundtrip times for SmokePing.
@@ -33,7 +33,7 @@ DOC
 Niko Tyni <ntyni@iki.fi>
 DOC
 		see_also => <<DOC,
-probes::EchoPing(3pm)
+Smokeping::probes::EchoPing(3pm)
 DOC
 	}
 }
diff --git a/lib/probes/EchoPingDiscard.pm b/lib/Smokeping/probes/EchoPingDiscard.pm
index 7ee7c62..31ddd39 100644
--- a/lib/probes/EchoPingDiscard.pm
+++ b/lib/Smokeping/probes/EchoPingDiscard.pm
@@ -1,14 +1,14 @@
-package probes::EchoPingDiscard;
+package Smokeping::probes::EchoPingDiscard;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingDiscard>
+C<smokeping -man Smokeping::probes::EchoPingDiscard>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingDiscard>
+C<smokeping -makepod Smokeping::probes::EchoPingDiscard>
 
 to generate the POD document.
 
@@ -17,7 +17,7 @@ to generate the POD document.
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingDiscard - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingDiscard - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures TCP or UDP discard (port 9) roundtrip times for SmokePing.
@@ -26,13 +26,13 @@ DOC
 Niko Tyni <ntyni@iki.fi>
 DOC
 		see_also => <<DOC,
-probes::EchoPing(3pm)
+Smokeping::probes::EchoPing(3pm)
 DOC
 	}
 }
 
 use strict;
-use base qw(probes::EchoPing);
+use base qw(Smokeping::probes::EchoPing);
 use Carp;
 
 sub proto_args {
diff --git a/lib/probes/EchoPingHttp.pm b/lib/Smokeping/probes/EchoPingHttp.pm
index e2fe1c0..45f9bd9 100644
--- a/lib/probes/EchoPingHttp.pm
+++ b/lib/Smokeping/probes/EchoPingHttp.pm
@@ -1,27 +1,27 @@
-package probes::EchoPingHttp;
+package Smokeping::probes::EchoPingHttp;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingHttp>
+C<smokeping -man Smokeping::probes::EchoPingHttp>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingHttp>
+C<smokeping -makepod Smokeping::probes::EchoPingHttp>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::EchoPing);
+use base qw(Smokeping::probes::EchoPing);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingHttp - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingHttp - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures HTTP roundtrip times (web servers and caches) for SmokePing.
diff --git a/lib/probes/EchoPingHttps.pm b/lib/Smokeping/probes/EchoPingHttps.pm
index c860559..32e8cb0 100644
--- a/lib/probes/EchoPingHttps.pm
+++ b/lib/Smokeping/probes/EchoPingHttps.pm
@@ -1,27 +1,27 @@
-package probes::EchoPingHttps;
+package Smokeping::probes::EchoPingHttps;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingHttps>
+C<smokeping -man Smokeping::probes::EchoPingHttps>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingHttps>
+C<smokeping -makepod Smokeping::probes::EchoPingHttps>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::EchoPingHttp);
+use base qw(Smokeping::probes::EchoPingHttp);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingHttps - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingHttps - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures HTTPS (HTTP over SSL) roundtrip times (web servers and caches) for
diff --git a/lib/probes/EchoPingIcp.pm b/lib/Smokeping/probes/EchoPingIcp.pm
index dc93fab..0b781de 100644
--- a/lib/probes/EchoPingIcp.pm
+++ b/lib/Smokeping/probes/EchoPingIcp.pm
@@ -1,27 +1,27 @@
-package probes::EchoPingIcp;
+package Smokeping::probes::EchoPingIcp;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingIcp>
+C<smokeping -man Smokeping::probes::EchoPingIcp>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingIcp>
+C<smokeping -makepod Smokeping::probes::EchoPingIcp>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::EchoPing);
+use base qw(Smokeping::probes::EchoPing);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingIcp - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingIcp - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures ICP (Internet Cache Protocol, spoken by web caches)
diff --git a/lib/probes/EchoPingSmtp.pm b/lib/Smokeping/probes/EchoPingSmtp.pm
index 0518758..2c2115d 100644
--- a/lib/probes/EchoPingSmtp.pm
+++ b/lib/Smokeping/probes/EchoPingSmtp.pm
@@ -1,27 +1,27 @@
-package probes::EchoPingSmtp;
+package Smokeping::probes::EchoPingSmtp;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::EchoPingSmtp>
+C<smokeping -man Smokeping::probes::EchoPingSmtp>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::EchoPingSmtp>
+C<smokeping -makepod Smokeping::probes::EchoPingSmtp>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::EchoPing);
+use base qw(Smokeping::probes::EchoPing);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::EchoPingSmtp - an echoping(1) probe for SmokePing
+Smokeping::probes::EchoPingSmtp - an echoping(1) probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures SMTP roundtrip times (mail servers) for SmokePing.
diff --git a/lib/probes/FPing.pm b/lib/Smokeping/probes/FPing.pm
index 5f92138..fca2a8d 100644
--- a/lib/probes/FPing.pm
+++ b/lib/Smokeping/probes/FPing.pm
@@ -1,21 +1,21 @@
-package probes::FPing;
+package Smokeping::probes::FPing;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::FPing>
+C<smokeping -man Smokeping::probes::FPing>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::FPing>
+C<smokeping -makepod Smokeping::probes::FPing>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::base);
+use base qw(Smokeping::probes::base);
 use IPC::Open3;
 use Symbol;
 use Carp;
@@ -23,7 +23,7 @@ use Carp;
 sub pod_hash {
       return {
               name => <<DOC,
-probes::FPing - FPing Probe for SmokePing
+Smokeping::probes::FPing - FPing Probe for SmokePing
 DOC
               description => <<DOC,
 Integrates FPing as a probe into smokeping. The variable B<binary> must 
diff --git a/lib/probes/FPing6.pm b/lib/Smokeping/probes/FPing6.pm
index 4a9f942..27e6a59 100644
--- a/lib/probes/FPing6.pm
+++ b/lib/Smokeping/probes/FPing6.pm
@@ -1,26 +1,26 @@
-package probes::FPing6;
+package Smokeping::probes::FPing6;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::FPing6>
+C<smokeping -man Smokeping::probes::FPing6>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::FPing6>
+C<smokeping -makepod Smokeping::probes::FPing6>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::FPing);
+use base qw(Smokeping::probes::FPing);
 
 sub pod_hash {
       return {
               name => <<DOC,
-probes::FPing6 - FPing6 Probe for SmokePing
+Smokeping::probes::FPing6 - FPing6 Probe for SmokePing
 DOC
               description => <<DOC,
 Integrates FPing6 as a probe into smokeping. This probe is derived from
@@ -33,7 +33,7 @@ Tobias Oetiker <tobi@oetiker.ch>
 Niko Tyni <ntyni@iki.fi>
 DOC
              see_also => <<DOC
-probes::FPing
+Smokeping::probes::FPing
 DOC
       }
 }
diff --git a/lib/probes/IOSPing.pm b/lib/Smokeping/probes/IOSPing.pm
index d73d046..708c03f 100644
--- a/lib/probes/IOSPing.pm
+++ b/lib/Smokeping/probes/IOSPing.pm
@@ -1,21 +1,21 @@
-package probes::IOSPing;
+package Smokeping::probes::IOSPing;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::IOSPing>
+C<smokeping -man Smokeping::probes::IOSPing>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::IOSPing>
+C<smokeping -makepod Smokeping::probes::IOSPing>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use IPC::Open2;
 use Symbol;
 use Carp;
@@ -25,7 +25,7 @@ my $e = "=";
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::IOSPing - Cisco IOS Probe for SmokePing
+Smokeping::probes::IOSPing - Cisco IOS Probe for SmokePing
 DOC
 		description => <<DOC,
 Integrates Cisco IOS as a probe into smokeping.  Uses the rsh / remsh
@@ -66,7 +66,7 @@ DOC
 	authors => <<'DOC',
 Paul J Murphy <paul@murph.org>
 
-based on probes::FPing by
+based on Smokeping::probes::FPing by
 
 Tobias Oetiker <tobi@oetiker.ch>
 DOC
diff --git a/lib/probes/LDAP.pm b/lib/Smokeping/probes/LDAP.pm
index 2bb966f..07dd7f6 100644
--- a/lib/probes/LDAP.pm
+++ b/lib/Smokeping/probes/LDAP.pm
@@ -1,24 +1,24 @@
-package probes::LDAP;
+package Smokeping::probes::LDAP;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::LDAP>
+C<smokeping -man Smokeping::probes::LDAP>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::LDAP>
+C<smokeping -makepod Smokeping::probes::LDAP>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use probes::passwordchecker;
+use Smokeping::probes::passwordchecker;
 use Net::LDAP;
 use Time::HiRes qw(gettimeofday sleep);
-use base qw(probes::passwordchecker);
+use base qw(Smokeping::probes::passwordchecker);
 use IO::Socket::SSL;
 
 my $DEFAULTINTERVAL = 1;
@@ -26,7 +26,7 @@ my $DEFAULTINTERVAL = 1;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::LDAP - a LDAP probe for SmokePing
+Smokeping::probes::LDAP - a LDAP probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures LDAP search latency for SmokePing
@@ -46,7 +46,7 @@ It can also optionally do an authenticated LDAP bind, if the `binddn'
 variable is present. The password to be used can be specified by the
 target-specific variable `password' or in an external file.
 The location of this file is given in the probe-specific variable
-`passwordfile'. See probes::passwordchecker(3pm) for the format
+`passwordfile'. See Smokeping::probes::passwordchecker(3pm) for the format
 of this file (summary: colon-separated triplets of the form
 `<host>:<bind-dn>:<password>')
 
diff --git a/lib/probes/Radius.pm b/lib/Smokeping/probes/Radius.pm
index 6d0705b..bf2c3fd 100644
--- a/lib/probes/Radius.pm
+++ b/lib/Smokeping/probes/Radius.pm
@@ -1,21 +1,21 @@
-package probes::Radius;
+package Smokeping::probes::Radius;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::Radius>
+C<smokeping -man Smokeping::probes::Radius>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::Radius>
+C<smokeping -makepod Smokeping::probes::Radius>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::passwordchecker);
+use base qw(Smokeping::probes::passwordchecker);
 use Authen::Radius;
 use Time::HiRes qw(gettimeofday sleep);
 use Carp;
@@ -25,7 +25,7 @@ my $DEFAULTINTERVAL = 1;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::Radius - a RADIUS authentication probe for SmokePing
+Smokeping::probes::Radius - a RADIUS authentication probe for SmokePing
 DOC
 		overview => <<DOC,
 Measures RADIUS authentication latency for SmokePing
@@ -41,7 +41,7 @@ The password can be specified either (in order of precedence, with
 the latter overriding the former) in the probe-specific variable
 `password', in an external file or in the target-specific variable
 `password'.  The location of this file is given in the probe-specific
-variable `passwordfile'. See probes::passwordchecker(3pm) for the
+variable `passwordfile'. See Smokeping::probes::passwordchecker(3pm) for the
 format of this file (summary: colon-separated triplets of the form
 `<host>:<username>:<password>')
 
diff --git a/lib/probes/RemoteFPing.pm b/lib/Smokeping/probes/RemoteFPing.pm
index 9f26fd3..c23591e 100644
--- a/lib/probes/RemoteFPing.pm
+++ b/lib/Smokeping/probes/RemoteFPing.pm
@@ -1,14 +1,14 @@
-package probes::RemoteFPing;
+package Smokeping::probes::RemoteFPing;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::RemoteFPing>
+C<smokeping -man Smokeping::probes::RemoteFPing>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::RemoteFPing>
+C<smokeping -makepod Smokeping::probes::RemoteFPing>
 
 to generate the POD document.
 
@@ -17,7 +17,7 @@ to generate the POD document.
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::RemoteFPing - Remote FPing Probe for SmokePing
+Smokeping::probes::RemoteFPing - Remote FPing Probe for SmokePing
 DOC
 		description => <<DOC,
 Integrates the remote execution of FPing via ssh/rsh into smokeping.
@@ -45,7 +45,7 @@ DOC
 
  Niko Tyni <ntyni@iki.fi>
 
- derived from probes::FPing by
+ derived from Smokeping::probes::FPing by
 
  Tobias Oetiker <tobi@oetiker.ch>
 DOC
@@ -57,7 +57,7 @@ DOC
 }
 
 use strict;
-use base qw(probes::FPing);
+use base qw(Smokeping::probes::FPing);
 
 sub ProbeDesc($) {
     my $self = shift;
diff --git a/lib/probes/SSH.pm b/lib/Smokeping/probes/SSH.pm
index f91a8d0..0f336d6 100644
--- a/lib/probes/SSH.pm
+++ b/lib/Smokeping/probes/SSH.pm
@@ -1,21 +1,21 @@
-package probes::SSH;
+package Smokeping::probes::SSH;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::SSH>
+C<smokeping -man Smokeping::probes::SSH>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::SSH>
+C<smokeping -makepod Smokeping::probes::SSH>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use IPC::Open3;
 use Symbol;
 use Carp;
@@ -24,7 +24,7 @@ use POSIX;
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::SSH - Secure Shell Probe for SmokePing
+Smokeping::probes::SSH - Secure Shell Probe for SmokePing
 DOC
 		description => <<DOC,
 Integrates ssh-keyscan as a probe into smokeping. The variable B<binary> must
diff --git a/lib/probes/base.pm b/lib/Smokeping/probes/base.pm
index 3101e01..0309550 100644
--- a/lib/probes/base.pm
+++ b/lib/Smokeping/probes/base.pm
@@ -1,14 +1,14 @@
-package probes::base;
+package Smokeping::probes::base;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::base>
+C<smokeping -man Smokeping::probes::base>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::base>
+C<smokeping -makepod Smokeping::probes::base>
 
 to generate the POD document.
 
@@ -26,10 +26,10 @@ use strict;
 sub pod_hash {
     return {
     	name => <<DOC,
-probes::base - Base Class for implementing SmokePing Probes
+Smokeping::probes::base - Base Class for implementing SmokePing Probes
 DOC
 	overview => <<DOC,
-For the time being, please use the probes::FPing for
+For the time being, please use the Smokeping::probes::FPing for
 inspiration when implementing your own probes.
 DOC
 	authors => <<'DOC',
@@ -313,7 +313,7 @@ sub _makevars {
 sub pod_synopsys {
 	my $class = shift;
 	my $classname = ref $class||$class;
-	$classname =~ s/^probes:://;
+	$classname =~ s/^Smokeping::probes:://;
 
 	my $probevars = $class->probevars;
 	my $targetvars = $class->targetvars;
diff --git a/lib/probes/basefork.pm b/lib/Smokeping/probes/basefork.pm
index 0eb213b..4324e6d 100644
--- a/lib/probes/basefork.pm
+++ b/lib/Smokeping/probes/basefork.pm
@@ -1,21 +1,21 @@
-package probes::basefork;
+package Smokeping::probes::basefork;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::basefork>
+C<smokeping -man Smokeping::probes::basefork>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::basefork>
+C<smokeping -makepod Smokeping::probes::basefork>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basevars);
+use base qw(Smokeping::probes::basevars);
 use Symbol;
 use Carp;
 use IO::Select;
@@ -27,10 +27,10 @@ my $DEFAULTFORKS = 5;
 sub pod_hash {
     return {
     	name => <<DOC,
-probes::basefork - Yet Another Base Class for implementing SmokePing Probes
+Smokeping::probes::basefork - Yet Another Base Class for implementing SmokePing Probes
 DOC
 	overview => <<DOC,
-Like probes::basevars, but supports the probe-specific property `forks'
+Like Smokeping::probes::basevars, but supports the probe-specific property `forks'
 to determine how many processes should be run concurrently. The
 targets are pinged one at a time, and the number of pings sent can vary
 between targets.
@@ -48,7 +48,7 @@ processes and calls the B<pingone> method that derived classes must provide.
 
 The B<pingone> method is called with one argument: a hash containing
 the target that is to be measured. The contents of the hash are
-described in I<probes::basevars>(3pm).
+described in I<Smokeping::probes::basevars>(3pm).
 
 The number of concurrent processes is determined by the probe-specific 
 variable `forks' and is $DEFAULTFORKS by default. If there are more 
@@ -74,7 +74,7 @@ DOC
 Niko Tyni <ntyni@iki.fi>
 DOC
 	see_also => <<DOC,
-probes::basevars(3pm), probes::EchoPing(3pm)
+Smokeping::probes::basevars(3pm), Smokeping::probes::EchoPing(3pm)
 DOC
     }
 }
diff --git a/lib/probes/basevars.pm b/lib/Smokeping/probes/basevars.pm
index 8862395..26c0d85 100644
--- a/lib/probes/basevars.pm
+++ b/lib/Smokeping/probes/basevars.pm
@@ -1,31 +1,31 @@
-package probes::basevars;
+package Smokeping::probes::basevars;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::basevars>
+C<smokeping -man Smokeping::probes::basevars>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::basevars>
+C<smokeping -makepod Smokeping::probes::basevars>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use probes::base;
-use base qw(probes::base);
+use Smokeping::probes::base;
+use base qw(Smokeping::probes::base);
 
 my $e = "=";
 sub pod_hash {
     return {
     	name => <<DOC,
-probes::basevars - Another Base Class for implementing SmokePing Probes
+Smokeping::probes::basevars - Another Base Class for implementing SmokePing Probes
 DOC
 	overview => <<DOC,
-Like probes::base, but supports host-specific variables for the probe.
+Like Smokeping::probes::base, but supports host-specific variables for the probe.
 DOC
 	description => <<DOC,
 Provides the method `targets' that returns a list of hashes.
@@ -55,11 +55,11 @@ DOC
 Niko Tyni <ntyni@iki.fi>
 DOC
 	bugs => <<DOC,
-Uses `probes::base' internals too much to be a derived class, but 
+Uses `Smokeping::probes::base' internals too much to be a derived class, but 
 I didn't want to touch the base class directly.
 DOC
 	see_also => <<DOC,
-probes::base(3pm), probes::EchoPing(3pm)
+Smokeping::probes::base(3pm), Smokeping::probes::EchoPing(3pm)
 DOC
     }
 }
diff --git a/lib/probes/passwordchecker.pm b/lib/Smokeping/probes/passwordchecker.pm
index 87d72eb..cc4f59f 100644
--- a/lib/probes/passwordchecker.pm
+++ b/lib/Smokeping/probes/passwordchecker.pm
@@ -1,32 +1,32 @@
-package probes::passwordchecker;
+package Smokeping::probes::passwordchecker;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::passwordchecker>
+C<smokeping -man Smokeping::probes::passwordchecker>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::passwordchecker>
+C<smokeping -makepod Smokeping::probes::passwordchecker>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use probes::basefork;
-use base qw(probes::basefork);
+use Smokeping::probes::basefork;
+use base qw(Smokeping::probes::basefork);
 use Carp;
 
 my $e = "=";
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::passwordchecker - A Base Class for implementing SmokePing Probes
+Smokeping::probes::passwordchecker - A Base Class for implementing SmokePing Probes
 DOC
 		overview => <<DOC,
-Like probes::basefork, but supports a probe-specific configuration file
+Like Smokeping::probes::basefork, but supports a probe-specific configuration file
 for storing passwords and a method for accessing them.
 DOC
 
@@ -80,7 +80,7 @@ The need for storing cleartext passwords can be considered a bug in itself.
 DOC
 
 		see_also => <<DOC,
-probes::basefork(3pm), probes::Radius(3pm), probes::LDAP(3pm)
+Smokeping::probes::basefork(3pm), Smokeping::probes::Radius(3pm), Smokeping::probes::LDAP(3pm)
 DOC
 	}
 }
diff --git a/lib/probes/skel.pm b/lib/Smokeping/probes/skel.pm
index 5438e1f..fb7ade1 100644
--- a/lib/probes/skel.pm
+++ b/lib/Smokeping/probes/skel.pm
@@ -1,29 +1,29 @@
-package probes::skel;
+package Smokeping::probes::skel;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::skel>
+C<smokeping -man Smokeping::probes::skel>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::skel>
+C<smokeping -makepod Smokeping::probes::skel>
 
 to generate the POD document.
 
 =cut
 
 use strict;
-use base qw(probes::basefork); 
+use base qw(Smokeping::probes::basefork); 
 # or, alternatively
-# use base qw(probes::base);
+# use base qw(Smokeping::probes::base);
 use Carp;
 
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::skel - a skeleton for Smokeping Probes
+Smokeping::probes::skel - a skeleton for Smokeping Probes
 DOC
 		description => <<DOC,
 This is a non-functional module that is intended to act as a
@@ -97,7 +97,7 @@ sub ProbeDesc($){
 # via the $self->{properties} hash and the
 # target-specific variables via $target->{vars}
 
-# If you based your class on 'probes::base',
+# If you based your class on 'Smokeping::probes::base',
 # you'd have to provide a "ping" method instead
 # of "pingone"
 
diff --git a/lib/probes/telnetIOSPing.pm b/lib/Smokeping/probes/telnetIOSPing.pm
index e0af7ac..260cec7 100644
--- a/lib/probes/telnetIOSPing.pm
+++ b/lib/Smokeping/probes/telnetIOSPing.pm
@@ -1,14 +1,14 @@
-package probes::telnetIOSPing;
+package Smokeping::probes::telnetIOSPing;
 
 =head1 301 Moved Permanently
 
 This is a Smokeping probe module. Please use the command 
 
-C<smokeping -man probes::telnetIOSPing>
+C<smokeping -man Smokeping::probes::telnetIOSPing>
 
 to view the documentation or the command
 
-C<smokeping -makepod probes::telnetIOSPing>
+C<smokeping -makepod Smokeping::probes::telnetIOSPing>
 
 to generate the POD document.
 
@@ -16,7 +16,7 @@ to generate the POD document.
 
 use strict;
 
-use base qw(probes::basefork);
+use base qw(Smokeping::probes::basefork);
 use Net::Telnet ();
 use Carp;
 
@@ -24,7 +24,7 @@ my $e = "=";
 sub pod_hash {
 	return {
 		name => <<DOC,
-probes::telnetIOSPing - Cisco IOS Probe for SmokePing
+Smokeping::probes::telnetIOSPing - Cisco IOS Probe for SmokePing
 DOC
 		description => <<DOC,
 Integrates Cisco IOS as a probe into smokeping.  Uses the telnet protocol 
@@ -93,11 +93,11 @@ DOC
 		authors => <<'DOC',
 John A Jackson <geonjay@infoave.net>
 
-based HEAVILY on probes::IOSPing by
+based HEAVILY on Smokeping::probes::IOSPing by
 
 Paul J Murphy <paul@murph.org>
 
-based on probes::FPing by
+based on Smokeping::probes::FPing by
 
 Tobias Oetiker <tobi@oetiker.ch>
 DOC