115 files changed, 500 insertions, 505 deletions
diff --git a/.gitignore b/.gitignore
index ebd46e1f..7040398c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ NP-VERSION-FILE
 /Makefile
 /Makefile.in
 /missing
-/nagios-plugins.spec
+/monitoring-plugins.spec
 /stamp-h1
 /test.pl
 /THANKS
@@ -93,7 +93,7 @@ NP-VERSION-FILE
 # /lib/
 /lib/.deps
 /lib/getopt.h
-/lib/libnagiosplug.a
+/lib/libmonitoringplug.a
 /lib/Makefile
 /lib/Makefile.in
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
index 7b8dbe22..50c714c3 100644
--- a/ACKNOWLEDGEMENTS
+++ b/ACKNOWLEDGEMENTS
@@ -1,6 +1,6 @@
-This file contains the origin of code copied verbatim into some or all of the Nagios plugins.
+This file contains the origin of code copied verbatim into some or all of the Monitoring Plugins.
-The NagiosPlugin team thanks the original authors.
+The Monitoring Plugins team thanks the original authors.
 Copied code is cited in the source by indented comments of the form
diff --git a/AUTHORS b/AUTHORS
index c761c389..50b6b3a0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-The Nagios Plugins are brought to you by the Nagios Plugins Development Team.
+The Monitoring Plugins are brought to you by the Monitoring Plugins Development Team.
 Jeremy T. Bouse
 Peter Bray
diff --git a/CODING b/CODING
index 15810655..74438e7c 100644
--- a/CODING
+++ b/CODING
@@ -12,8 +12,8 @@ Foundation Coding standards (which are currently available at
 http://www.gnu.org/prep/standards_toc.html). We also follow most of
 the FSF guidelines. Developers may suggest deviations from the FSF
 style recommendations, which will be considered by open discussion on
-the nagiosplug-devel mailing list. Any such deviations will apply to
+the Monitoring Plugins devel mailing list. Any such deviations will
-the entire code base to ensure consistency.
+apply to the entire code base to ensure consistency.
 Currently, the exceptions to FSF recommendations are roughly equivalent
 to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the
diff --git a/FAQ b/FAQ
index 4fb86536..20b837c6 100644
--- a/FAQ
+++ b/FAQ
@@ -15,7 +15,7 @@ A: All plugins that comply with minimal development guideline for
   this project include detailed version information.  When executed
   with the '-V' option, a version string will be printed:
-   check_radius v1.4.16 (nagios-plugins 1.4.16)
+   check_radius v1.4.16 (monitoring-plugins 1.4.16)
   All bug reports and help requests should reference this
   information.
@@ -32,7 +32,7 @@ A: At a minimum, the output from 'uname -a' and the version string
 Q: I'm using Redhat Linux (or some other RPM-based distribution).
   Which packages should I install?
-A: The package nagios-plugins-<version>.<arch>.rpm contains only
+A: The package monitoring-plugins-<version>.<arch>.rpm contains only
   those plugins that should work on any POSIX compliant system.  In
   other words, you should be able to install this package on your
   system, no matter what else is or in not installed.
@@ -42,7 +42,7 @@ A: The package nagios-plugins-<version>.<arch>.rpm contains only
   each dependency could be installed cleanly, but many people
   found that this resulted in too many packages.  So in the end,
   all the non-POSIX plugins were folded into one RPM 
-   (nagios-plugins-<version>.<arch>.rpm).  Most people will need to
+   (monitoring-plugins-<version>.<arch>.rpm).  Most people will need to
   use RPM's '--nodeps' option to install this package.
@@ -59,10 +59,10 @@ Q: I prefer to build my own RPMs. Do I need to install all of the
 A: Beginning with the 1.2.9-1 release, you may run
-   rpm --define 'custom 1' -ta nagios-plugins-<release>.tar.gz
+   rpm --define 'custom 1' -ta monitoring-plugins-<release>.tar.gz
   In prior releases, you must unpack the tarball and build the
-   RPM using nagios-custom.spec with 'rpm -ba'.
+   RPM using monitoring-custom.spec with 'rpm -ba'.
 Q: I get an error like
@@ -84,8 +84,8 @@ A: Commonly, system administrators will make security as tight as
 Q: I have a plugin to offer. What can I do?
-A: You can make it available on NagiosExchange (http://nagiosexchange.org)
+A: You can make it available on MonitoringExchange (http://monitoringexchange.org)
   where other people can find it for use.
   You can also get feedback on improving the plugin via the 
-   nagiosplug-devel@lists.sourceforge.net mailing list.
+   devel@monitoring-plugins.org mailing list.
diff --git a/Makefile.am b/Makefile.am
index 98542b94..517068ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
        ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \
        NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
-        NPTest.pm pkg nagios-plugins.spec \
+        NPTest.pm pkg monitoring-plugins.spec \
        config_test/Makefile config_test/run_tests config_test/child_test.c \
        perlmods tools/build_perl_modules \
        tools/tinderbox_build
@@ -51,7 +51,7 @@ solpkg:
        cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 THANKS: THANKS.in
-        @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@
+        @echo "This software is brought to you by the Monitoring Plugins Development Team. However," > $@
        @echo "there have been many contributors to this project. Everyone below has helped in " >> $@
        @echo "raising bug reports, creating patches or contributing new plugins." >> $@
        @echo "" >> $@
diff --git a/NEWS b/NEWS
index d7fe8f33..e8c27ab4 100644
--- a/NEWS
+++ b/NEWS
@@ -293,7 +293,7 @@ This file documents the major additions and syntax changes between releases.
        check_icmp fix for *BSD when running for long time
        check_ping times out 1 second quicker if host is unreachable
        Root plugins installed with world executable
-        check_sybase from contrib now maintained in NagiosExchange
+        check_sybase from contrib now maintained in MonitoringExchange
        --with-nagios-user/group reinstated ./configure option
        New --without-world-permissions ./configure option
@@ -317,7 +317,7 @@ This file documents the major additions and syntax changes between releases.
        New C based check_ntp. The perl version is now deprecated.
        New check_apt plugin
        Notice: plugins in contrib/ will start to be removed from this distribution.
-          Please check at http://www.nagiosexchange.org for contributed plugins
+          Please check at http://www.monitoringexchange.org for contributed plugins
        Major bug fixes to check_disk where values were incorrectly calculated and alerted on.
        check_udp2 removed. check_udp is now linked to check_tcp.c
        check_mailq now errors if the sub-program run returns non-zero return code. This would appear
diff --git a/NPTest.pm b/NPTest.pm
index 9b856171..ebc2602c 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -1,7 +1,7 @@
 package NPTest;
 #
-# Helper Functions for testing Nagios Plugins
+# Helper Functions for testing Monitoring Plugins
 #
 require Exporter;
@@ -25,14 +25,14 @@ $VERSION = "1556."; # must be all one line, for MakeMaker
 =head1 NAME
-NPTest - Simplify the testing of Nagios Plugins
+NPTest - Simplify the testing of Monitoring Plugins
 =head1 DESCRIPTION
 This modules provides convenience functions to assist in the testing
-of Nagios Plugins, making the testing code easier to read and write;
+of Monitoring Plugins, making the testing code easier to read and write;
 hopefully encouraging the development of a more complete test suite for
-the Nagios Plugins. It is based on the patterns of testing seen in the
+the Monitoring Plugins. It is based on the patterns of testing seen in the
 1.4.0 release, and continues to use the L<Test> module as the basis of
 testing.
@@ -92,7 +92,7 @@ Testing of results would be done in your test script, not in this module.
 This function is obsolete. Use C<testCmd()> instead.
 This function attempts to encompass the majority of test styles used
-in testing Nagios Plugins. As each plug-in is a separate command, the
+in testing Monitoring Plugins. As each plug-in is a separate command, the
 typical tests we wish to perform are against the exit status of the
 command and the output (if any) it generated. Simplifying these tests
 into a single function call, makes the test harness easier to read and
@@ -132,7 +132,7 @@ of either C<Test::ok(...)> or C<Test::skip(...)>, so remember this
 when counting the number of tests to place in the C<Test::plan(...)>
 call.
-Many Nagios Plugins test network services, some of which may not be
+Many Monitoring Plugins test network services, some of which may not be
 present on all systems. To cater for this, C<checkCmd(...)> allows the
 tester to define exceptions based on the command's exit status. These
 exceptions are provided to skip tests if the test case developer
@@ -199,7 +199,7 @@ Copyright (c) 2005 Peter Bray.  All rights reserved.
 This package is free software and is provided "as is" without express
 or implied warranty.  It may be used, redistributed and/or modified
-under the same terms as the Nagios Plugins release.
+under the same terms as the Monitoring Plugins release.
 =cut
diff --git a/README b/README
index b3d65de8..7deb63b5 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Nagios Plugins
+Monitoring Plugins
 ==============
 * For instructions on installing these plugins for use with Nagios,
@@ -21,19 +21,19 @@ Nagios Plugins
 You can check for the latest plugins at:
-* <https://www.nagios-plugins.org/>
+* <https://www.monitoring-plugins.org/>
-Send an email to <nagiosplug-help@lists.sourceforge.net> for assistance.
+Send an email to <help@monitoring-plugins.org> for assistance.
 Please include the OS type and version that you are using.  Also, run the
 plugin with the `-vvv` option and provide the resulting version information.
 Of course, there may be additional diagnostic information required as well.
 Use good judgment.
-Send an email to <nagiosplug-devel@lists.sourceforge.net> for developer
+Send an email to <devel@monitoring-plugins.org> for developer
 discussions.
 For patch submissions and bug reports, please use the appropriate resources
-at <https://github.com/nagios-plugins/nagios-plugins>.
+at <https://github.com/monitoring-plugins/monitoring-plugins>.
 Installation Instructions
@@ -45,7 +45,7 @@ Installation Instructions
        ./tools/setup
    For more detail, see the developer guidelines at
-    <https://www.nagios-plugins.org/doc/guidelines.html>.
+    <https://www.monitoring-plugins.org/doc/guidelines.html>.
 2.  Run the configure script to initialize variables and create a Makefile,
    etc.
@@ -77,7 +77,7 @@ Installation Instructions
        make install-root
 That's it!  If you have any problems or questions, feel free to send an
-email to <nagiosplug-help@lists.sourceforge.net>.
+email to <help@monitoring-plugins.org>.
 License Stuff
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 1f673e98..b2bd467b 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -1,4 +1,4 @@
-Nagios Plugin Requirements
+Monitoring Plugins Requirements
 --------------------------
 Some plugins require that you have additional programs and/or
diff --git a/SUPPORT b/SUPPORT
index f1705aaa..d2a2b7de 100644
--- a/SUPPORT
+++ b/SUPPORT
@@ -1,14 +1,14 @@
 SUPPORT
-Using the mailing lists and tracker databases at SourceForge are the
+Using the mailing lists and issue tracker at GitHub are the
-best ways to obtain direct support for the Nagios Plugins. There may
+best ways to obtain direct support for the Monitoring Plugins. There may
 also be commercial support options available to you -- check
 http://www.nagios.org/ to track the current status of commercial
 support offerings.
-There are two mailing lists associated with Nagios Plugin development:
+There are two mailing lists associated with Monitoring Plugins development:
-'help' (mailto:nagiosplug-help@lists.sourceforge.net), and 'devel'
+'help' (mailto:help@monitoring-plugins.org), and 'devel'
-(mailto:nagiosplug-devel@lists.sourceforge.net). Unless you are fairly
+(mailto:help@monitoring-plugins.org). Unless you are fairly
 certain you have found a bug or that you are requesting a new feature,
 please direct support requests to 'help'.
@@ -18,8 +18,8 @@ their time to fix bug and provide feature requests, it is generally in
 you interest to do a modest amount of legwork before posting to either
 of these lists.
-Plugins that are in the contrib directories are provided as-is. We will 
+Plugins that are in the contrib directories are provided as-is. We will
-try to help, but sometimes the plugins have dependencies that the nagios-plugin
+try to help, but sometimes the plugins have dependencies that the monitoring-plugin
 developers do not have access to. You may be able to try the authors
 directly.
@@ -34,7 +34,7 @@ Requests to 'help' require posting the version number of the
 plugin. The best place to include the version information is in the
 subject. A good post would have a subject like:
-  Can I use SSL with check_imap (nagios-plugins 1.3.0-beta2) 1.12
+  Can I use SSL with check_imap (monitoring-plugins 1.3.0-beta2) 1.12
 If you do not include the version of the plugin, you risk having your
 post silently ignored.
@@ -48,17 +48,17 @@ REPORTING BUGS AND SUBMITTING PATCHES
 Bug reports, investigations of possible bugs, feature requests, and
 patch submissions should be submitted to the development list at
-mailto:nagiosplug-devel@lists.sourceforge.net. Please raise an issue first 
+mailto:devel@monitoring-plugins.org. Please raise an issue first
 in GitHub, otherwise your email is likely to be missed over time.
-You should identify the version, preferably in the subject line. 
+You should identify the version, preferably in the subject line.
-However, to best use developer resources, it is suggested that you 
+However, to best use developer resources, it is suggested that you
 reference your report to one of the following sources:
  1) The most recent release, including beta's
  2) The current snapshots (there's a link provided on
-     https://www.nagios-plugins.org/download.html)
+     https://www.monitoring-plugins.org/download.html)
  3) The current Git code from GitHub
diff --git a/configure.in b/configure.in
index a20ca876..f0c696f4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.5)
+AC_INIT(monitoring-plugins,1.5)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile 
-        nagios-plugins.spec])
+        monitoring-plugins.spec])
 AC_CONFIG_AUX_DIR(build-aux)
 AM_INIT_AUTOMAKE([1.8.3])
 AC_CONFIG_HEADERS([config.h])
