diff --git a/src/bb-library/Box/Mail.php b/src/bb-library/Box/Mail.php
index 94827cdea..676d2558a 100644
--- a/src/bb-library/Box/Mail.php
+++ b/src/bb-library/Box/Mail.php
@@ -13,21 +13,15 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
 
+
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
diff --git a/src/bb-library/Registrar/Adapter/Email.php b/src/bb-library/Registrar/Adapter/Email.php
index 846b2fa5e..649a6ba44 100644
--- a/src/bb-library/Registrar/Adapter/Email.php
+++ b/src/bb-library/Registrar/Adapter/Email.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Registrar_Adapter_Email extends Registrar_AdapterAbstract
 {
     protected $config;
diff --git a/src/bb-library/Registrar/Adapter/Resellerclub.php b/src/bb-library/Registrar/Adapter/Resellerclub.php
index e93b6640a..b4fb4e7e9 100644
--- a/src/bb-library/Registrar/Adapter/Resellerclub.php
+++ b/src/bb-library/Registrar/Adapter/Resellerclub.php
@@ -2,21 +2,15 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
 
+
 /**
  * HTTP API documentation http://cp.onlyfordemo.net/kb/answer/744
  */
diff --git a/src/bb-library/Server/Account.php b/src/bb-library/Server/Account.php
index ada370d8d..24d75487d 100644
--- a/src/bb-library/Server/Account.php
+++ b/src/bb-library/Server/Account.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Account
 {
     private $username   = NULL;
diff --git a/src/bb-library/Server/Client.php b/src/bb-library/Server/Client.php
index d4a24beda..3f1ea8bce 100644
--- a/src/bb-library/Server/Client.php
+++ b/src/bb-library/Server/Client.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Client
 {
     private $id         = NULL;
diff --git a/src/bb-library/Server/Exception.php b/src/bb-library/Server/Exception.php
index 8c31526de..ea8439bf8 100644
--- a/src/bb-library/Server/Exception.php
+++ b/src/bb-library/Server/Exception.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Exception extends Exception
 {
     
diff --git a/src/bb-library/Server/Manager.php b/src/bb-library/Server/Manager.php
index 19a89ed23..133a6144d 100644
--- a/src/bb-library/Server/Manager.php
+++ b/src/bb-library/Server/Manager.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 abstract class Server_Manager
 {
     private $_log = null;
diff --git a/src/bb-library/Server/Manager/Custom.php b/src/bb-library/Server/Manager/Custom.php
index 1985c3351..4ed4642e6 100644
--- a/src/bb-library/Server/Manager/Custom.php
+++ b/src/bb-library/Server/Manager/Custom.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Manager_Custom extends Server_Manager
 {
     /**
diff --git a/src/bb-library/Server/Manager/Directadmin.php b/src/bb-library/Server/Manager/Directadmin.php
index 300eede56..505c7606f 100644
--- a/src/bb-library/Server/Manager/Directadmin.php
+++ b/src/bb-library/Server/Manager/Directadmin.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Manager_Directadmin extends Server_Manager
 {
 	public function init()
diff --git a/src/bb-library/Server/Manager/Ispconfig3.php b/src/bb-library/Server/Manager/Ispconfig3.php
index 2b213c036..8bd4a0e7f 100644
--- a/src/bb-library/Server/Manager/Ispconfig3.php
+++ b/src/bb-library/Server/Manager/Ispconfig3.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Manager_Ispconfig3 extends Server_Manager
 {
     private $_session = null;
diff --git a/src/bb-library/Server/Manager/Kloxo.php b/src/bb-library/Server/Manager/Kloxo.php
index 152a59221..0e66c300e 100644
--- a/src/bb-library/Server/Manager/Kloxo.php
+++ b/src/bb-library/Server/Manager/Kloxo.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Manager_Kloxo extends Server_Manager
 {
 	public function init()
diff --git a/src/bb-library/Server/Manager/Virtualmin.php b/src/bb-library/Server/Manager/Virtualmin.php
index ee8a6414e..a79c8b471 100644
--- a/src/bb-library/Server/Manager/Virtualmin.php
+++ b/src/bb-library/Server/Manager/Virtualmin.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 /**
  * @see http://doxfer.com/Webmin/TheWebminAPI
  */
diff --git a/src/bb-library/Server/Manager/Whm.php b/src/bb-library/Server/Manager/Whm.php
index 05a6c31e1..48c3dc5f3 100644
--- a/src/bb-library/Server/Manager/Whm.php
+++ b/src/bb-library/Server/Manager/Whm.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 /**
  * cPanel API
  * @see http://docs.cpanel.net/twiki/bin/view/AllDocumentation/
diff --git a/src/bb-library/Server/Package.php b/src/bb-library/Server/Package.php
index 3653ac97a..f35f86721 100755
--- a/src/bb-library/Server/Package.php
+++ b/src/bb-library/Server/Package.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class Server_Package
 {
     private $name                   = 'BoxBilling';
diff --git a/src/bb-update.php b/src/bb-update.php
index b21f9d46f..8632057e9 100644
--- a/src/bb-update.php
+++ b/src/bb-update.php
@@ -2,20 +2,14 @@
 /**
  * BoxBilling
  *
- * LICENSE
+ * @copyright BoxBilling, Inc (http://www.boxbilling.com)
+ * @license   Apache-2.0
  *
- * This source file is subject to the license that is bundled
- * with this package in the file LICENSE.txt
- * It is also available through the world-wide-web at this URL:
- * http://www.boxbilling.com/LICENSE.txt
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@boxbilling.com so we can send you a copy immediately.
- *
- * @copyright Copyright (c) 2010-2012 BoxBilling (http://www.boxbilling.com)
- * @license   http://www.boxbilling.com/LICENSE.txt
- * @version   $Id$
+ * Copyright BoxBilling, Inc
+ * This source file is subject to the Apache-2.0 License that is bundled
+ * with this source code in the file LICENSE
  */
+
 class BBPatch_23 extends BBPatchAbstract
 {
     public function patch()