diff --git a/Block/System/Config/Form/Field/Version.php b/Block/System/Config/Form/Field/Version.php
index 5db3aadba1c798da9bd047990f7c434e9beedf20..262bf7de50bfc5e17f8f4f449cae220355b408da 100644
--- a/Block/System/Config/Form/Field/Version.php
+++ b/Block/System/Config/Form/Field/Version.php
@@ -7,8 +7,8 @@ use Magento\Framework\Data\Form\Element\AbstractElement;
  * Displays Version number in System Configuration
  * @category   Bob Go
  * @package    bobgo_CustomShipping
- * @author     info@bob.co.za
- * @website    https://www.bob.co.za
+ * @author     Bob Go
+ * @website    https://www.bobgo.co.za
  */
 class Version extends \Magento\Config\Block\System\Config\Form\Field
 {
diff --git a/Helper/Data.php b/Helper/Data.php
index 8bfc250084ca0f4118ed21381d2733bfd676b0e8..0b3e07a2972a63d06db5d3888cde878072a7216e 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -7,10 +7,10 @@ use Magento\Framework\Module\ModuleListInterface;
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * @category   bobgo
+ * @category   Bob Go
  * @package    bobgo_CustomShipping
  * @author     Bob Go
- * @website    https://www.bob.co.za
+ * @website    https://www.bobgo.co.za
  */
 class Data extends AbstractHelper
 {
diff --git a/Model/Carrier/CustomShipping.php b/Model/Carrier/CustomShipping.php
index d574860b84792df901b439d14aa3b0d9053e53b0..421e3dfb7c414de999e1bc030653ce29ee73dad5 100644
--- a/Model/Carrier/CustomShipping.php
+++ b/Model/Carrier/CustomShipping.php
@@ -33,10 +33,10 @@ use Psr\Log\LoggerInterface;
 
 /**
  * Bob Go shipping implementation
- * @category   bob
+ * @category   Bob Go
  * @package    bobgo_CustomShipping
- * @author     info@bob.co.za
- * @website    https://www.bob.co.za
+ * @author     Bob Go
+ * @website    https://www.bobgo.co.za
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -632,7 +632,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     * Parse track details response from bobgo
+     * Parse track details response from Bob Go
      *
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -698,7 +698,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     *  Perform API Request to bobgo API and return response
+     *  Perform API Request to Bob Go API and return response
      * @param array $payload
      * @param Result $result
      * @return void
@@ -713,7 +713,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     * Perform API Request for Shipment Tracking to bobgo API and return response
+     * Perform API Request for Shipment Tracking to Bob Go API and return response
      * @param $trackInfo
      * @param array $result
      * @return array
@@ -728,7 +728,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     * Format rates from bobgo API response and append to rate result instance of carrier
+     * Format rates from Bob Go API response and append to rate result instance of carrier
      * @param mixed $rates
      * @param Result $result
      * @return void
@@ -772,7 +772,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     * Prepare received checkpoints and activity from bobgo Shipment Tracking API
+     * Prepare received checkpoints and activity from Bob Go Shipment Tracking API
      * @param $response
      * @param array $result
      * @return array
@@ -834,7 +834,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
     }
 
     /**
-     * Build The Payload for bobgo API Request and return response
+     * Build The Payload for Bob Go API Request and return response
      * @param array $payload
      * @return mixed
      */
diff --git a/composer.json b/composer.json
index 454449527cd403317adf46db8db8efba9275ffdf..2c1805234e141f7a17f7aef7f43e455d8c45cf38 100644
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
   "authors": [
     {
       "name": "Bob Go",
-      "email": "info@bob.co.za",
-      "homepage": "https://www.bob.co.za"
+      "email": "support@uafrica.com",
+      "homepage": "https://www.bobgo.co.za"
     }
   ],
   "license": [
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index a77b41f58e27eae766ebac5ddb47d68ce37f769f..7e987bc95fc4755022b21bddbd7b5315109a9de1 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
 /**
- * @category   bobgo
+ * @category   Bob Go
  * @package    bobgo_CustomShipping
- * @author     bobgo
+ * @author     Bob Go
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
diff --git a/etc/config.xml b/etc/config.xml
index aa8f79dfde17814e8deff10dd15e1a395b4a4f7a..d31cdc52b0d36510935ecc4c169f1cd0c44cb939 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
 /**
- * @category   bobgo
+ * @category   Bob Go
  * @package    bobgo_CustomShipping
- * @author     bobgo
+ * @author     Bob Go
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
diff --git a/etc/module.xml b/etc/module.xml
index c1a03f842063b0354d514b7003300f63e321ca36..9cb1757c8c447dd892545d31c618ed7482cf03aa 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
 /**
- * @category   bobgo
+ * @category   Bob Go
  * @package    bobgo_CustomShipping
- * @author     bobgo
+ * @author     Bob Go
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">