@@ -58,10 +58,10 @@ AC_SUBST(PLUGIN_TEST)dnl
 SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'`
 AC_SUBST(SCRIPT_TEST)dnl
-WARRANTY="The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"
+WARRANTY="The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"
 AC_SUBST(WARRANTY)
-SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n"
+SUPPORT="Send email to devel@monitoring-plugins.org if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to devel@monitoring-plugins.org.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n"
 AC_SUBST(SUPPORT)
 dnl CGIURL has changed for Nagios with 1.0 beta
@@ -648,7 +648,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
        ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
        ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
        ac_cv_ps_cols=9
-        AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris])
+        AC_MSG_RESULT([using monitoring-plugins internal ps command (pst3) for solaris])
        if test `isainfo -b` = 64 ; then
                pst3_use_64bit=1
                AC_MSG_NOTICE([using 64bit pst3])
@@ -1731,7 +1731,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround,
        [ac_cv_enable_redhat_pthread_workaround=test])
 if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then
        if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then
-                AC_MSG_NOTICE([See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time])
+                AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time])
                AC_MSG_CHECKING(for redhat spopen problem)
                ( cd config_test && make && make test ) > /dev/null 2>&1
                if test $? -eq 0 ; then
@@ -1748,7 +1748,7 @@ fi
 dnl Perl modules
 AC_ARG_ENABLE(perl-modules,
        AC_HELP_STRING([--enable-perl-modules],
-                [Enables installation of Nagios::Plugin and its dependencies (default: no)]),
+                [Enables installation of Monitoring::Plugin and its dependencies (default: no)]),
        [enable_perl_modules=$enableval],
        [enable_perl_modules=no])
 if test "$enable_perl_modules" = "yes" ; then
diff --git a/doc/LEAVERS b/doc/LEAVERS
index 65af3102..a52a6008 100644
--- a/doc/LEAVERS
+++ b/doc/LEAVERS
@@ -10,5 +10,5 @@ Administration tasks:
  - Remove from GitHub's project members. This will include Git access.
  - Remove access from project server
  - If applicable, remove from mailing list administrators
-  - Keep on nagiosplug-team mailing list, unless specifically requested to be removed
+  - Keep on team mailing list, unless specifically requested to be removed
diff --git a/doc/NEW_STARTERS b/doc/NEW_STARTERS
index ba194492..2c5aac88 100644
--- a/doc/NEW_STARTERS
+++ b/doc/NEW_STARTERS
@@ -4,12 +4,12 @@ These are the steps for adding someone to the team.
 Need to know:
  - Name
-  - Primary email for nagiosplug-team mailings
+  - Primary email for team mailings
  - GitHub account
  - Type of member (translator, developer, release manager, project administrator)
