diff --git a/addhost.php b/addhost.php
index 132296f1b..461ab1fb5 100755
--- a/addhost.php
+++ b/addhost.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/adduser.php b/adduser.php
index 4afa04722..84b665658 100755
--- a/adduser.php
+++ b/adduser.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/alerts.php b/alerts.php
index 1ad4492a8..189c79b14 100755
--- a/alerts.php
+++ b/alerts.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/billing-calculate.php b/billing-calculate.php
index 4cd5fd3ff..ba02001f7 100755
--- a/billing-calculate.php
+++ b/billing-calculate.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/check-errors.php b/check-errors.php
index f8a3295f3..d69b51d08 100755
--- a/check-errors.php
+++ b/check-errors.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/check-services.php b/check-services.php
index 6f6a83fed..f58bab2b4 100755
--- a/check-services.php
+++ b/check-services.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/delhost.php b/delhost.php
index 9cfc0cee0..70b5be4d3 100755
--- a/delhost.php
+++ b/delhost.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/discovery.php b/discovery.php
index 85fe0a396..09bd1b432 100755
--- a/discovery.php
+++ b/discovery.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/generate-iplist.php b/generate-iplist.php
index d644d4ded..1ff94b7e6 100755
--- a/generate-iplist.php
+++ b/generate-iplist.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/html/ajax_listports.php b/html/ajax_listports.php
index b9245ebe3..9c61d4d0a 100755
--- a/html/ajax_listports.php
+++ b/html/ajax_listports.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage ajax
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php
index fa4c29685..ab6856714 100644
--- a/html/bandwidth-graph.php
+++ b/html/bandwidth-graph.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/billing-graph.php b/html/billing-graph.php
index f14280415..5997e0439 100755
--- a/html/billing-graph.php
+++ b/html/billing-graph.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage billing
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/data.php b/html/data.php
index bd3d5547e..b3ba1a5d8 100644
--- a/html/data.php
+++ b/html/data.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/graph-realtime.php b/html/graph-realtime.php
index 66d80194e..c9548c99e 100755
--- a/html/graph-realtime.php
+++ b/html/graph-realtime.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is included with Observium. It was originally part of m0n0wall <http://www.m0n0.ch/wall/>
+ *   This file is included with LibreNMS. It was originally part of m0n0wall <http://www.m0n0.ch/wall/>
  *
- * @package    observium
+ * @package    librenms
  * @subpackage graphing
  * @author     T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>, Jonathan Watt <jwatt@jwatt.org>
  * @copyright  2004-2006 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>, Jonathan Watt <jwatt@jwatt.org>
diff --git a/html/graph.php b/html/graph.php
index ca1a1d595..e06bcfb7a 100755
--- a/html/graph.php
+++ b/html/graph.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage graphing
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/index.php b/html/index.php
index 6933ad961..2073f2530 100755
--- a/html/index.php
+++ b/html/index.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
@@ -268,9 +269,9 @@ $runtime_end = utime(); $runtime = $runtime_end - $runtime_start;
 $gentime = substr($runtime, 0, 5);
 
 echo('<br /> <br /> <br /> <br />  <div id="footer">' . (isset($config['footer']) ? $config['footer'] : ''));
-echo('<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version']);
+echo('<br />Powered by <a href="http://www.librenms.org" target="_blank">LibreNMS ' . $config['version']);
 
-echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by Adam Armstrong. All rights reserved.');
+echo('</a>. Copyright &copy; 2013-'. date("Y"). ' by the LibreNMS Contributors. All rights reserved.');
 
 if ($config['page_gen'])
 {
diff --git a/html/map.php b/html/map.php
index c004af622..80d2b066d 100755
--- a/html/map.php
+++ b/html/map.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage map
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/netcmd.php b/html/netcmd.php
index fbd3e2fc4..60931a175 100755
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/html/pdf.php b/html/pdf.php
index a092f66ee..6cdd2552f 100644
--- a/html/pdf.php
+++ b/html/pdf.php
@@ -1,14 +1,15 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS
  *
- * @package    observium
- * @subpackage billing
- * @author     Adam Armstrong <adama@memetic.org>
- * @copyright  (C) 2006 - 2012 Adam Armstrong
+ * @package    librenms
+ * @subpackage cli
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
+ * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
+ * @copyright  (C) 2013 LibreNMS Contributors
  *
  */
 
diff --git a/irc.php b/irc.php
index 32c120062..eeced1090 100755
--- a/irc.php
+++ b/irc.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/poll-billing.php b/poll-billing.php
index c6845ef23..4f989e273 100755
--- a/poll-billing.php
+++ b/poll-billing.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/poll-device.php b/poll-device.php
index 834a6e1e0..750800623 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/poller.php b/poller.php
index 07dfa8a7c..7403a0315 100755
--- a/poller.php
+++ b/poller.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/renamehost.php b/renamehost.php
index b139d7ddb..fb18e9a78 100755
--- a/renamehost.php
+++ b/renamehost.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/snmptrap.php b/snmptrap.php
index 9beef4896..74212d15b 100755
--- a/snmptrap.php
+++ b/snmptrap.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *
diff --git a/syslog.php b/syslog.php
index 6020f6501..837772c4f 100755
--- a/syslog.php
+++ b/syslog.php
@@ -8,7 +8,7 @@
  *
  * @package    librenms
  * @subpackage cli
- * @author     LibreNMS Group <librenms-project@google.groups.com>
+ * @author     The LibreNMS Contributors <librenms-project@google.groups.com>
  * @copyright  (C) 2006 - 2012 Adam Armstrong (as Observium)
  * @copyright  (C) 2013 LibreNMS Contributors
  *