diff --git a/addhost.php b/addhost.php
index 329ecb960f..ab69ea2784 100755
--- a/addhost.php
+++ b/addhost.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage cli
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/adduser.php b/adduser.php
index d456cf8ce5..8ba8431ad1 100755
--- a/adduser.php
+++ b/adduser.php
@@ -2,13 +2,12 @@
 <?php
 
 /*
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage cli
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  *
  */
diff --git a/billing-calculate.php b/billing-calculate.php
index 5ad73352a7..243d7fdfc2 100755
--- a/billing-calculate.php
+++ b/billing-calculate.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage billing
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/contrib/generate-iplist.php b/contrib/generate-iplist.php
index cfb5bd62b9..4496262910 100644
--- a/contrib/generate-iplist.php
+++ b/contrib/generate-iplist.php
@@ -2,13 +2,12 @@
 <?php
 
 /*
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage discovery
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/delhost.php b/delhost.php
index b45009844b..6b60ef753d 100755
--- a/delhost.php
+++ b/delhost.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage cli
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/discovery.php b/discovery.php
index bafd95adc2..0a707d982c 100755
--- a/discovery.php
+++ b/discovery.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage discovery
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/ajax_listports.php b/html/ajax_listports.php
index b389b7f358..b73188edc0 100644
--- a/html/ajax_listports.php
+++ b/html/ajax_listports.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage ajax
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/bandwidth-graph.php b/html/bandwidth-graph.php
index fb3572bf46..0764fbb5da 100644
--- a/html/bandwidth-graph.php
+++ b/html/bandwidth-graph.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/billing-graph.php b/html/billing-graph.php
index efd7d643a6..52cbbecb4c 100644
--- a/html/billing-graph.php
+++ b/html/billing-graph.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage billing
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/data.php b/html/data.php
index 3d7c30af0b..221199cd81 100644
--- a/html/data.php
+++ b/html/data.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/graph-realtime.php b/html/graph-realtime.php
index 3079a15fc3..a876f5de9a 100644
--- a/html/graph-realtime.php
+++ b/html/graph-realtime.php
@@ -3,7 +3,7 @@
 /**
  * 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    librenms
  * @subpackage graphing
diff --git a/html/graph.php b/html/graph.php
index 8411fca3dd..7b346f2a73 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage graphing
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/index.php b/html/index.php
index 8aae6e8b84..6136a260d7 100644
--- a/html/index.php
+++ b/html/index.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  *
  */
diff --git a/html/netcmd.php b/html/netcmd.php
index fe2926b546..48013aedfb 100644
--- a/html/netcmd.php
+++ b/html/netcmd.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage webinterface
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/html/network-map.php b/html/network-map.php
index 4e28575fba..0339270154 100644
--- a/html/network-map.php
+++ b/html/network-map.php
@@ -7,7 +7,6 @@
  *
  * @package    librenms
  * @subpackage map
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  *
  */
diff --git a/html/pages/bill/pdf_css.inc.php b/html/pages/bill/pdf_css.inc.php
index 24b12c2c8c..dc8222456a 100644
--- a/html/pages/bill/pdf_css.inc.php
+++ b/html/pages/bill/pdf_css.inc.php
@@ -2,8 +2,6 @@
 
 $css = <<<EOF
 