-1. Add member to nagiosplug-team mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-team)
+1. Add member to team mailing list (https://www.monitoring-plugins.org/list/listinfo/team/)
-   and to the nagiosplug-checkins mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-checkins,
+   and to the commits mailing list (https://www.monitoring-plugins.org/list/listinfo/commits/),
   add sourceforge email address via Privacy Options->Sender filters)
 2. Add Sourceforge access:
  - Translator: CVS access, Shell access, Release Tech (no)
@@ -21,4 +21,4 @@ Need to know:
 3. Create account on project server
  - Add public ssh keys
 4. Add Git access on repos.or.cz
-5. Send email to nagiosplug-team introducing new member
+5. Send email to team introducing new member
diff --git a/doc/RELEASING b/doc/RELEASING
index 34bed939..1eaec9de 100644
--- a/doc/RELEASING
+++ b/doc/RELEASING
@@ -1,8 +1,5 @@
 NOTES ON RELEASING NEW VERSION OF NAGIOSPLUG
-NB: A copy of this document is located at:
-    http://nagiosplugins.org/node/96
 *** Pre-release
 git pull
 . tools/devmode, if feeling adventurous
@@ -24,15 +21,15 @@ git push origin master
 git push origin release-1.4.14
 *** Checkout new version
-rm -fr /tmp/nagioslug
+rm -fr /tmp/monitoringlug
 # If you need to checkout the tag, don't forget to "checkout master" later to
 # get back to your development branch:
 git checkout tags/release-1.4.14
 # Beware: the trailing slash of --prefix is REQUIRED
-git checkout-index --prefix=/tmp/nagioslug/ -a
+git checkout-index --prefix=/tmp/monitoringlug/ -a
 *** Build the tarball
-cd /tmp/nagioslug
+cd /tmp/monitoringlug
 tools/setup
 ./configure
 make dist
@@ -43,7 +40,7 @@ SF username and password
 cd /uploads
 put file
-SF -> Submit News about release. Make sure it is called "Nagios Plugins" (with those caps)
+SF -> Submit News about release. Make sure it is called "Monitoring Plugins" (with those caps)
 Link to download at http://sourceforge.net/project/showfiles.php?group_id=29880
 Include contents of NEWS for this release
 List all people on team involved.
@@ -60,5 +57,5 @@ Step 3: *.tar.gz, Platform Independent, Source .gz
 Step 4: Send notice
 *** Announce new release
-Send email to nagiosplug-help, nagios-announce with the news text
+Send email to help, announce with the news text
-Add a news item to http://nagiosplugins.org
+Add a news item to https://monitoring-plugins.org
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 666d7cc7..d9340285 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -1,18 +1,18 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" >
 <book>
-  <title>Nagios Plugin Development Guidelines</title>
+  <title>Monitoring Plugins Development Guidelines</title>
  <bookinfo>
    <authorgroup>
      <author>
        <affiliation>
-          <orgname>Nagios Plugins Development Team</orgname>
+          <orgname>Monitoring Plugins Development Team</orgname>
        </affiliation>
      </author>
    </authorgroup>
    <pubdate>2013</pubdate>
-    <title>Nagios Plugin Development Guidelines</title>
+    <title>Monitoring Plugins Development Guidelines</title>
        
    <revhistory>
       <revision>
@@ -23,7 +23,7 @@
        <copyright>
                <year>2000 - 2013</year>
-                <holder>Nagios Plugins Development Team</holder>
+                <holder>Monitoring Plugins Development Team</holder>
        </copyright>
 </bookinfo>
@@ -34,8 +34,8 @@
    the plugin developers and encourage the standarization of the
    different kind of plugins: C, shell, perl, python, etc.</para>
-        <para>Nagios Plugin Development Guidelines Copyright (C) 2000-2013
+        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
-        (Nagios Plugins Team)</para>
+        (Monitoring Plugins Team)</para>
        <para>Permission is granted to make and distribute verbatim
        copies of this manual provided the copyright notice and this
@@ -48,8 +48,8 @@
 <article>
 <section id="DevRequirements"><title>Development platform requirements</title>
        <para>
-        Nagios Plugins are developed to the GNU standard, so any OS which is supported by GNU
+        Monitoring Plugins are developed to the GNU standard, so any OS which is supported by GNU
-        should run the plugins. While the requirements for compiling the Nagios Plugins release 
+        should run the plugins. While the requirements for compiling the Monitoring Plugins release
        are very basic, developing from the Git repository requires additional software to be
        installed. These are the minimum levels of software required:
@@ -152,7 +152,7 @@
                <section><title>Plugin Return Codes</title>
                <para>The return codes below are based on the POSIX spec of returning
                a positive value.  Netsaint prior to v0.0.7 supported non-POSIX
-                compliant return code of "-1" for unknown.  Nagios supports POSIX return
+                compliant return code of "-1" for unknown. Nagios supports POSIX return
                codes by default.</para>
                <para>Note: Some plugins will on occasion print on STDOUT that an error
@@ -379,7 +379,7 @@
                        </listitem>
                </orderedlist>
-                <para>It is up to third party programs to convert the Nagios Plugins 
+                <para>It is up to third party programs to convert the Monitoring Plugins
                performance data into graphs.</para>
                </section>
@@ -715,7 +715,7 @@ properly on non-FreeBSD systems. Install with 'CPPFLAGS="-UHAVE_LIBPTHREAD" ./co
 </para>
 <para>
-When you run Nagios Plugins' configure, it will look for the tap library and will automatically
+When you run Monitoring Plugins' configure, it will look for the tap library and will automatically
 setup the tests. Run "make test" to run all the tests.
 </para>
 </section>
@@ -747,9 +747,9 @@ setup the tests. Run "make test" to run all the tests.
        </section>
        <section><title>Commit Messages</title>
-        <para>If the change is due to a contribution, please quote the contributor's name 
+        <para>If the change is due to a contribution, please quote the contributor's name
-        and, if applicable, add the SourceForge Tracker number. Don't forget to 
+        and, if applicable, add the GitHub Issue Tracker number. Don't forget to
-update the THANKS.in file.</para>
+  update the THANKS.in file.</para>
        <para>If you have a change that is useful for noting in the next release, please
        update the NEWS file.</para>
        <para>All commits will be written to a ChangeLog at release time.
@@ -760,7 +760,7 @@ update the THANKS.in file.</para>
        <para>To make the job easier for translators, please follow these guidelines:</para>
        <orderedlist>
          <listitem><para>
-            Before creating new strings, check the po/nagios-plugins.pot file to 
+            Before creating new strings, check the po/monitoring-plugins.pot file to
            see if a similar string
            already exists
          </para></listitem>
@@ -790,15 +790,15 @@ update the THANKS.in file.</para>
        version you are using. For new features, please supply a diff against
        the Git "master" branch.</para>
-        <para>Patches should be submitted via 
+        <para>Patches should be submitted via
-        <ulink url="http://sourceforge.net/tracker/?group_id=29880&amp;atid=397599">SourceForge's
+        <ulink url="https://github.com/monitoring-plugins/monitoring-plugins/pulls">GitHub's
-        tracker system for Nagiosplug patches</ulink> 
+        Pull requests for Monitoring Plugins</ulink>
-        and be announced to the nagiosplug-devel mailing list.</para>
+        </para>
        <para>Submission of a patch implies that the submmitter acknowledges that they
        are the author of the code (or have permission from the author to release the code)
-        and agree that the code can be released under the GPL. The copyright for the changes will 
+        and agree that the code can be released under the GPL. The copyright for the changes will
-        then revert to the Nagios Plugin Development Team - this is required so that any copyright 
+        then revert to the Monitoring Plugins Development Team - this is required so that any copyright
        infringements can be investigated quickly without contacting a huge list of copyright holders.
        Credit will always be given for any patches through a THANKS file in the distribution.</para>
        </section>
@@ -806,22 +806,22 @@ update the THANKS.in file.</para>
        <section id="Contributedplugins"><title>Contributed plugins</title>
        <para>Plugins that have been contributed to the project and 
-        distributed with the Nagios Plugin files are held in the contrib/ directory and are not installed
+        distributed with the Monitoring Plugins files are held in the contrib/ directory and are not installed
        by default. These plugins are not officially supported by the team. 
        The current policy is that these plugins should be owned and maintained by the original 
-        contributor, preferably hosted on <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>.
+        contributor, preferably hosted on <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
        </para>
        <para>If patches or bugs are raised to an contributed plugin, we will start communications with the
        original contributor, but seek to remove the plugin from our distribution.
        </para>
-        <para>The aim is to distribute only code that the Nagios Plugin team are responsible for.
+        <para>The aim is to distribute only code that the Monitoring Plugins team are responsible for.
        </para>
        </section>
        <section id="Newplugins"><title>New plugins</title>
        <para>If you would like others to use your plugins, please add it to
        the official 3rd party plugin repository, 
-        <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>.
+        <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
        </para>
        <para>We are not accepting requests for inclusion of plugins into 
@@ -832,7 +832,7 @@ update the THANKS.in file.</para>
      <orderedlist>
        <listitem>
          <para>Include copyright and license information in all files. Copyright must be solely
-                granted to the Nagios Plugin Development Team</para>
+                granted to the Monitoring Plugins Development Team</para>
        </listitem>
        <listitem>
          <para>The standard command options are supported (--help, --version,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 99fa591a..1515312c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,15 +2,15 @@
 SUBDIRS = . tests
-noinst_LIBRARIES = libnagiosplug.a
+noinst_LIBRARIES = libmonitoringplug.a
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
-libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
+libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
 EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
 if USE_PARSE_INI
-libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c
+libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
 endif USE_PARSE_INI
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 2939c7a1..70e7dd27 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios-plugins extra_opts library
+* Monitoring-plugins extra_opts library
 * 
 * License: GPL
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 4bb7b73b..8ff14a16 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -2,7 +2,7 @@
 #define _EXTRA_OPTS_H_
 /*
- * extra_opts.h: routines for loading nagios-plugin defaults from ini
+ * extra_opts.h: routines for loading monitoring-plugin defaults from ini
 * configuration files.
 */
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 004396fe..dfa72d9c 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios-plugins parse_ini library
+* Monitoring-plugins parse_ini library
 * 
 * License: GPL
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/lib/parse_ini.h b/lib/parse_ini.h
index e0ba8164..a3a494ef 100644
--- a/lib/parse_ini.h
+++ b/lib/parse_ini.h
@@ -2,7 +2,7 @@
 #define _PARSE_INI_H_
 /*
- * parse_ini.h: routines for loading nagios-plugin defaults from ini
+ * parse_ini.h: routines for loading monitoring-plugin defaults from ini
 * configuration files.
 */
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 1af5891a..c0411ac5 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -28,7 +28,7 @@ endif
 AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
-LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
+LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a
 SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 79e1110a..7a1a1fa1 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -40,20 +40,20 @@ main (int argc, char **argv)
        plan_tests(150);
-        ok( this_nagios_plugin==NULL, "nagios_plugin not initialised");
+        ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised");
        np_init( "check_test", argc, argv );
-        ok( this_nagios_plugin!=NULL, "nagios_plugin now initialised");
+        ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised");
-        ok( !strcmp(this_nagios_plugin->plugin_name, "check_test"), "plugin name initialised" );
+        ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" );
-        ok( this_nagios_plugin->argc==argc, "Argc set" );
+        ok( this_monitoring_plugin->argc==argc, "Argc set" );
-        ok( this_nagios_plugin->argv==argv, "Argv set" );
+        ok( this_monitoring_plugin->argv==argv, "Argv set" );
        np_set_args(0,0);
-        ok( this_nagios_plugin->argc==0, "argc changed" );
+        ok( this_monitoring_plugin->argc==0, "argc changed" );
-        ok( this_nagios_plugin->argv==0, "argv changed" );
+        ok( this_monitoring_plugin->argv==0, "argv changed" );
        np_set_args(argc, argv);
@@ -296,11 +296,11 @@ main (int argc, char **argv)
        diag( "You are probably running in wrong directory. Must run as ./test_utils" );
-        this_nagios_plugin->argc=4;
+        this_monitoring_plugin->argc=4;
-        this_nagios_plugin->argv[0] = "./test_utils";
+        this_monitoring_plugin->argv[0] = "./test_utils";
-        this_nagios_plugin->argv[1] = "here";
+        this_monitoring_plugin->argv[1] = "here";
-        this_nagios_plugin->argv[2] = "--and";
+        this_monitoring_plugin->argv[2] = "--and";
-        this_nagios_plugin->argv[3] = "now";
+        this_monitoring_plugin->argv[3] = "now";
        temp_string = (char *) _np_state_generate_key();
        ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
@@ -320,16 +320,16 @@ main (int argc, char **argv)
        ok(temp_state_key==NULL, "temp_state_key initially empty");
-        this_nagios_plugin->argc=1;
+        this_monitoring_plugin->argc=1;
-        this_nagios_plugin->argv[0] = "./test_utils";
+        this_monitoring_plugin->argv[0] = "./test_utils";
        np_enable_state(NULL, 51);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
        ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" );
        np_enable_state("allowedchars_in_keyname", 77);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
        ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" );
        ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/allowedchars_in_keyname"), "Got internal filename" );
@@ -338,12 +338,12 @@ main (int argc, char **argv)
        /* Don't do this test just yet. Will die */
        /*
        np_enable_state("bad^chars$in@here", 77);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
        ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" );
        */
        np_enable_state("funnykeyname", 54);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
        ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" );
@@ -367,9 +367,9 @@ main (int argc, char **argv)
        
        temp_state_key->_filename="var/statefile";
        temp_state_data = np_state_read();
-        ok( this_nagios_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
+        ok( this_monitoring_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
-        ok( this_nagios_plugin->state->state_data->time==1234567890, "Got time" );
+        ok( this_monitoring_plugin->state->state_data->time==1234567890, "Got time" );
-        ok( !strcmp((char *)this_nagios_plugin->state->state_data->data, "String to read"), "Data as expected" );
+        ok( !strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected" );
        temp_state_key->data_version=53;
        temp_state_data = np_state_read();
@@ -379,7 +379,7 @@ main (int argc, char **argv)
        temp_state_key->_filename="var/nonexistant";
        temp_state_data = np_state_read();
        ok( temp_state_data==NULL, "Missing file gives NULL" );
-        ok( this_nagios_plugin->state->state_data==NULL, "No state information" );
+        ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
        temp_state_key->_filename="var/oldformat";
        temp_state_data = np_state_read();
@@ -426,7 +426,7 @@ main (int argc, char **argv)
        temp_state_data = np_state_read();
        /* Check time is set to current_time */
        ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time");
-        ok(this_nagios_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
+        ok(this_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
        
        /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
@@ -438,7 +438,7 @@ main (int argc, char **argv)
        np_cleanup();
-        ok( this_nagios_plugin==NULL, "Free'd this_nagios_plugin" );
+        ok( this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin" );
        return exit_status();
 }
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 54463e92..57d01e27 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -3,7 +3,7 @@
 * utils_base.c
 *
 * License: GPL
-* Copyright (c) 2006 Nagios Plugins Development Team
+* Copyright (c) 2006 Monitoring Plugins Development Team
 *
 * Library of useful functions for plugins
 * 
@@ -33,53 +33,53 @@
 #define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
-nagios_plugin *this_nagios_plugin=NULL;
+monitoring_plugin *this_monitoring_plugin=NULL;
 int _np_state_read_file(FILE *);
 void np_init( char *plugin_name, int argc, char **argv ) {
-        if (this_nagios_plugin==NULL) {
+        if (this_monitoring_plugin==NULL) {
-                this_nagios_plugin = calloc(1, sizeof(nagios_plugin));
+                this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
-                if (this_nagios_plugin==NULL) {
+                if (this_monitoring_plugin==NULL) {
                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                            strerror(errno));
                }
-                this_nagios_plugin->plugin_name = strdup(plugin_name);
+                this_monitoring_plugin->plugin_name = strdup(plugin_name);
-                if (this_nagios_plugin->plugin_name==NULL)
+                if (this_monitoring_plugin->plugin_name==NULL)
                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                this_nagios_plugin->argc = argc;
+                this_monitoring_plugin->argc = argc;
-                this_nagios_plugin->argv = argv;
+                this_monitoring_plugin->argv = argv;
        }
 }
 void np_set_args( int argc, char **argv ) {
-        if (this_nagios_plugin==NULL)
+        if (this_monitoring_plugin==NULL)
                die(STATE_UNKNOWN, _("This requires np_init to be called"));
-        this_nagios_plugin->argc = argc;
+        this_monitoring_plugin->argc = argc;
-        this_nagios_plugin->argv = argv;
+        this_monitoring_plugin->argv = argv;
 }
 void np_cleanup() {
-        if (this_nagios_plugin!=NULL) {
+        if (this_monitoring_plugin!=NULL) {
-                if(this_nagios_plugin->state!=NULL) {
+                if(this_monitoring_plugin->state!=NULL) {
-                        if(this_nagios_plugin->state->state_data) { 
+                        if(this_monitoring_plugin->state->state_data) {
-                                np_free(this_nagios_plugin->state->state_data->data);
+                                np_free(this_monitoring_plugin->state->state_data->data);
-                                np_free(this_nagios_plugin->state->state_data);
+                                np_free(this_monitoring_plugin->state->state_data);
                        }
-                        np_free(this_nagios_plugin->state->name);
+                        np_free(this_monitoring_plugin->state->name);
-                        np_free(this_nagios_plugin->state);
+                        np_free(this_monitoring_plugin->state);
                }
-                np_free(this_nagios_plugin->plugin_name);
+                np_free(this_monitoring_plugin->plugin_name);
-                np_free(this_nagios_plugin);
+                np_free(this_monitoring_plugin);
        }
-        this_nagios_plugin=NULL;
+        this_monitoring_plugin=NULL;
 }
-/* Hidden function to get a pointer to this_nagios_plugin for testing */
+/* Hidden function to get a pointer to this_monitoring_plugin for testing */
-void _get_nagios_plugin( nagios_plugin **pointer ){
+void _get_monitoring_plugin( monitoring_plugin **pointer ){
-        *pointer = this_nagios_plugin;
+        *pointer = this_monitoring_plugin;
 }
 void
@@ -89,7 +89,7 @@ die (int result, const char *fmt, ...)
        va_start (ap, fmt);
        vprintf (fmt, ap);
        va_end (ap);
-        if(this_nagios_plugin!=NULL) {
+        if(this_monitoring_plugin!=NULL) {
                np_cleanup();
        }
        exit (result);
@@ -375,14 +375,14 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
 char *_np_state_generate_key() {
        struct sha1_ctx ctx;
        int i;
-        char **argv = this_nagios_plugin->argv;
+        char **argv = this_monitoring_plugin->argv;
        unsigned char result[20];
        char keyname[41];
        char *p=NULL;
        sha1_init_ctx(&ctx);
        
-        for(i=0; i<this_nagios_plugin->argc; i++) {
+        for(i=0; i<this_monitoring_plugin->argc; i++) {
                sha1_process_bytes(argv[i], strlen(argv[i]), &ctx);
        }
@@ -401,9 +401,9 @@ char *_np_state_generate_key() {
 }
 void _cleanup_state_data() {
-        if (this_nagios_plugin->state->state_data!=NULL) {
+        if (this_monitoring_plugin->state->state_data!=NULL) {
-                np_free(this_nagios_plugin->state->state_data->data);
+                np_free(this_monitoring_plugin->state->state_data->data);
-                np_free(this_nagios_plugin->state->state_data);
+                np_free(this_monitoring_plugin->state->state_data);
        }
 }
@@ -432,7 +432,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
        char *temp_keyname = NULL;
        char *p=NULL;
-        if(this_nagios_plugin==NULL)
+        if(this_monitoring_plugin==NULL)
                die(STATE_UNKNOWN, _("This requires np_init to be called"));
        this_state = (state_key *) calloc(1, sizeof(state_key));
@@ -456,15 +456,15 @@ void np_enable_state(char *keyname, int expected_data_version) {
                p++;
        }
        this_state->name=temp_keyname;
-        this_state->plugin_name=this_nagios_plugin->plugin_name;
+        this_state->plugin_name=this_monitoring_plugin->plugin_name;
        this_state->data_version=expected_data_version;
        this_state->state_data=NULL;
        /* Calculate filename */
-        asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_nagios_plugin->plugin_name, this_state->name);
+        asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_monitoring_plugin->plugin_name, this_state->name);
        this_state->_filename=temp_filename;
-        this_nagios_plugin->state = this_state;
+        this_monitoring_plugin->state = this_state;
 }
 /*
@@ -479,11 +479,11 @@ state_data *np_state_read() {
        FILE *statefile;
        int rc = FALSE;
-        if(this_nagios_plugin==NULL)
+        if(this_monitoring_plugin==NULL)
                die(STATE_UNKNOWN, _("This requires np_init to be called"));
        /* Open file. If this fails, no previous state found */
-        statefile = fopen( this_nagios_plugin->state->_filename, "r" );
+        statefile = fopen( this_monitoring_plugin->state->_filename, "r" );
        if(statefile!=NULL) {
                this_state_data = (state_data *) calloc(1, sizeof(state_data));
@@ -492,7 +492,7 @@ state_data *np_state_read() {
                            strerror(errno));
                this_state_data->data=NULL;
-                this_nagios_plugin->state->state_data = this_state_data;
+                this_monitoring_plugin->state->state_data = this_state_data;
                rc = _np_state_read_file(statefile);
@@ -503,10 +503,10 @@ state_data *np_state_read() {
                _cleanup_state_data();
        }
-        return this_nagios_plugin->state->state_data;
+        return this_monitoring_plugin->state->state_data;
 }
-/* 
+/*
 * Read the state file
 */
 int _np_state_read_file(FILE *f) {
@@ -544,7 +544,7 @@ int _np_state_read_file(FILE *f) {
                                break;
                        case STATE_DATA_VERSION:
                                i=atoi(line);
-                                if(i != this_nagios_plugin->state->data_version)
+                                if(i != this_monitoring_plugin->state->data_version)
                                        failure++;
                                else
                                        expected=STATE_DATA_TIME;
@@ -555,13 +555,13 @@ int _np_state_read_file(FILE *f) {
                                if(data_time > current_time)
                                        failure++;
                                else {
-                                        this_nagios_plugin->state->state_data->time = data_time;
+                                        this_monitoring_plugin->state->state_data->time = data_time;
                                        expected=STATE_DATA_TEXT;
                                }
                                break;
                        case STATE_DATA_TEXT:
-                                this_nagios_plugin->state->state_data->data = strdup(line);
+                                this_monitoring_plugin->state->state_data->data = strdup(line);
-                                if(this_nagios_plugin->state->state_data->data==NULL)
+                                if(this_monitoring_plugin->state->state_data->data==NULL)
                                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
                                expected=STATE_DATA_END;
                                status=TRUE;
@@ -596,8 +596,8 @@ void np_state_write_string(time_t data_time, char *data_string) {
                current_time=data_time;
        
        /* If file doesn't currently exist, create directories */
-        if(access(this_nagios_plugin->state->_filename,F_OK)!=0) {
+        if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
-                asprintf(&directories, "%s", this_nagios_plugin->state->_filename);
+                asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
                if(directories==NULL)
                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                            strerror(errno));
@@ -607,7 +607,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                                *p='\0';
                                if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) {
                                        /* Can't free this! Otherwise error message is wrong! */
-                                        /* np_free(directories); */ 
+                                        /* np_free(directories); */
                                        die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
                                }
                                *p='/';
@@ -616,7 +616,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                np_free(directories);
        }
-        asprintf(&temp_file,"%s.XXXXXX",this_nagios_plugin->state->_filename);
+        asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
        if(temp_file==NULL)
                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                    strerror(errno));
@@ -636,7 +636,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
        
        fprintf(fp,"# NP State file\n");
        fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
-        fprintf(fp,"%d\n",this_nagios_plugin->state->data_version);
+        fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
        fprintf(fp,"%lu\n",current_time);
        fprintf(fp,"%s\n",data_string);
        
@@ -654,7 +654,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                die(STATE_UNKNOWN, _("Error writing temp file"));
        }
-        if(rename(temp_file, this_nagios_plugin->state->_filename)!=0) {
+        if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) {
                unlink(temp_file);
                np_free(temp_file);
                die(STATE_UNKNOWN, _("Cannot rename state temp file"));
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 0cb371fd..3b00da57 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -1,6 +1,6 @@
 #ifndef _UTILS_BASE_
 #define _UTILS_BASE_
-/* Header file for nagios plugins utils_base.c */
+/* Header file for monitoring plugins utils_base.c */
 #include "sha1.h"
@@ -52,7 +52,7 @@ typedef struct np_struct {
        state_key *state;
        int       argc;
        char      **argv;
-        } nagios_plugin;
+        } monitoring_plugin;
 range *parse_range_string (char *);
 int _set_thresholds(thresholds **, char *, char *);
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 0c853dcc..4c6d0be1 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios run command utilities
+* Monitoring run command utilities
 *
 * License: GPL
-* Copyright (c) 2005-2006 Nagios Plugins Development Team
+* Copyright (c) 2005-2006 Monitoring Plugins Development Team
 *
 * Description :
 *
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 8ebb5894..36a6ff02 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -2,7 +2,7 @@
 #define _UTILS_CMD_
 /* 
- * Header file for nagios plugins utils_cmd.c
+ * Header file for monitoring plugins utils_cmd.c
 * 
 * 
 */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 5be2b2c0..efe35fc5 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -3,7 +3,7 @@
 * Library for check_disk
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 46ad7f72..b37c446f 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -3,7 +3,7 @@
 * Library for check_tcp
 * 
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4
index cd36c4f7..c2a4d2a7 100644
--- a/m4/np_mysqlclient.m4
+++ b/m4/np_mysqlclient.m4
@@ -1,6 +1,6 @@
 # np_mysqlclient.m4
-dnl Copyright (C) 2007 Nagios Plugins Team
+dnl Copyright (C) 2007 Monitoring Plugins Team
-dnl This file is free software; the Nagios Plugin Team
+dnl This file is free software; the Monitoring Plugins Team
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/nagios-plugins.spec.in b/monitoring-plugins.spec.in
index 17a44c36..62e5e4fd 100644
--- a/nagios-plugins.spec.in
+++ b/monitoring-plugins.spec.in
@@ -15,15 +15,15 @@
 %define nphome /opt/nagios
 %define npgrp nagios
-Name: nagios-plugins
+Name: monitoring-plugins
 Version: @PACKAGE_VERSION@
 Release: @RELEASE@
-Summary: Host/service/network monitoring program plugins for Nagios
+Summary: Host/service/network monitoring program plugins for Nagios and compatible
 Group: Applications/System
 License: GPL
-URL: http://nagiosplug.sourceforge.net/
+URL: https://www.monitoring-plugins.org/
-Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
+Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define npdir %{_builddir}/%{name}-%{version}
@@ -34,11 +34,11 @@ Prefix: %{_prefix}
 Prefix: %{_prefix}/lib/nagios/plugins
 %endif
 Packager: Karl DeBisschop <kdebisschop@users.sourceforge.net>
-Vendor: Nagios Plugin Development Group
+Vendor: Monitoring Plugins Development Team
-Provides: nagios-plugins
+Provides: monitoring-plugins
 %{!?custom:%global custom 0}
-Obsoletes: nagios-plugins-custom nagios-plugins-extras
+Obsoletes: monitoring-plugins-custom monitoring-plugins-extras
 # Requires
@@ -105,8 +105,8 @@ network, and to email or page you when a problem arises or is
 resolved. Nagios runs on a unix server as a background or daemon
 process, intermittently running checks on various services that you
 specify. The actual service checks are performed by separate "plugin"
-programs which return the status of the checks to Nagios. This package
+programs which return the status of the checks to the monitoring
-contains those plugins.
+system. This package contains those plugins.
 %prep
@@ -184,8 +184,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS
 %doc ChangeLog command.cfg
 %if ! %{isaix}
-%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo
+%{_datadir}/locale/de/LC_MESSAGES/monitoring-plugins.mo
-%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo
+%{_datadir}/locale/fr/LC_MESSAGES/monitoring-plugins.mo
 %endif
 %changelog
diff --git a/perlmods/install_order b/perlmods/install_order
index c44c8723..287cf8f3 100644
--- a/perlmods/install_order
+++ b/perlmods/install_order
@@ -13,4 +13,4 @@ Params-Validate
 Math-Calc-Units
 Class-Accessor
 Config-Tiny
-Nagios-Plugin
+Monitoring-Plugin
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index 3bed3464..eedd20d0 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,11 +1,11 @@
 PKG="NGOSplugin"
-NAME="nagios-plugins"
+NAME="monitoring-plugins"
-DESC="Nagios network monitoring plugins"
+DESC="Network monitoring plugins for Nagios and compatible"
 ARCH="@PKG_ARCH@"
 VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@"
 CATEGORY="application"
-VENDOR="Nagios Plugin Development Team"
+VENDOR="Monitoring Plugins Development Team"
-EMAIL="nagiosplug-devel@lists.sourceforge.net"
+EMAIL="devel@monitoring-plugins.org"
 PSTAMP="nag@REV_TIMESTAMP@"
 BASEDIR="/"
 CLASSES="none"
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 9623b1fa..a1ebb6d2 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
 EXTRA_DIST = t pst3.c
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
@@ -83,7 +83,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
 pst3_LDFLAGS = @PST3CFLAGS@
-# pst3 must not use nagiosplug/gnulib includes!
+# pst3 must not use monitoringplug/gnulib includes!
 pst3_CPPFLAGS =
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 42eedec8..e682dd02 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_dhcp plugin
+* monitoring check_dhcp plugin
 * 
 * License: GPL
 * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2001-2007 Nagios Plugin Development Team
+* Copyright (c) 2001-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -35,7 +35,7 @@
 const char *progname = "check_dhcp";
 const char *copyright = "2001-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 56685f86..4c3df0bc 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_icmp plugin
+* monitoring check_icmp plugin
 * 
 * License: GPL
-* Copyright (c) 2005-2008 Nagios Plugins Development Team
+* Copyright (c) 2005-2008 Monitoring Plugins Development Team
 * Original Author : Andreas Ericsson <ae@op5.se>
 * 
 * Description:
@@ -40,9 +40,9 @@
 /* char *progname = "check_icmp"; */
 char *progname;
 const char *copyright = "2005-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
-/** nagios plugins basic includes */
+/** monitoring plugins basic includes */
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 8ca52814..ee9d108d 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -3,7 +3,7 @@
 * pst3
 * 
 * License: GPL
-* Copyright (c) 2008 Nagios Plugin Development Team
+* Copyright (c) 2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 0c89db57..8b6cd2eb 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -3,7 +3,7 @@
 #
 # check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port]
 #
-# Nagios host script to get the disk usage from a SMB share
+# Monitoring host script to get the disk usage from a SMB share
 #
 # Changes and Modifications
 # =========================
@@ -171,7 +171,7 @@ my $res = undef;
 my $perfdata = "";
 my @lines = undef;
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub { 
        print "No Answer from Client\n";
        exit $ERRORS{"UNKNOWN"};
@@ -293,7 +293,7 @@ sub print_help () {
        print_revision($PROGNAME,'@NP_VERSION@');
        print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
-Perl Check SMB Disk plugin for Nagios
+Perl Check SMB Disk plugin for monitoring
 ";
        print_usage();
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index dcd5efab..2ae11386 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -17,9 +17,8 @@
 # GNU General Public License for more details.
 #
 # you should have received a copy of the GNU General Public License
-# along with this program (or with Nagios);  if not, write to the
+# along with this program if not, write to the Free Software Foundation,
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-# Boston, MA 02111-1307, USA
 use strict;
 use English;
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl
index 54d933c7..574c1ccf 100755
--- a/plugins-scripts/check_flexlm.pl
+++ b/plugins-scripts/check_flexlm.pl
@@ -9,7 +9,7 @@
 # Check and interpret the output of lmstat
 # and create returncodes and output.
 #
-# Contrary to the nagios concept, this script takes
+# Contrary to most other plugins, this script takes
 # a file, not a hostname as an argument and returns
 # the status of hosts and services described in that
 # file. Use these hosts.cfg entries as an example
@@ -72,7 +72,7 @@ unless (defined $opt_F) {
        print_usage();
        exit $ERRORS{'UNKNOWN'};
 }
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
        print "Timeout: No Answer from Client\n";
        exit $ERRORS{'UNKNOWN'};
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 588993be..abcec68f 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -1,9 +1,9 @@
 #!/usr/local/bin/perl -w
 #
-# check_ifoperstatus.pl - nagios plugin 
+# check_ifoperstatus.pl - monitoring plugin
 #
 # Copyright (C) 2000 Christoph Kron,
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines
 # Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh)
 # Added SNMPv3 support (10/2003)
 #
@@ -22,7 +22,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #
-# Report bugs to:  nagiosplug-help@lists.sourceforge.net
+# Report bugs to:  help@monitoring-plugins.org
 #
 # 11.01.2000 Version 1.0
 #
@@ -97,7 +97,7 @@ my %session_opts;
 $status = process_arguments();
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
        print ("ERROR: No snmp response from $hostname (alarm)\n");
        exit $ERRORS{"UNKNOWN"};
@@ -288,7 +288,7 @@ sub print_usage() {
 sub print_help() {
        print_revision($PROGNAME, '@NP_VERSION@');
        print_usage();
-        printf "check_ifoperstatus plugin for Nagios monitors operational \n";
+        printf "check_ifoperstatus plugin for monitoring operational \n";
        printf "status of a particular network interface on the target host\n";
        printf "\nUsage:\n";
        printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 63c71ffa..a4be9602 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -1,10 +1,10 @@
 #!/usr/local/bin/perl -w
 #
-# check_ifstatus.pl - nagios plugin 
+# check_ifstatus.pl - monitoring plugin
 # 
 #
 # Copyright (C) 2000 Christoph Kron
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines (S. Ghosh)
 #  Added -x option (4/2003)
 #  Added -u option (4/2003)
 #  Added -M option (10/2003)
@@ -25,7 +25,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #
-# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net
+# Report bugs to: ck@zet.net, help@monitoring-plugins.org
 # 
 # 11.01.2000 Version 1.0
 #
@@ -99,7 +99,7 @@ my %session_opts;
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
     print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
     exit $ERRORS{"UNKNOWN"};
@@ -239,7 +239,7 @@ sub print_usage() {
 sub print_help() {
        print_revision($PROGNAME, '@NP_VERSION@');
        print_usage();
-        printf "check_ifstatus plugin for Nagios monitors operational \n";
+        printf "check_ifstatus plugin for monitoring operational \n";
        printf "status of each network interface on the target host\n";
        printf "\nUsage:\n";
        printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 42a9bca9..7612a0ef 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -16,8 +16,6 @@
 # -----------------------------------------------------------------------------
 # Copyright 1999 (c) Richard Mayhew
 #
-# Credits go to Ethan Galstad for coding Nagios
-#
 # If any changes are made to this script, please mail me a copy of the
 # changes :)
 #
@@ -121,7 +119,7 @@ sub print_help ()
        print_revision($PROGNAME,'@NP_VERSION@');
        print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
-Perl Check IRCD plugin for Nagios
+Perl Check IRCD plugin for monitoring
 ";
        print_usage();
@@ -205,7 +203,7 @@ MAIN:
        if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; }
-        # Just in case of problems, let's not hang Nagios
+        # Just in case of problems, let's not hang the monitoring system
        $SIG{'ALRM'} = sub {
                print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index ca5810ab..54408cbd 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Log file pattern detector plugin for Nagios
+# Log file pattern detector plugin for monitoring
 # Written by Ethan Galstad (nagios@nagios.org)
 # Last Modified: 07-31-1999
 #
@@ -29,15 +29,15 @@
 #
 # If you use this plugin make sure to keep the following in mind:
 #
-#    1.  The "max_attempts" value for the service should be 1, as this
+#    1.  The "max_attempts" value for the service should be 1, as this will
-#        will prevent Nagios from retrying the service check (the
+#        prevent the monitoring system from retrying the service check (the
 #        next time the check is run it will not produce the same results).
 #
-#    2.  The "notify_recovery" value for the service should be 0, so that
+#    2.  The "notify_recovery" value for the service should be 0, so that the
-#        Nagios does not notify you of "recoveries" for the check.  Since
+#        monitoring system does not notify you of "recoveries" for the check.
-#        pattern matches in the log file will only be reported once and not
+#        Since pattern matches in the log file will only be reported once and
-#        the next time, there will always be "recoveries" for the service, even
+#        not the next time, there will always be "recoveries" for the service,
-#        though recoveries really don't apply to this type of check.
+#        even though recoveries really don't apply to this type of check.
 #
 #    3.  You *must* supply a different <old_file_log> for each service that
 #        you define to use this plugin script - even if the different services
@@ -85,7 +85,7 @@ print_help() {
    echo ""
    print_usage
    echo ""
-    echo "Log file pattern detector plugin for Nagios"
+    echo "Log file pattern detector plugin for monitoring"
    echo ""
    support
 }
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index 9a8fc511..e3e7391d 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# Report bugs to: nagiosplug-help@lists.sourceforge.net
+# Report bugs to: help@monitoring-plugins.org
 # 
 #
@@ -44,7 +44,7 @@ my $exitcode = $ERRORS{'OK'};
 process_arguments();
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
     print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n");
     exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl
index 5c87e0a6..d452b1b2 100755
--- a/plugins-scripts/check_ntp.pl
+++ b/plugins-scripts/check_ntp.pl
@@ -172,7 +172,7 @@ if ($utils::PATH_TO_NTPQ && -x $utils::PATH_TO_NTPQ ) {
        $have_ntpq = 0;
 }
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
        print ("ERROR: No response from ntp server (alarm)\n");
        exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 2a8ab21d..73a19cff 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -3,7 +3,7 @@
 # latigid010@yahoo.com
 # 01/06/2000
 #
-#  This Nagios plugin was created to check Oracle status
+#  This Monitoring plugin was created to check Oracle status
 #
 PROGNAME=`basename $0`
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index d2701e95..474067e3 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# check_rpc plugin for nagios
+# check_rpc plugin for monitoring
 #
 # usage:
 #    check_rpc host service
@@ -254,7 +254,7 @@ $proto = 't' if ($opt_t);
 $proto = 'u' if ($opt_u);
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
        print ("ERROR: No response from RPC server (alarm)\n");
        exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 37cd62c3..b25def54 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -1,6 +1,6 @@
-# Utility drawer for Nagios plugins.
+# Utility drawer for monitoring plugins.
 #
-# This will be deprecated soon. Please use Nagios::Plugin from CPAN
+# This will be deprecated soon. Please use Monitoring::Plugin from CPAN
 # for new plugins
 package utils;
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 031dd251..d2ac4bec 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -48,7 +48,7 @@ noinst_LIBRARIES = libnpcommon.a
 libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c  \
        popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
-BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a
+BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS)
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index daeb7578..12038d07 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_apt plugin
+* monitoring check_apt plugin
 * 
 * License: GPL
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Original author: Sean Finney
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_apt";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index c5f0d529..e3ec1caf 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_by_ssh plugin
+* monitoring check_by_ssh plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -28,7 +28,7 @@
 const char *progname = "check_by_ssh";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
@@ -246,7 +246,7 @@ process_arguments (int argc, char **argv)
                        }
                        service[services - 1] = p1;
                        break;
-                case 'n':                                                                       /* short name of host in nagios configuration */
+                case 'n':                                                                       /* short name of host in the monitoring configuration */
                        host_shortname = optarg;
                        break;
@@ -371,7 +371,7 @@ validate_arguments (void)
                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
        if (passive && host_shortname == NULL)
-                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname);
+                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
        return OK;
 }
@@ -416,11 +416,11 @@ print_help (void)
  printf (" %s\n","-i, --identity=KEYFILE");
  printf ("    %s\n", _("identity of an authorized key [optional]"));
  printf (" %s\n","-O, --output=FILE");
-  printf ("    %s\n", _("external command file for nagios [optional]"));
+  printf ("    %s\n", _("external command file for monitoring [optional]"));
  printf (" %s\n","-s, --services=LIST");
-  printf ("    %s\n", _("list of nagios service names, separated by ':' [optional]"));
+  printf ("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
  printf (" %s\n","-n, --name=NAME");
-  printf ("    %s\n", _("short name of host in nagios configuration [optional]"));
+  printf ("    %s\n", _("short name of host in the monitoring configuration [optional]"));
  printf (" %s\n","-o, --ssh-option=OPTION");
  printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
  printf (" %s\n","-F, --configfile");
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index d4e39e0f..cf699e1f 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x
+* check_cluster.c - Host and Service Cluster Plugin for Monitoring
 * 
 * License: GPL
 * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 const char *progname = "check_cluster";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
@@ -227,7 +227,7 @@ print_help(void)
        printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
        printf(COPYRIGHT, copyright, email);
-        printf(_("Host/Service Cluster Plugin for Nagios 2"));
+        printf(_("Host/Service Cluster Plugin for Monitoring"));
        printf("\n\n");
        print_usage();
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 8c4a511d..692a600e 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dbi plugin
+* monitoring check_dbi plugin
 * 
 * License: GPL
-* Copyright (c) 2011 Nagios Plugins Development Team
+* Copyright (c) 2011 Monitoring Plugins Development Team
 * Author: Sebastian 'tokkee' Harl <sh@teamix.net>
 * 
 * Description:
@@ -31,7 +31,7 @@
 const char *progname = "check_dbi";
 const char *copyright = "2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index c113d87b..246624ae 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dig plugin
+* monitoring check_dig plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2008 Nagios Plugins Development Team
+* Copyright (c) 2002-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_dig";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 04d588fb..7d6ab7f4 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_disk plugin
+* monitoring check_disk plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* Copyright (c) 1999-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 const char *progname = "check_disk";
 const char *program_name = "check_disk";  /* Required for coreutils libs */
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index ac6cfc38..4b3a0fb4 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dns plugin
+* monitoring check_dns plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_dns";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 3cfc9ede..ab907731 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dummy plugin
+* monitoring check_dummy plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_dummy";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index dad000e6..786276ea 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_fping plugin
+* monitoring check_fping plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_fping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 89bb4b12..205f4678 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_game plugin
+* monitoring check_game plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2007 Nagios Plugins Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_game";
 const char *copyright = "2002-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 60e922ed..0d86eb16 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_hpjd plugin
+* monitoring check_hpjd plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_hpjd";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c36d916a..03465540 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios check_http plugin
+* monitoring check_http plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -35,7 +35,7 @@
 const char *progname = "check_http";
 const char *copyright = "1999-2013";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
@@ -157,7 +157,7 @@ main (int argc, char **argv)
  /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
  server_url = strdup(HTTP_URL);
  server_url_length = strlen(server_url);
-  xasprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
+  xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)",
            NP_VERSION, VERSION);
  /* Parse extra opts if any */
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 0a8009ab..72fc707a 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
 * 
-* Nagios check_ide_smart plugin
+* monitoring check_ide_smart plugin
 * ide-smart 1.3 - IDE S.M.A.R.T. checking tool
 * 
 * License: GPL
 * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
 *               1998      Gadi Oxman <gadio@netvision.net.il>
 * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -35,7 +35,7 @@
 const char *progname = "check_ide_smart";
 const char *copyright = "1998-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
        
 #include "common.h"
 #include "utils.h"
@@ -592,7 +592,7 @@ print_help (void)
 {
        print_revision (progname, NP_VERSION);
-        printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
+        printf ("monitoring feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
        printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
        printf (COPYRIGHT, copyright, email);
@@ -616,8 +616,8 @@ print_help (void)
  printf ("    %s\n", _("Turn on automatic offline tests"));
  printf (" %s\n", "-0, --auto-off");
  printf ("    %s\n", _("Turn off automatic offline tests"));
-  printf (" %s\n", "-n, --nagios");
+  printf (" %s\n", "-n, --monitoring");
-  printf ("    %s\n", _("Output suitable for Nagios"));
+  printf ("    %s\n", _("Output suitable for the monitoring system"));
  printf (UT_SUPPORT);
 }
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b05aca9a..9c9b9c98 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ldap plugin
+* monitoring check_ldap plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 296a8233..2a3436db 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_load plugin
+* monitoring check_load plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_load";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index d6162f35..192aa928 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mrtg plugin
+* monitoring check_mrtg plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_mrtg";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index a8226514..4ce0f865 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mrtgtraf plugin
+* monitoring check_mrtgtraf plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_mrtgtraf";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 int process_arguments (int, char **);
 int validate_arguments (void);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index db670e2d..8dc2000a 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
 * 
-* Nagios check_mysql plugin
+* monitoring check_mysql plugin
 * 
 * License: GPL
 * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2011 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 const char *progname = "check_mysql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #define SLAVERESULTSIZE 70
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 0bb83c3e..10d47a32 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mysql_query plugin
+* monitoring check_mysql_query plugin
 * 
 * License: GPL
-* Copyright (c) 2006-2009 Nagios Plugins Development Team
+* Copyright (c) 2006-2009 Monitoring Plugins Development Team
 * Original code from check_mysql, copyright 1999 Didi Rieder
 * 
 * Description:
@@ -31,7 +31,7 @@
 const char *progname = "check_mysql_query";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 4fd6342d..791b6dbe 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_nagios plugin
+* Monitoring check_nagios plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_nagios";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 52bbd1c5..de99d3f5 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_nt plugin
+* monitoring check_nt plugin
 * 
 * License: GPL
 * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_nt";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
@@ -750,7 +750,7 @@ void print_help(void)
        printf ("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
        printf ("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
        printf ("  %s\n", _("  to run Perfmon directly."));
-        printf ("  %s\n", _("It can also be used in scripts that automatically create Nagios service"));
+        printf ("  %s\n", _("It can also be used in scripts that automatically create the monitoring service"));
        printf ("  %s\n", _(" configuration files."));
        printf ("  %s\n", _("Some examples:"));
        printf ("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 16be7c51..d293d8b7 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp plugin
+* monitoring check_ntp plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 const char *progname = "check_ntp";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 76152e17..56d7400d 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp_peer plugin
+* monitoring check_ntp_peer plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -37,7 +37,7 @@
 const char *progname = "check_ntp_peer";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index bbcaa0ba..a117ab2a 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp_time plugin
+* monitoring check_ntp_time plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -36,7 +36,7 @@
 const char *progname = "check_ntp_time";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6ebe8f83..96635288 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_nwstat plugin
+* monitoring check_nwstat plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_nwstat";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 95977e91..de41b372 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_overcr plugin
+* monitoring check_overcr plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "check_overcr";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 324bd5f4..a4e79e87 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_pgsql plugin
+* monitoring check_pgsql plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2011 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_pgsql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
@@ -563,7 +563,7 @@ print_help (void)
        printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
        printf (" %s\n\n", _("connections (start the postmaster with the -i option)."));
-        printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be"));
+        printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be"));
        printf (" %s\n", _("able to connect to the database without a password. The plugin can also send"));
        printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password."));
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index eef2195b..c0747204 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ping plugin
+* monitoring check_ping plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_ping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index c2239dba..065f7226 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_procs plugin
+* monitoring check_procs plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_procs";
 const char *program_name = "check_procs";  /* Required for coreutils libs */
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e54105b0..61ced532 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_radius plugin
+* monitoring check_radius plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* Copyright (c) 1999-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_radius";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
@@ -370,7 +370,7 @@ print_help (void)
  printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
        printf ("%s\n", _("The password option presents a substantial security issue because the"));
  printf ("%s\n", _("password can possibly be determined by careful watching of the command line"));
-  printf ("%s\n", _("in a process listing. This risk is exacerbated because nagios will"));
+  printf ("%s\n", _("in a process listing. This risk is exacerbated because the monitor will"));
  printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that"));
  printf ("%s\n", _("the password used does not allow access to sensitive system resources."));
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 18240f30..92dd3d9e 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_real plugin
+* monitoring check_real plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_real";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d477a51e..e04e84d4 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_smtp plugin
+* monitoring check_smtp plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_smtp";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 52ad31ea..2ca36b0e 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_snmp plugin
+* monitoring check_snmp plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_snmp";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e8a5fc5..f0a40320 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ssh plugin
+* monitoring check_ssh plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_ssh";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 1b2a8dd5..20257eb3 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_disk plugin
+* monitoring check_disk plugin
 * 
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 const char *progname = "check_swap";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 6ab82616..a9928011 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios check_tcp plugin
+* monitoring check_tcp plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -30,7 +30,7 @@
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include <ctype.h>
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7ee014e9..e082723d 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_time plugin
+* monitoring check_time plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 const char *progname = "check_time";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 59dcc264..bba36ad9 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -1,16 +1,16 @@
 /*****************************************************************************
 * 
-* Nagios check_ups plugin
+* monitoring check_ups plugin
 * 
 * License: GPL
 * Copyright (c) 2000 Tom Shields
 *               2004 Alain Richard <alain.richard@equation.fr>
 *               2004 Arnaud Quette <arnaud.quette@mgeups.com>
-* Copyright (c) 2002-2007 Nagios Plugins Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
-* This file contains Network UPS Tools plugin for Nagios
+* This file contains Network UPS Tools plugin for Monitoring
 * 
 * This plugin tests the UPS service on the specified host. Network UPS Tools
 * from www.networkupstools.org must be running for this plugin to work.
@@ -34,7 +34,7 @@
 const char *progname = "check_ups";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_users.c b/plugins/check_users.c
index ff2aedd2..246130b0 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_users plugin
+* monitoring check_users plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2012 Nagios Plugins Development Team
+* Copyright (c) 2000-2012 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 const char *progname = "check_users";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/common.h b/plugins/common.h
index f1358380..01003b3b 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins common include file
+* Monitoring Plugins common include file
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/negate.c b/plugins/negate.c
index ef7d4e03..a6a43046 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios negate plugin
+* monitoring negate plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2008 Nagios Plugins Development Team
+* Copyright (c) 2002-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 const char *progname = "negate";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #define DEFAULT_TIMEOUT 11
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 9f18723a..00440465 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins network utilities
+* Monitoring Plugins network utilities
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2008 Nagios Plugins Development Team
+* Copyright (c) 2003-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 347509e2..c5aa18fc 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins net utilities include file
+* Monitoring Plugins net utilities include file
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/popen.c b/plugins/popen.c
index 716bd524..592263fd 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios plugins popen
+* Monitoring Plugins popen
 * 
 * License: GPL
-* Copyright (c) 2005-2007 Nagios Plugins Development Team
+* Copyright (c) 2005-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8aba1e33..4352e603 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios run command utilities
+* Monitoring run command utilities
 * 
 * License: GPL
-* Copyright (c) 2005-2006 Nagios Plugins Development Team
+* Copyright (c) 2005-2006 Monitoring Plugins Development Team
 * 
 * Description :
 * 
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index fe660673..2dcdadf0 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 * 
 * License: GPL
-* Copyright (c) 2005 Nagios Plugins Development Team
+* Copyright (c) 2005 Monitoring Plugins Development Team
 * Author: Andreas Ericsson <ae@op5.se>
 * 
 * 
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 2ec91904..2732125d 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios plugins SSL utilities
+* Monitoring Plugins SSL utilities
 * 
 * License: GPL
-* Copyright (c) 2005-2010 Nagios Plugins Development Team
+* Copyright (c) 2005-2010 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 39b4ca9f..7e0f74b7 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -4,7 +4,7 @@
 #
 #
-# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc
+# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc
 use strict;
 use Test::More;
@@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output");
 # Get perf data
-# Should use Nagios::Plugin
+# Should use Monitoring::Plugin
 my @perf_data = sort(split(/ /, $result->perf_output));
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index 64aaf0ce..2c903db9 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -17,7 +17,7 @@ my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/';
 my $hostname_valid = getTestParameter( 
                        "NP_HOSTNAME_VALID",
                        "A valid (known to DNS) hostname",
-                        "nagios.com"
+                        "monitoring-plugins.org"
                        );
 my $hostname_valid_ip = getTestParameter(
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 29086737..5bd27d2b 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -31,8 +31,8 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS",
                "yes");
 my $host_tcp_http2  = getTestParameter( "NP_HOST_TCP_HTTP2",
-            "A host providing an index page containing the string 'nagios'",
+            "A host providing an index page containing the string 'monitoring'",
-            "nagios.org" );
+            "monitoring-plugins.org" );
 $res = NPTest->testCmd(
@@ -62,23 +62,23 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
 like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK");
 SKIP: {
-        skip "No host serving nagios in index file", 7 unless $host_tcp_http2;
+        skip "No host serving monitoring in index file", 7 unless $host_tcp_http2;
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring'" );
-        cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'");
+        cmp_ok( $res->return_code, "==", 0, "Got a reference to 'monitoring'");
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing'" );
-        cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'");
+        cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'");
        like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'");
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'mONiTORing'" );
-        cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'");
+        cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'");
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring' --invert-regex" );
        cmp_ok( $res->return_code, "==", 2, "Invert results work when found");
        like ( $res->output, "/pattern found/", "Error message says 'pattern found'");
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" );
        cmp_ok( $res->return_code, "==", 0, "And also when not found");
 }
 SKIP: {
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index c3085e13..2c89beb0 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/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian
index 0d7d7bce..38e284af 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/monitoring/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
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 30b2a353..781569dd 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,17 +1,17 @@
 /*****************************************************************************
 * 
-* Nagios urlize plugin
+* monitoring urlize plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
 * This file contains the urlize plugin
 * 
 * This plugin wraps the text output of another command (plugin) in HTML <A>
-* tags, thus displaying the child plugin's output as a clickable link in the
+* tags, thus displaying the child plugin's output as a clickable link in compatible
-* Nagios status screen.  This plugin returns the status of the invoked plugin.
+* monitoring status screen.  This plugin returns the status of the invoked plugin.
 * 
 * 
 * This program is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 const char *progname = "urlize";
 const char *copyright = "2000-2006";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
@@ -166,9 +166,9 @@ print_help (void)
        printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
        printf (COPYRIGHT, copyright, email);
-        printf ("%s\n", _("This plugin wraps the text output of another command (plugin)"));
+        printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>"));
-  printf ("%s\n", _("in HTML <A> tags, thus displaying the child plugin's output as a clickable link in"));
+  printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
-  printf ("%s\n", _("the Nagios status screen.  This plugin returns the status of the invoked plugin."));
+  printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
  printf ("\n\n");
diff --git a/plugins/utils.c b/plugins/utils.c
index b57d5e17..58b153d8 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -4,7 +4,7 @@
 * 
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
-* Copyright (c) 2002-2007 Nagios Plugin Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/plugins/utils.h b/plugins/utils.h
index 657d4bfa..6a89a9b7 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -1,6 +1,6 @@
 #ifndef NP_UTILS_H
 #define NP_UTILS_H
-/* Header file for nagios plugins utils.c */
+/* Header file for monitoring plugins utils.c */
 /* This file should be included in all plugins */
@@ -131,7 +131,7 @@ char *fperfdata (const char *,
 {"warning",required_argument,0,'w'},\
 {"hostname",required_argument,0,'H'}
-#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
+#define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\
 \t<%s>\n\n"
 #define UT_HLP_VRS _("\
@@ -159,7 +159,8 @@ char *fperfdata (const char *,
 #define UT_VERBOSE _("\
 -v, --verbose\n\
-    Show details for command-line debugging (Nagios may truncate output)\n")
+    Show details for command-line debugging (output may be truncated by\n\
+                the monitoring system)\n")
 #define UT_WARN_CRIT _("\
 -w, --warning=DOUBLE\n\
@@ -180,7 +181,7 @@ char *fperfdata (const char *,
 #ifdef NP_EXTRA_OPTS
 #define UT_EXTRA_OPTS _("\
 --extra-opts=[section][@file]\n\
-    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n\
+    Read options from an ini file. See http://monitoring-plugins.org/doc/extra-opts.html\n\
    for usage and examples.\n")
 #else
 #define UT_EXTRA_OPTS ""
@@ -188,16 +189,16 @@ char *fperfdata (const char *,
 #define UT_THRESHOLDS_NOTES _("\
 See:\n\
- http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\
+ http://monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
 for THRESHOLD format and examples.\n")
 #define UT_SUPPORT _("\n\
-Send email to nagios-users@lists.sourceforge.net if you have questions\n\
+Send email to help@monitoring-plugins.org if you have questions\n\
 regarding use of this software. To submit patches or suggest improvements,\n\
-send email to nagiosplug-devel@lists.sourceforge.net\n\n")
+send email to devel@monitoring-plugins.org\n\n")
 #define UT_NOWARRANTY _("\n\
-The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
+The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n")
diff --git a/po/Makevars b/po/Makevars
index 152edec2..5d4d7863 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,12 +18,12 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Nagios Plugin Development Group
+COPYRIGHT_HOLDER = Monitoring Plugin Development Team
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 # Email address were to send bug report for the .po translation files
-PACKAGE_BUGREPORT = nagiosplug-devel@lists.sourceforge.net
+PACKAGE_BUGREPORT = devel@monitoring-plugins.org
diff --git a/po/de.po b/po/de.po
index cb886f91..5b022037 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # translation of de.po to 
 # German Language Translation File.
-# This file is distributed under the same license as the nagios-plugins package.
+# This file is distributed under the same license as the monitoring-plugins package.
-# Copyright (C) 2004 Nagios Plugin Development Group.
+# Copyright (C) 2004 Monitoring Plugin Development Team.
 # Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003, 2004.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nagiosplug\n"
+"Project-Id-Version: monitoringplug\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
 "POT-Creation-Date: 2010-07-09 19:30-0400\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
@@ -171,7 +171,7 @@ msgid "list of nagios service names, separated by ':' [optional]"
 msgstr ""
 #: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+msgid "short name of host in the monitoring configuration [optional]"
 msgstr ""
 #: plugins/check_by_ssh.c:420
@@ -248,7 +248,7 @@ msgstr ""
 #: plugins/check_cluster.c:230
 #, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+msgid "Host/Service Cluster Plugin for Monitoring"
 msgstr ""
 #: plugins/check_cluster.c:236 plugins/check_nt.c:661
@@ -2091,7 +2091,7 @@ msgid "Could not locate a running Nagios process!"
 msgstr ""
 #: plugins/check_nagios.c:172
-msgid "Cannot parse Nagios log file for valid time"
+msgid "Cannot parse monitoring log file for valid time"
 msgstr ""
 #: plugins/check_nagios.c:183 plugins/check_procs.c:295
@@ -2126,7 +2126,7 @@ msgstr "%s: Hostname muss angegeben werden\n"
 #: plugins/check_nagios.c:281
 #, fuzzy
 msgid ""
-"This plugin checks the status of the Nagios process on the local machine"
+"This plugin checks the status of the monitoring process on the local machine"
 msgstr ""
 "Dieses Plugin pr�ft den freien Speicher auf einem gemounteten Filesystem\n"
 "und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
@@ -2135,7 +2135,7 @@ msgstr ""
 #: plugins/check_nagios.c:282
 msgid ""
-"The plugin will check to make sure the Nagios status log is no older than"
+"The plugin will check to make sure the monitoring status log is no older than"
 msgstr ""
 #: plugins/check_nagios.c:283
@@ -2476,7 +2476,7 @@ msgid "  to run Perfmon directly."
 msgstr ""
 #: plugins/check_nt.c:738
-msgid "It can also be used in scripts that automatically create Nagios service"
+msgid "It can also be used in scripts that automatically create the monitoring service"
 msgstr ""
 #: plugins/check_nt.c:739
@@ -3941,7 +3941,7 @@ msgid ""
 msgstr ""
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitoring will"
 msgstr ""
 #: plugins/check_radius.c:374
@@ -5129,7 +5129,7 @@ msgid "Turn off automatic offline tests"
 msgstr ""
 #: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+msgid "Output suitable for the monitoring system"
 msgstr ""
 #: plugins/negate.c:96
@@ -5334,7 +5334,7 @@ msgstr ""
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"the monitoring status screen.  This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
@@ -5419,7 +5419,7 @@ msgstr ""
 #: plugins/utils.h:163
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (monitoring may truncate output)\n"
 msgstr ""
 #: plugins/utils.h:167
@@ -5455,7 +5455,7 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" http://monitoring-plugins.org/doc/guidelines.html"
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
@@ -5463,9 +5463,9 @@ msgstr ""
 #: plugins/utils.h:197
 msgid ""
 "\n"
-"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"Send email to help@monitoring-plugins.org if you have questions\n"
 "regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"send email to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
@@ -5984,7 +5984,7 @@ msgstr ""
 #~ " -s, --services=LIST\n"
 #~ "    list of nagios service names, separated by ':' [optional]\n"
 #~ " -n, --name=NAME\n"
-#~ "    short name of host in nagios configuration [optional]\n"
+#~ "    short name of host in the monitoring configuration [optional]\n"
 #~ msgstr ""
 #~ " -C, --command='COMMAND STRING'\n"
 #~ "    Befehl der auf der entfernten Maschine ausgef�hrt werden soll\n"
diff --git a/po/fr.po b/po/fr.po
index 125b51e7..144f41b2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # translation of fr.po to
-# Messages français pour Nagios Plugins
+# Messages français pour Monitoring Plugins
-# Copyright (C) 2003-2004 Nagios Plugin Development Group
+# Copyright (C) 2003-2004 Monitoring Plugin Development Team
-# This file is distributed under the same license as the nagiosplug package.
+# This file is distributed under the same license as the monitoringplug package.
 #
 # Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003.
 # Benoit Mortier <benoit.mortier@opensides.be>, 2004, 2006, 2007.
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
 "POT-Creation-Date: 2010-07-09 19:30-0400\n"
 "PO-Revision-Date: 2010-04-21 23:38-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
-"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
+"Language-Team: Monitoring Plugin Development Mailing List "
-"devel@lists.sourceforge.net>\n"
+"<devel@monitoring-plugins.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,8 +169,8 @@ msgid "list of nagios service names, separated by ':' [optional]"
 msgstr "liste des services nagios, séparés par ':' [optionnel] "
 #: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+msgid "short name of host in the monitoring configuration [optional]"
-msgstr "nom court de l'hôte dans la configuration nagios [optionnel]"
+msgstr "nom court de l'hôte dans la configuration monitoring [optionnel]"
 #: plugins/check_by_ssh.c:420
 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
@@ -250,8 +250,8 @@ msgstr "Utilisation:"
 #: plugins/check_cluster.c:230
 #, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+msgid "Host/Service Cluster Plugin for Monitoring"
-msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2"
+msgstr "Plugin de Cluster d'Hôte/Service pour Monitorin"
 #: plugins/check_cluster.c:236 plugins/check_nt.c:661
 msgid "Options:"
@@ -2140,7 +2140,7 @@ msgid "Could not locate a running Nagios process!"
 msgstr "Impossible de trouver un processus Nagios actif!"
 #: plugins/check_nagios.c:172
-msgid "Cannot parse Nagios log file for valid time"
+msgid "Cannot parse monitoring log file for valid time"
 msgstr ""
 "Impossible de trouver une date/heure valide dans le fichier de log de Nagios"
@@ -2172,13 +2172,13 @@ msgstr "Vous devez fournir un nom de processus\n"
 #: plugins/check_nagios.c:281
 msgid ""
-"This plugin checks the status of the Nagios process on the local machine"
+"This plugin checks the status of the monitoring process on the local machine"
-msgstr "Ce plugin vérifie l'état du processus Nagios sur la machine locale."
+msgstr "Ce plugin vérifie l'état du processus Monitoring sur la machine locale."
 #: plugins/check_nagios.c:282
 msgid ""
-"The plugin will check to make sure the Nagios status log is no older than"
+"The plugin will check to make sure the monitoring status log is no older than"
-msgstr "Ce plugin vérifie que le status log de Nagios n'est pas plus vieux que"
+msgstr "Ce plugin vérifie que le status log de Monitoring n'est pas plus vieux que"
 #: plugins/check_nagios.c:283
 msgid "the number of minutes specified by the expires option."
@@ -2523,7 +2523,7 @@ msgid "  to run Perfmon directly."
 msgstr ""
 #: plugins/check_nt.c:738
-msgid "It can also be used in scripts that automatically create Nagios service"
+msgid "It can also be used in scripts that automatically create the monitoring service"
 msgstr ""
 #: plugins/check_nt.c:739
@@ -4004,7 +4004,7 @@ msgid ""
 msgstr ""
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitoring will"
 msgstr ""
 #: plugins/check_radius.c:374
@@ -5207,7 +5207,7 @@ msgid "Turn off automatic offline tests"
 msgstr ""
 #: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+msgid "Output suitable for the monitoring system"
 msgstr ""
 #: plugins/negate.c:96
@@ -5431,7 +5431,7 @@ msgstr ""
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"the monitoring status screen.  This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
@@ -5530,7 +5530,7 @@ msgstr ""
 #: plugins/utils.h:163
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (monitoring may truncate output)\n"
 msgstr ""
 " -v, --verbose\n"
 "    Affiche les informations de déboguage en ligne de commande (Nagios peut "
@@ -5584,29 +5584,29 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" http://monitoring-plugins.org/doc/guidelines.html"
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 " Voir:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" http://monitoring-plugins.org/doc/guidelines.html"
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 #: plugins/utils.h:197
 msgid ""
 "\n"
-"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"Send email to help@monitoring-plugins.org if you have questions\n"
 "regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"send email to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 "\n"
-"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des "
+"Envoyez un email à help@monitoring-plugins.org si vous avez des "
 "questions\n"
 "reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer "
 "des\n"
-"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
+"améliorations, envoyez un email à devel@monitoring-plugins.org\n"
 "\n"
 #: plugins/utils.h:202
diff --git a/po/nagios-plugins.pot b/po/monitoring-plugins.pot
index 53ccf508..3d021cb4 100644
--- a/po/nagios-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Nagios Plugin Development Group
+# Copyright (C) YEAR Monitoring Plugin Development Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
 "POT-Creation-Date: 2012-02-16 17:35-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -162,7 +162,7 @@ msgid "list of nagios service names, separated by ':' [optional]"
 msgstr ""
 #: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+msgid "short name of host in the monitoring configuration [optional]"
 msgstr ""
 #: plugins/check_by_ssh.c:420
@@ -239,7 +239,7 @@ msgstr ""
 #: plugins/check_cluster.c:230
 #, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+msgid "Host/Service Cluster Plugin for Monitoring"
 msgstr ""
 #: plugins/check_cluster.c:236 plugins/check_nt.c:666
@@ -2032,7 +2032,7 @@ msgid "Could not locate a running Nagios process!"
 msgstr ""
 #: plugins/check_nagios.c:172
-msgid "Cannot parse Nagios log file for valid time"
+msgid "Cannot parse monitoring log file for valid time"
 msgstr ""
 #: plugins/check_nagios.c:183 plugins/check_procs.c:295
@@ -2063,12 +2063,12 @@ msgstr ""
 #: plugins/check_nagios.c:281
 msgid ""
-"This plugin checks the status of the Nagios process on the local machine"
+"This plugin checks the status of the monitoring process on the local machine"
 msgstr ""
 #: plugins/check_nagios.c:282
 msgid ""
-"The plugin will check to make sure the Nagios status log is no older than"
+"The plugin will check to make sure the monitoring status log is no older than"
 msgstr ""
 #: plugins/check_nagios.c:283
@@ -2406,7 +2406,7 @@ msgid "  to run Perfmon directly."
 msgstr ""
 #: plugins/check_nt.c:743
-msgid "It can also be used in scripts that automatically create Nagios service"
+msgid "It can also be used in scripts that automatically create the monitoring service"
 msgstr ""
 #: plugins/check_nt.c:744
@@ -3839,7 +3839,7 @@ msgid ""
 msgstr ""
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitoring will"
 msgstr ""
 #: plugins/check_radius.c:374
@@ -4990,7 +4990,7 @@ msgid "Turn off automatic offline tests"
 msgstr ""
 #: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+msgid "Output suitable for the monitoring system"
 msgstr ""
 #: plugins/negate.c:96
@@ -5188,7 +5188,7 @@ msgstr ""
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"the monitoring status screen.  This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
@@ -5271,7 +5271,7 @@ msgstr ""
 #: plugins/utils.h:163
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (monitoring may truncate output)\n"
 msgstr ""
 #: plugins/utils.h:167
@@ -5307,7 +5307,7 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" http://monitoring-plugins.org/doc/guidelines.html"
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
@@ -5315,9 +5315,9 @@ msgstr ""
 #: plugins/utils.h:197
 msgid ""
 "\n"
-"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"Send email to help@monitoring-plugins.org if you have questions\n"
 "regarding use of this software. To submit patches or suggest improvements,\n"
-"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"send email to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
diff --git a/tools/distclean b/tools/distclean
index f4ec20bd..06d633e9 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -6,7 +6,7 @@
 # Please run this script from the top-level directory.
 if [ ! -f tools/distclean ]; then
-  echo "Please run this script from the top-level directory of Nagios-plugins."
+  echo "Please run this script from the top-level directory of Monitoring-plugins."
  exit 1
 fi
diff --git a/tools/generate-change-log b/tools/generate-change-log
index 03321fd8..3a6b38e7 100755
--- a/tools/generate-change-log
+++ b/tools/generate-change-log
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2013 Nagios Plugins Development Team
+# Copyright (c) 2013 Monitoring Plugins Development Team
 #
 # Originally written by Holger Weiss <holger@zedat.fu-berlin.de>.
 #
-# This file is free software; the Nagios Plugins Development Team gives
+# This file is free software; the Monitoring Plugins Development Team gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
diff --git a/tools/git-notify b/tools/git-notify
index 85142965..ff59d39d 100755
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -3,7 +3,7 @@
 # Tool to send git commit notifications
 #
 # Copyright 2005 Alexandre Julliard
-# Copyright 2009 Nagios Plugins Development Team
+# Copyright 2009 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook
index db9ad9ef..c822a63b 100755
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -1,11 +1,11 @@
 #!/bin/sh
 prefix="${0%/*}/notifications"  # $GIT_DIR/hooks/notifications
-recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>'
+recipient='Monitoring Plugins Commits <commits@monitoring-plugins.org>'
 maxcommits=100
 maxdiffsize=$((300 * 1024))
-project='nagiosplug'
+project='monitoring-plugins'
-gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug'
+gitweburl='https://github.com/monitoring-plugins/monitoring-plugins'
 gitnotify="$prefix/git-notify.pl"
 statefile="$prefix/git-notify.dat"
diff --git a/tools/tango b/tools/tango
index 7f418d73..0d07b1fb 100755
--- a/tools/tango
+++ b/tools/tango
@@ -14,9 +14,9 @@ my $REVISION = '$Revision$ ';
 $REVISION =~ s/^\$Revision: //;
 $REVISION =~ s/ \$ $//;
-my $PACKAGE = 'Nagios Plugins';
+my $PACKAGE = 'Monitoring Plugins';
 my $RELEASE = '1.3';
-my $WARRANTY = "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
+my $WARRANTY = "The monitoring plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
 my $version = undef;
 my $help = undef;
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 12528d9b..48836b1e 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # tinderbox_build.pl
-# This script builds the nagiosplugins and then sends
+# This script builds the monitoringplugins and then sends
 # logs back to the master tinderbox server
 #
 # This script is based on mozilla-unix.pl which comes with tinderbox2
@@ -34,7 +34,7 @@ my $ReportStatus = 0;  # Do not send results to server
 my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
 # These shouldn't really need to be changed
-my $BuildTree = 'nagiosplug';
+my $BuildTree = 'monitoringplug';
 my $BuildName = '';
 my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
@@ -81,7 +81,7 @@ sub BuildIt {
        chdir("$StartDir");
        my $StartTime = time;
-        if (-e (my $file = "nagios-plugins.spec")) {
+        if (-e (my $file = "monitoring-plugins.spec")) {
                open F, $file;
                while (<F>) {
                        if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {