11 files changed, 27 insertions, 27 deletions

diff --git a/web/input/development.md b/web/input/development.md
index 76a52df..17972b9 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -10,7 +10,7 @@ menu: 6
 The [Monitoring Plugins Development Team][team] takes care of three projects:
 
 * Monitoring Plugins — the core bundle of standard plugins.
-* Nagios::Plugin — a module used by plugins written in Perl.
+* Monitoring::Plugin — a module used by plugins written in Perl.
 * NagiosMIB — SNMP MIB files for traps sent from [Nagios][nagios].
 
 These projects are maintained in separate repositories on [GitHub][github]:
diff --git a/web/input/doc/extra-opts.md b/web/input/doc/extra-opts.md
index 7e68264..1ea4251 100644
--- a/web/input/doc/extra-opts.md
+++ b/web/input/doc/extra-opts.md
@@ -7,7 +7,7 @@ parent: Documentation
 Starting with the 1.4.12 release, most Nagios Plugins (those written in C)
 support reading options from a configuration file.  This needs to be enabled
 at compile-time for now (`--enable-extra-opts`) and will be enabled by default
-in the future.  Perl plugins using the [Nagios::Plugin][module] module have
+in the future.  Perl plugins using the [Monitoring::Plugin][module] module have
 this support since version 0.16.
 
 You can easily know if a plugin supports *Extra-Opts* by checking the `--help`
@@ -69,6 +69,6 @@ The initial use case for this functionality is for hiding passwords, so you do
 not have to define sensitive credentials in the Nagios configuration and these
 options won't appear in the command line.
 
-[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin"
+[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin"
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/doc/faq/build-perl-module.md b/web/input/doc/faq/build-perl-module.md
index 8c6f2ac..fe9e85d 100644
--- a/web/input/doc/faq/build-perl-module.md
+++ b/web/input/doc/faq/build-perl-module.md
@@ -1,8 +1,8 @@
-title: Building Nagios::Plugin
+title: Building Monitoring::Plugin
 parent: FAQ
 ---
 
-# How do I build Nagios::Plugin?
+# How do I build Monitoring::Plugin?
 
 This is currently an optional setting at configure time.  You need to run:
 
diff --git a/web/input/doc/faq/index.md b/web/input/doc/faq/index.md
index 6b01670..e67e7a5 100644
--- a/web/input/doc/faq/index.md
+++ b/web/input/doc/faq/index.md
@@ -20,7 +20,7 @@ Plugins.
 * [How do I compile the plugins?][compilation]
 * [The configure script appears to hang][configure-hangs]
 * [Why doesn't the --ssl option work?][ssl]
-* [How do I build the Nagios::Plugin module?][build-perl-module]
+* [How do I build the Monitoring::Plugin module?][build-perl-module]
 * [Building check\_mysql fails on Solaris][mixing-compilers]
 * [Why use pst3 for check\_procs on Solaris?][ps-on-solaris]
 
@@ -40,7 +40,7 @@ Plugins.
 * [Can I add extra tests to the C routines?][extra-tests]
 * [How do the NPTest parameters work?][nptest]
 * [How do I use and update Gnulib?][gnulib]
-* [How do I use the Nagios::Plugin module?][use-perl-module]
+* [How do I use the Monitoring::Plugin module?][use-perl-module]
 * [How do I modify NagiosMIB?][nagiosmib]
 * [Can I reuse Monitoring Plugins code?][reuse]
 
diff --git a/web/input/doc/faq/use-perl-module.md b/web/input/doc/faq/use-perl-module.md
index d624e5f..3ac5674 100644
--- a/web/input/doc/faq/use-perl-module.md
+++ b/web/input/doc/faq/use-perl-module.md
@@ -1,10 +1,10 @@
-title: Using Nagios::Plugin
+title: Using Monitoring::Plugin
 parent: FAQ
 ---
 
-# How do I use the Nagios::Plugin module?
+# How do I use the Monitoring::Plugin module?
 
-The Nagios::Plugin Perl module can be obtained from two main locations:
+The Monitoring::Plugin Perl module can be obtained from two main locations:
 
 * from the Monitoring Plugins tarball with an
   [extra configure option][configure-module]
@@ -20,18 +20,18 @@ To write your plugin, you should start it with:
 
     use FindBin;
     use lib "$FindBin::Bin/../perl/lib";
-    use Nagios::Plugin;
+    use Monitoring::Plugin;
 
-This bit of code tells Perl to look for the Nagios::Plugin module in a
+This bit of code tells Perl to look for the Monitoring::Plugin module in a
 directory relative to where the plugin is executed - this is a hard
-dependency.  If Nagios::Plugin is not found there, Perl's system directories
+dependency.  If Monitoring::Plugin is not found there, Perl's system directories
 will be searched.
 
 This approach allows a system administrator to decide whether they want
-Nagios::Plugin installed via system directories or within the `$prefix` area
+Monitoring::Plugin installed via system directories or within the `$prefix` area
 of the plugins.
 
-[configure-module]: doc/faq/build-perl-module.html "configure with Nagios::Plugin"
-[cpan-module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin on CPAN"
+[configure-module]: doc/faq/build-perl-module.html "configure with Monitoring::Plugin"
+[cpan-module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin on CPAN"
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->
diff --git a/web/input/doc/index.md b/web/input/doc/index.md
index 907b2f8..ce63262 100644
--- a/web/input/doc/index.md
+++ b/web/input/doc/index.md
@@ -25,7 +25,7 @@ These documents cover specific topics that go beyond the basics:
 
 * **[Writing Perl Plugins][perl-plugins]**  
   This is a video that shows how to write your own check using the
-  [Nagios::Plugin][module] Perl module.
+  [Monitoring::Plugin][module] Perl module.
 
 * **[Nagios Plugin Development Guidelines][guidelines]**  
   Reference documentation for plugin developers.
@@ -47,8 +47,8 @@ The following ideas are not yet implemented (and might never be):
 [man]: doc/man/index.html "Manual Pages"
 [faq]: doc/faq/index.html "Frequently Asked Questions"
 [extra-opts]: doc/extra-opts.html "Extra-Opts"
-[perl-plugins]: doc/writing-perl-plugins.html "Nagios::Plugin Presentation"
-[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin"
+[perl-plugins]: doc/writing-perl-plugins.html "Monitoring::Plugin Presentation"
+[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin"
 [guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines"
 [new-threshold]: doc/new-threshold-syntax.html "Proposal for New Threshold Syntax"
 [check-many]: doc/check-many.html "Proposal for Check Aggregation Plugin"
diff --git a/web/input/download.md b/web/input/download.md
index 8881f48..f4341af 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -31,11 +31,11 @@ repository][repository] whenever that branch changes.  Snapshots built from
 other development branches are also available in the [snapshot
 directory][snapshot] of the [download area][download].
 
-## Nagios::Plugin
+## Monitoring::Plugin
 
-The Nagios::Plugin module is available from [CPAN][cpan]:
+The Monitoring::Plugin module is available from [CPAN][cpan]:
 
-* <http://search.cpan.org/dist/Nagios-Plugin/>
+* <http://search.cpan.org/dist/Monitoring-Plugin/>
 
 ## NagiosMIB
 
diff --git a/web/input/index.md b/web/input/index.md
index 78a4f5e..3c8bf70 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -46,9 +46,9 @@ You can get the latest releases from the [download page][download].
 [http]: doc/man/check_http.html "check_http"
 [nagex]: http://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
 [monex]: https://www.monitoringexchange.org/inventory/Check-Plugins "Plugins on Monitoring Exchange"
-[module]: http://search.cpan.org/dist/Nagios-Plugin/ "Nagios::Plugin Module"
+[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin Module"
 [guidelines]: doc/guidelines.html "Nagios Plugin Development Guidelines"
-[perl-plugins]: doc/writing-perl-plugins.html "Nagios::Plugin Presentation"
+[perl-plugins]: doc/writing-perl-plugins.html "Monitoring::Plugin Presentation"
 [rename]: news/new-project-name.html "New Project Name"
 [history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
 [folks]: http://www.nagios.org/about/team "Nagios Team"
diff --git a/web/input/news/release-1-4-15.md b/web/input/news/release-1-4-15.md
index e0af748..d4ea270 100644
--- a/web/input/news/release-1-4-15.md
+++ b/web/input/news/release-1-4-15.md
@@ -20,7 +20,7 @@ You can get the tarball from:
 * `check_snmp` `-l` label option now also changes the perfdata label.  See [Warnings](#Warnings)
 * `check_snmp` has an `--invert-search` option which reverses status of the string and regexp searches
 * `check_http` now displays the missing search string and the URL in the output when failed
-* Updated Nagios::Plugin perl module
+* Updated Monitoring::Plugin perl module
 * Updated gnulib to June 2010
 
 ## Fixes
diff --git a/web/input/news/release-1-4-16.md b/web/input/news/release-1-4-16.md
index 19dac30..2e4ad89 100644
--- a/web/input/news/release-1-4-16.md
+++ b/web/input/news/release-1-4-16.md
@@ -25,7 +25,7 @@ You can get the tarball from:
 * utils.sh now provides a `check_range` function
 * Improved the performance of `check_users`
 * Add perfdata to `check_disk_smb`
-* Updated Nagios::Plugin perl module
+* Updated Monitoring::Plugin perl module
 * Add warning threshold to certificate expiration checks of `check_tcp`/`http`/`smtp`
 * Add `--perf-oids` option for `check_snmp`
 
diff --git a/web/input/news/ton-voon-resigns.md b/web/input/news/ton-voon-resigns.md
index 7130c55..7bd8413 100644
--- a/web/input/news/ton-voon-resigns.md
+++ b/web/input/news/ton-voon-resigns.md
@@ -9,7 +9,7 @@ Nagios Plugins.<end-of-teaser>
 It's almost 7 years to the day since I started as team leader and I've been
 honoured to have had a great team of people that have helped with coding and
 translations and responding to the mailing lists.  I'm particularly proud of
-the Nagios::Plugin perl module, originally created by Gavin Carr, and some of
+the Monitoring::Plugin perl module, originally created by Gavin Carr, and some of
 the fantastic tests added into the plugins code, started by Nathan Vonnahme.
 Also Benoit Mortier did a great job on setting up the translations framework.
 I also recall, when I first joined the team 9 years ago, racing with Matthew