-<!-- Observium PDF Billing Report Stylesheet //-->
-
 <style>
 
     .right {
diff --git a/html/pages/bill/pdf_history.inc.php b/html/pages/bill/pdf_history.inc.php
index 3c9473fa9f..8d6b9179cf 100644
--- a/html/pages/bill/pdf_history.inc.php
+++ b/html/pages/bill/pdf_history.inc.php
@@ -123,7 +123,7 @@ function genGraphs($bill_id, $imgtype, $from, $to, $bittype = 'Quota')
     $res .= '&x=1190&y=250';
     $res .= '&from='.$from.'&to='.$to;
     if (!bill_permitted($bill_id)) {
-        $res = 'images/observium-logo.png';
+        $res = 'images/librenms_logo.png';
     }
 
     return $res;
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index f8fa17225c..5296dc4f86 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Observium Network Management and Monitoring System
+ * LibreNMS Network Management and Monitoring System
  * Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
  *
  * This program is free software: you can redistribute it and/or modify
@@ -11,9 +11,8 @@
  *
  * See COPYING for more details.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage config
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  * @license    http://gnu.org/copyleft/gpl.html GNU GPL
  */
diff --git a/includes/discovery/discovery-arp.inc.php b/includes/discovery/discovery-arp.inc.php
index ab21759c52..50d7629698 100644
--- a/includes/discovery/discovery-arp.inc.php
+++ b/includes/discovery/discovery-arp.inc.php
@@ -1,6 +1,6 @@
 <?php
 //
-// Observium module to do device discovery by ARP table contents.
+// LibreNMS module to do device discovery by ARP table contents.
 //
 // Needs to be run after the ARP table discovery, because it uses the
 // data gathered by the ARP table discovery module.  Keeps a cache of
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index f4da615b52..17e81a24a9 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Observium Network Management and Monitoring System
+ * LibreNMS Network Management and Monitoring System
  * Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/includes/discovery/processors/netscaler.inc.php b/includes/discovery/processors/netscaler.inc.php
index 0e08938f36..776f323230 100644
--- a/includes/discovery/processors/netscaler.inc.php
+++ b/includes/discovery/processors/netscaler.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// root@alpha:/home/observium/dev# snmpwalk -v2c -c // -M mibs -m +NS-ROOT-MIB netscaler.test nsCPUTable
+// root@alpha:/home/dev# snmpwalk -v2c -c // -M mibs -m +NS-ROOT-MIB netscaler.test nsCPUTable
 // NS-ROOT-MIB::nsCPUname."cpu0" = STRING: "cpu0"
 // NS-ROOT-MIB::nsCPUusage."cpu0" = Gauge32: 0
 if ($device['os'] == 'netscaler') {
diff --git a/includes/discovery/sensors/temperatures/dell.inc.php b/includes/discovery/sensors/temperatures/dell.inc.php
index c71178882c..7693fd8d4b 100644
--- a/includes/discovery/sensors/temperatures/dell.inc.php
+++ b/includes/discovery/sensors/temperatures/dell.inc.php
@@ -1,13 +1,12 @@
 <?php
 
 /*
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage discovery
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/includes/discovery/sensors/temperatures/drac.inc.php b/includes/discovery/sensors/temperatures/drac.inc.php
index 3687db6c9d..17b0a4b4cd 100644
--- a/includes/discovery/sensors/temperatures/drac.inc.php
+++ b/includes/discovery/sensors/temperatures/drac.inc.php
@@ -1,13 +1,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage discovery
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/includes/discovery/sensors/temperatures/observernms-custom.inc.php b/includes/discovery/sensors/temperatures/observernms-custom.inc.php
index 9d03823b79..c158014cf0 100644
--- a/includes/discovery/sensors/temperatures/observernms-custom.inc.php
+++ b/includes/discovery/sensors/temperatures/observernms-custom.inc.php
@@ -19,7 +19,7 @@ if ($device['os_group'] == 'unix') {
             $descr_query = $config['snmpget'].' -M '.$config['mibdir'].' -m SNMPv2-SMI -Osqn '.snmp_gen_auth($device).' '.$device['transport'].':'.$device['hostname'].':'.$device['port']." .1.3.6.1.4.1.2021.7891.$oid.2.1 | sed s/.1.3.6.1.4.1.2021.7891.$oid.2.1\ //";
             $descr       = trim(str_replace('"', '', shell_exec($descr_query)));
             $fulloid     = ".1.3.6.1.4.1.2021.7891.$oid.101.1";
-            discover_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'observium', $descr, '1', '1', null, null, null, null, $current);
+            discover_sensor($valid['sensor'], 'temperature', $device, $fulloid, $oid, 'librenms', $descr, '1', '1', null, null, null, null, $current);
         }
     }
 }//end if
diff --git a/includes/discovery/vlans.inc.php b/includes/discovery/vlans.inc.php
index 6741266bb4..48595adaf4 100644
--- a/includes/discovery/vlans.inc.php
+++ b/includes/discovery/vlans.inc.php
@@ -16,8 +16,8 @@ require 'includes/discovery/vlans/cisco-vtp.inc.php';
 foreach ($device['vlans'] as $domain_id => $vlans) {
     foreach ($vlans as $vlan_id => $vlan) {
         // Pull Tables for this VLAN
-        // /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988  -OQUs  -m BRIDGE-MIB -M /opt/observium/mibs/ udp:sw2.ahf:161 dot1dStpPortEntry
-        // /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988  -OQUs  -m BRIDGE-MIB -M /opt/observium/mibs/ udp:sw2.ahf:161 dot1dBasePortEntry
+        // /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988  -OQUs  -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dStpPortEntry
+        // /usr/bin/snmpbulkwalk -v2c -c kglk5g3l454@988  -OQUs  -m BRIDGE-MIB -M /opt/librenms/mibs/ udp:sw2.ahf:161 dot1dBasePortEntry
         // FIXME - do this only when vlan type == ethernet?
         if (is_numeric($vlan_id) && ($vlan_id < 1002 || $vlan_id > 1105)) {
             // Ignore reserved VLAN IDs
diff --git a/includes/functions.php b/includes/functions.php
index 2754cc2b02..4a1bec4583 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1,13 +1,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage functions
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  *
  */
diff --git a/includes/polling/cisco-ipsec-flow-monitor.inc.php b/includes/polling/cisco-ipsec-flow-monitor.inc.php
index f30ef5255e..df7d73dc44 100644
--- a/includes/polling/cisco-ipsec-flow-monitor.inc.php
+++ b/includes/polling/cisco-ipsec-flow-monitor.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-// alpha:/home/observium/dev# snmpbulkwalk -v2c -c XXXXX -M mibs -m CISCO-IPSEC-FLOW-MONITOR-MIB cisco.3925  cipSecGlobalStats
+// alpha:/home/dev# snmpbulkwalk -v2c -c XXXXX -M mibs -m CISCO-IPSEC-FLOW-MONITOR-MIB cisco.3925  cipSecGlobalStats
 // CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalActiveTunnels.0 = Gauge32: 10
 // CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalPreviousTunnels.0 = Counter32: 677 Phase-2 Tunnels
 // CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalInOctets.0 = Counter32: 2063116135 Octets
diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php
index 76ca88be5d..2e55d60726 100644
--- a/includes/polling/core.inc.php
+++ b/includes/polling/core.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Observium Network Management and Monitoring System
+ * LibreNMS Network Management and Monitoring System
  * Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/includes/polling/netscaler-vsvr.inc.php b/includes/polling/netscaler-vsvr.inc.php
index 315f3d432d..722c1c2cde 100644
--- a/includes/polling/netscaler-vsvr.inc.php
+++ b/includes/polling/netscaler-vsvr.inc.php
@@ -1,35 +1,35 @@
 <?php
 
-// NS-ROOT-MIB::vsvrName."observium" = STRING: "observium"
-// NS-ROOT-MIB::vsvrIpAddress."observium" = IpAddress: 195.78.84.141
-// NS-ROOT-MIB::vsvrPort."observium" = INTEGER: 80
-// NS-ROOT-MIB::vsvrType."observium" = INTEGER: http(0)
-// NS-ROOT-MIB::vsvrState."observium" = INTEGER: up(7)
-// NS-ROOT-MIB::vsvrCurClntConnections."observium" = Gauge32: 18
-// NS-ROOT-MIB::vsvrCurSrvrConnections."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrSurgeCount."observium" = Counter32: 0
-// NS-ROOT-MIB::vsvrTotalRequests."observium" = Counter64: 64532
-// NS-ROOT-MIB::vsvrTotalRequestBytes."observium" = Counter64: 22223153
-// NS-ROOT-MIB::vsvrTotalResponses."observium" = Counter64: 64496
-// NS-ROOT-MIB::vsvrTotalResponseBytes."observium" = Counter64: 1048603453
-// NS-ROOT-MIB::vsvrTotalPktsRecvd."observium" = Counter64: 629637
-// NS-ROOT-MIB::vsvrTotalPktsSent."observium" = Counter64: 936237
-// NS-ROOT-MIB::vsvrTotalSynsRecvd."observium" = Counter64: 43130
-// NS-ROOT-MIB::vsvrCurServicesDown."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrCurServicesUnKnown."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrCurServicesOutOfSvc."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrCurServicesTransToOutOfSvc."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrCurServicesUp."observium" = Gauge32: 0
-// NS-ROOT-MIB::vsvrTotMiss."observium" = Counter64: 0
-// NS-ROOT-MIB::vsvrRequestRate."observium" = STRING: "0"
-// NS-ROOT-MIB::vsvrRxBytesRate."observium" = STRING: "248"
-// NS-ROOT-MIB::vsvrTxBytesRate."observium" = STRING: "188"
-// NS-ROOT-MIB::vsvrSynfloodRate."observium" = STRING: "0"
-// NS-ROOT-MIB::vsvrIp6Address."observium" = STRING: 0:0:0:0:0:0:0:0
-// NS-ROOT-MIB::vsvrTotHits."observium" = Counter64: 64537
-// NS-ROOT-MIB::vsvrTotSpillOvers."observium" = Counter32: 0
-// NS-ROOT-MIB::vsvrTotalClients."observium" = Counter64: 43023
-// NS-ROOT-MIB::vsvrClientConnOpenRate."observium" = STRING: "0"
+// NS-ROOT-MIB::vsvrName."librenms" = STRING: "librenms"
+// NS-ROOT-MIB::vsvrIpAddress."librenms" = IpAddress: 195.78.84.141
+// NS-ROOT-MIB::vsvrPort."librenms" = INTEGER: 80
+// NS-ROOT-MIB::vsvrType."librenms" = INTEGER: http(0)
+// NS-ROOT-MIB::vsvrState."librenms" = INTEGER: up(7)
+// NS-ROOT-MIB::vsvrCurClntConnections."librenms" = Gauge32: 18
+// NS-ROOT-MIB::vsvrCurSrvrConnections."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrSurgeCount."librenms" = Counter32: 0
+// NS-ROOT-MIB::vsvrTotalRequests."librenms" = Counter64: 64532
+// NS-ROOT-MIB::vsvrTotalRequestBytes."librenms" = Counter64: 22223153
+// NS-ROOT-MIB::vsvrTotalResponses."librenms" = Counter64: 64496
+// NS-ROOT-MIB::vsvrTotalResponseBytes."librenms" = Counter64: 1048603453
+// NS-ROOT-MIB::vsvrTotalPktsRecvd."librenms" = Counter64: 629637
+// NS-ROOT-MIB::vsvrTotalPktsSent."librenms" = Counter64: 936237
+// NS-ROOT-MIB::vsvrTotalSynsRecvd."librenms" = Counter64: 43130
+// NS-ROOT-MIB::vsvrCurServicesDown."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrCurServicesUnKnown."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrCurServicesOutOfSvc."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrCurServicesTransToOutOfSvc."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrCurServicesUp."librenms" = Gauge32: 0
+// NS-ROOT-MIB::vsvrTotMiss."librenms" = Counter64: 0
+// NS-ROOT-MIB::vsvrRequestRate."librenms" = STRING: "0"
+// NS-ROOT-MIB::vsvrRxBytesRate."librenms" = STRING: "248"
+// NS-ROOT-MIB::vsvrTxBytesRate."librenms" = STRING: "188"
+// NS-ROOT-MIB::vsvrSynfloodRate."librenms" = STRING: "0"
+// NS-ROOT-MIB::vsvrIp6Address."librenms" = STRING: 0:0:0:0:0:0:0:0
+// NS-ROOT-MIB::vsvrTotHits."librenms" = Counter64: 64537
+// NS-ROOT-MIB::vsvrTotSpillOvers."librenms" = Counter32: 0
+// NS-ROOT-MIB::vsvrTotalClients."librenms" = Counter64: 43023
+// NS-ROOT-MIB::vsvrClientConnOpenRate."librenms" = STRING: "0"
 if ($device['os'] == 'netscaler') {
     $oids_gauge = array(
                    'vsvrCurClntConnections',
diff --git a/includes/polling/sensors.inc.php b/includes/polling/sensors.inc.php
index ff7a574998..e0b88fe961 100644
--- a/includes/polling/sensors.inc.php
+++ b/includes/polling/sensors.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Observium Network Management and Monitoring System
+ * LibreNMS Network Management and Monitoring System
  * Copyright (C) 2006-2011, Observium Developers - http://www.observium.org
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/includes/port-descr-parser.inc.php b/includes/port-descr-parser.inc.php
index 144790c124..5f1cd5bf8a 100644
--- a/includes/port-descr-parser.inc.php
+++ b/includes/port-descr-parser.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-// Very basic parser to parse classic Observium-type schemes.
 // Parser should populate $port_ifAlias array with type, descr, circuit, speed and notes
 unset($port_ifAlias);
 
diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index 73a56a359f..3994e6e59e 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -21,7 +21,6 @@
  * @link       http://librenms.org
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  * @copyright  2016 Tony Murray
- * @author     Adam Armstrong <adama@memetic.org>
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
diff --git a/includes/sql-schema/update.php b/includes/sql-schema/update.php
index 9be89e00ad..5d9c2b8986 100644
--- a/includes/sql-schema/update.php
+++ b/includes/sql-schema/update.php
@@ -4,7 +4,7 @@
 // 1 UNKNOWN
 
 /*
- * Observium Network Management and Monitoring System
+ * LibreNMS Network Management and Monitoring System
  * Copyright (C) 2006-2012, Observium Developers - http://www.observium.org
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/poll-billing.php b/poll-billing.php
index 7bb1f0e06b..d510810573 100755
--- a/poll-billing.php
+++ b/poll-billing.php
@@ -2,13 +2,12 @@
 <?php
 
 /*
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage billing
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/poller-wrapper.py b/poller-wrapper.py
index 69d0fb5859..d4f2cea69f 100755
--- a/poller-wrapper.py
+++ b/poller-wrapper.py
@@ -11,15 +11,11 @@
                 that should run simultaneously. If no argument is given it will assume
                 a default of 16 threads.
 
- Read more:     http://postman.memetic.org/pipermail/observium/2012-November/001303.html
-
  Ubuntu Linux:  apt-get install python-mysqldb
  FreeBSD:       cd /usr/ports/*/py-MySQLdb && make install clean
 
  Tested on:     Python 2.7.3 / PHP 5.3.10-1ubuntu3.4 / Ubuntu 12.04 LTS
 
- GitHub:        https://github.com/Atrato/observium-poller-wrapper
-
  License:       To the extent possible under law, Job Snijders has waived all
                 copyright and related or neighboring rights to this script.
                 This script has been put into the Public Domain. This work is
diff --git a/poller.php b/poller.php
index 5af545b91b..41c25ef39a 100755
--- a/poller.php
+++ b/poller.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage poller
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/renamehost.php b/renamehost.php
index ebd859c74f..49b3929ed4 100755
--- a/renamehost.php
+++ b/renamehost.php
@@ -2,13 +2,12 @@
 <?php
 
 /*
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage cli
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/snmptrap.php b/snmptrap.php
index 0526f74232..4aaecd21af 100755
--- a/snmptrap.php
+++ b/snmptrap.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage snmptraps
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  */
 
diff --git a/syslog.php b/syslog.php
index 754438d406..2a2f22484f 100755
--- a/syslog.php
+++ b/syslog.php
@@ -2,13 +2,12 @@
 <?php
 
 /**
- * Observium
+ * LibreNMS
  *
- *   This file is part of Observium.
+ *   This file is part of LibreNMS.
  *
- * @package    observium
+ * @package    LibreNMS
  * @subpackage syslog
- * @author     Adam Armstrong <adama@memetic.org>
  * @copyright  (C) 2006 - 2012 Adam Armstrong
  *
  */