diff --git a/Block/Customer/CardRenderer.php b/Block/Customer/CardRenderer.php
index b9d52cd..adb4599 100644
--- a/Block/Customer/CardRenderer.php
+++ b/Block/Customer/CardRenderer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PMNTS\Gateway\Block\Customer;
+namespace FatZebra\Gateway\Block\Customer;
 
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Block\AbstractCardRenderer;
@@ -20,7 +20,7 @@ class CardRenderer extends AbstractCardRenderer
      */
     public function canRender(PaymentTokenInterface $token)
     {
-        return $token->getPaymentMethodCode() === \PMNTS\Gateway\Helper\Data::METHOD_CODE;
+        return $token->getPaymentMethodCode() === \FatZebra\Gateway\Helper\Data::METHOD_CODE;
     }
 
     /**
diff --git a/Gateway/AbstractCommand.php b/Gateway/AbstractCommand.php
index c0dfc79..8ac94b5 100644
--- a/Gateway/AbstractCommand.php
+++ b/Gateway/AbstractCommand.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace PMNTS\Gateway\Gateway;
+namespace FatZebra\Gateway\Gateway;
 
 abstract class AbstractCommand implements \Magento\Payment\Gateway\CommandInterface
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     protected $scopeConfig;
 
-    /** @var \PMNTS\Gateway\Helper\Data */
-    protected $pmntsHelper;
+    /** @var \FatZebra\Gateway\Helper\Data */
+    protected $fatzebraHelper;
 
-    /** @var \PMNTS\Gateway\Model\GatewayFactory */
+    /** @var \FatZebra\Gateway\Model\GatewayFactory */
     protected $gatewayFactory;
 
     /** @var \Psr\Log\LoggerInterface */
@@ -19,42 +19,42 @@ abstract class AbstractCommand implements \Magento\Payment\Gateway\CommandInterf
     /**
      * AbstractCommand constructor.
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \PMNTS\Gateway\Helper\Data $pmntsHelper
-     * @param \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory
+     * @param \FatZebra\Gateway\Helper\Data $fatzebraHelper
+     * @param \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \PMNTS\Gateway\Helper\Data $pmntsHelper,
-        \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory,
+        \FatZebra\Gateway\Helper\Data $fatzebraHelper,
+        \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory,
         \Psr\Log\LoggerInterface $logger
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->pmntsHelper = $pmntsHelper;
+        $this->fatzebraHelper = $fatzebraHelper;
         $this->gatewayFactory = $gatewayFactory;
         $this->logger = $logger;
     }
 
     /**
      * @param $storeId
-     * @return \Pmnts\Gateway\Model\Gateway
+     * @return \FatZebra\Gateway\Model\Gateway
      */
     public function getGateway($storeId)
     {
         $username = $this->scopeConfig->getValue(
-            \PMNTS\Gateway\Helper\Data::CONFIG_PATH_PMNTS_USERNAME,
+            \FatZebra\Gateway\Helper\Data::CONFIG_PATH_FATZEBRA_USERNAME,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
 
         $token = $this->scopeConfig->getValue(
-            \PMNTS\Gateway\Helper\Data::CONFIG_PATH_PMNTS_TOKEN,
+            \FatZebra\Gateway\Helper\Data::CONFIG_PATH_FATZEBRA_TOKEN,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
 
         $sandbox = (bool)$this->scopeConfig->getValue(
-            \PMNTS\Gateway\Helper\Data::CONFIG_PATH_PMNTS_SANDBOX,
+            \FatZebra\Gateway\Helper\Data::CONFIG_PATH_FATZEBRA_SANDBOX,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
diff --git a/Gateway/CaptureCommand.php b/Gateway/CaptureCommand.php
index 66d6023..4d64f29 100644
--- a/Gateway/CaptureCommand.php
+++ b/Gateway/CaptureCommand.php
@@ -2,12 +2,12 @@
 /**
  * Capture command (with tokenization if opted-in by customer)
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-namespace PMNTS\Gateway\Gateway;
+namespace FatZebra\Gateway\Gateway;
 
 class CaptureCommand extends AbstractCommand
 {
@@ -37,8 +37,8 @@ class CaptureCommand extends AbstractCommand
     /**
      * CaptureCommand constructor.
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \PMNTS\Gateway\Helper\Data $pmntsHelper
-     * @param \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory
+     * @param \FatZebra\Gateway\Helper\Data $fatzebraHelper
+     * @param \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Vault\Model\PaymentTokenFactory $paymentTokenFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
@@ -48,8 +48,8 @@ class CaptureCommand extends AbstractCommand
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \PMNTS\Gateway\Helper\Data $pmntsHelper,
-        \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory,
+        \FatZebra\Gateway\Helper\Data $fatzebraHelper,
+        \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Vault\Model\PaymentTokenFactory $paymentTokenFactory,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
@@ -57,7 +57,7 @@ public function __construct(
         \Magento\Framework\Serialize\Serializer\Json $json,
         \Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory $paymentExtensionInterfaceFactory
     ) {
-        parent::__construct($scopeConfig, $pmntsHelper, $gatewayFactory, $logger);
+        parent::__construct($scopeConfig, $fatzebraHelper, $gatewayFactory, $logger);
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->customerRepository = $customerRepository;
         $this->paymentTokenRepository = $paymentTokenRepository;
@@ -77,16 +77,16 @@ public function execute(array $commandSubject)
         /** @var \Magento\Sales\Model\Order $order */
         $order = $payment->getOrder();
 
-        $pmntsToken = $payment->getAdditionalInformation('pmnts_token');
+        $fatzebraToken = $payment->getAdditionalInformation('fatzebra_token');
 
-        /** @var \PMNTS\Gateway\Model\Gateway $gateway */
+        /** @var \FatZebra\Gateway\Model\Gateway $gateway */
         $gateway = $this->getGateway($order->getStoreId());
 
-        $reference = $this->pmntsHelper->getOrderReference($order);
-        $fraudData = $this->pmntsHelper->buildFraudPayload($order);
+        $reference = $this->fatzebraHelper->getOrderReference($order);
+        $fraudData = $this->fatzebraHelper->buildFraudPayload($order);
 
         /** @var array $result */
-        $result = $gateway->token_purchase($pmntsToken, $commandSubject['amount'], $reference, null, $fraudData);
+        $result = $gateway->token_purchase($fatzebraToken, $commandSubject['amount'], $reference, null, $fraudData);
 
         if ($result && isset($result['response'])) {
             if ($result['response']['successful'] === false) {
@@ -102,7 +102,7 @@ public function execute(array $commandSubject)
             throw new \Magento\Framework\Validator\Exception(__('Payment gateway error, please contact customer service.'));
         }
 
-        if ($payment->getAdditionalInformation('pmnts_save_token') && $order->getCustomerId()) {
+        if ($payment->getAdditionalInformation('fatzebra_save_token') && $order->getCustomerId()) {
             try {
                 $paymentTokenDetails = $this->getTokenDetails($result['response']);
             } catch (\Exception $ex) {
@@ -115,14 +115,14 @@ public function execute(array $commandSubject)
             $paymentToken->setType(\Magento\Vault\Api\Data\PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD);
             $paymentToken->setTokenDetails($this->json->serialize($paymentTokenDetails));
             $paymentToken->setExpiresAt(new \DateTime($result['response']['card_expiry']));
-            $paymentToken->setGatewayToken($pmntsToken);
+            $paymentToken->setGatewayToken($fatzebraToken);
             /** @var \Magento\Sales\Api\Data\OrderPaymentExtension $extension */
             $paymentExtension = $this->paymentExtensionInterfaceFactory->create();
             $paymentExtension->setVaultPaymentToken($paymentToken);
             $payment->setExtensionAttributes($paymentExtension);
         } else {
             // If the customer has not opted into the token storage, do not persist it to the database
-            $payment->unsAdditionalInformation('pmnts_token');
+            $payment->unsAdditionalInformation('fatzebra_token');
         }
     }
 
diff --git a/Gateway/RefundCommand.php b/Gateway/RefundCommand.php
index 185c953..84743f6 100644
--- a/Gateway/RefundCommand.php
+++ b/Gateway/RefundCommand.php
@@ -2,12 +2,12 @@
 /**
  * Refund command
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-namespace PMNTS\Gateway\Gateway;
+namespace FatZebra\Gateway\Gateway;
 
 class RefundCommand extends AbstractCommand
 {
@@ -20,11 +20,11 @@ public function execute(array $commandSubject)
     {
         /** @var \Magento\Sales\Model\Order\Payment $payment */
         $payment = $commandSubject['payment']->getPayment();
-        /** @var \PMNTS\Gateway\Model\Gateway $gateway */
+        /** @var \FatZebra\Gateway\Model\Gateway $gateway */
         $gateway = $this->getGateway($payment->getOrder()->getStoreId());
         // At this point, we don't have a CreditMemo increment ID, so append a timestamp to ensure uniqueness in the event
         // of multiple refunds against a single invoice.
-        $reference = $this->pmntsHelper->getOrderReference($payment->getOrder()) . '-R-' . (new \DateTime())->format('ymdhi');
+        $reference = $this->fatzebaHelper->getOrderReference($payment->getOrder()) . '-R-' . (new \DateTime())->format('ymdhi');
         $response = $gateway->refund($payment->getLastTransId(), $commandSubject['amount'], $reference);
         if (is_array($response) && array_key_exists('successful', $response)) {
             if ($response['successful'] === true) {
diff --git a/Gateway/VaultCaptureCommand.php b/Gateway/VaultCaptureCommand.php
index 26b59ba..a19a52e 100644
--- a/Gateway/VaultCaptureCommand.php
+++ b/Gateway/VaultCaptureCommand.php
@@ -2,12 +2,12 @@
 /**
  * Vault capture command
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-namespace PMNTS\Gateway\Gateway;
+namespace FatZebra\Gateway\Gateway;
 
 use Psr\Log\LoggerInterface;
 
@@ -22,19 +22,19 @@ class VaultCaptureCommand extends AbstractCommand
     /**
      * VaultCaptureCommand constructor.
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \PMNTS\Gateway\Helper\Data $pmntsHelper
-     * @param \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory
+     * @param \FatZebra\Gateway\Helper\Data $fatzebraHelper
+     * @param \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory
      * @param LoggerInterface $logger
      * @param \Magento\Vault\Api\PaymentTokenManagementInterface $tokenManagement
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \PMNTS\Gateway\Helper\Data $pmntsHelper,
-        \PMNTS\Gateway\Model\GatewayFactory $gatewayFactory,
+        \FatZebra\Gateway\Helper\Data $fatzebraHelper,
+        \FatZebra\Gateway\Model\GatewayFactory $gatewayFactory,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Vault\Api\PaymentTokenManagementInterface $tokenManagement
     ) {
-        parent::__construct($scopeConfig, $pmntsHelper, $gatewayFactory, $logger);
+        parent::__construct($scopeConfig, $fatzebraHelper, $gatewayFactory, $logger);
         $this->tokenManagement = $tokenManagement;
     }
 
@@ -63,14 +63,14 @@ public function execute(array $commandSubject)
         );
 
         if ($token) {
-            /** @var  \PMNTS\Gateway\Model\Gateway $gateway */
+            /** @var  \FatZebra\Gateway\Model\Gateway $gateway */
             $gateway = $this->getGateway($storeId);
-            $fraudData = $this->pmntsHelper->buildFraudPayload($order);
+            $fraudData = $this->fatzebraHelper->buildFraudPayload($order);
 
             $result = $gateway->token_purchase(
                 $token->getGatewayToken(),
                 $commandSubject['amount'],
-                $this->pmntsHelper->getOrderReference($order),
+                $this->fatzebraHelper->getOrderReference($order),
                 null,
                 $fraudData
             );
diff --git a/Helper/Data.php b/Helper/Data.php
index 4f25427..00bc086 100755
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,14 +1,14 @@
 <?php
-namespace PMNTS\Gateway\Helper;
+namespace FatZebra\Gateway\Helper;
 
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    const METHOD_CODE = 'pmnts_gateway';
-    const VAULT_METHOD_CODE = 'pmnts_gateway_vault';
+    const METHOD_CODE = 'fatzebra_gateway';
+    const VAULT_METHOD_CODE = 'fatzebra_gateway_vault';
 
-    const CONFIG_PATH_PMNTS_USERNAME = 'payment/pmnts_gateway/username';
-    const CONFIG_PATH_PMNTS_TOKEN = 'payment/pmnts_gateway/token';
-    const CONFIG_PATH_PMNTS_SANDBOX = 'payment/pmnts_gateway/sandbox_mode';
+    const CONFIG_PATH_FATZEBRA_USERNAME = 'payment/fatzebra_gateway/username';
+    const CONFIG_PATH_FATZEBRA_TOKEN = 'payment/fatzebra_gateway/token';
+    const CONFIG_PATH_FATZEBRA_SANDBOX = 'payment/fatzebra_gateway/sandbox_mode';
 
 
     const RE_ANS = "/[^A-Z\d\-_',\.;:\s]*/i";
@@ -137,7 +137,7 @@ public function buildFraudPayload($order)
                     "id" => $this->cleanForFraud($customerId, self::RE_ANS, 16),
                     "post_code" => $this->cleanForFraud($billing->getPostcode(), self::RE_AN, 9)
                 ],
-            "device_id" => $payment->getAdditionalInformation('pmnts_device_id'),
+            "device_id" => $payment->getAdditionalInformation('pmmts_device_id'),
             "items" => $orderItems,
             "recipients" => [
                 [
@@ -252,6 +252,6 @@ public function getFraudShippingMethod($order)
 
     protected function getConfigData($field, $storeId = 0)
     {
-        return $this->scopeConfig->getValue('payment/pmnts_gateway/' . $field, 'stores', $storeId);
+        return $this->scopeConfig->getValue('payment/fatzebra_gateway/' . $field, 'stores', $storeId);
     }
 }
diff --git a/Model/Config/PmntsConfigProvider.php b/Model/Config/PmntsConfigProvider.php
index 03ade05..65d8fa5 100644
--- a/Model/Config/PmntsConfigProvider.php
+++ b/Model/Config/PmntsConfigProvider.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace PMNTS\Gateway\Model\Config;
+namespace FatZebra\Gateway\Model\Config;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 
-class PmntsConfigProvider implements ConfigProviderInterface
+class FatZebraConfigProvider implements ConfigProviderInterface
 {
 
     /** @var string */
-    protected $methodCode = \PMNTS\Gateway\Helper\Data::METHOD_CODE;
+    protected $methodCode = \FatZebra\Gateway\Helper\Data::METHOD_CODE;
 
     /** @var \Magento\Payment\Model\MethodInterface */
     protected $method;
@@ -48,13 +48,13 @@ public function getConfig()
     {
         $config = [
             'payment' => [
-                'pmntsGateway' => [
+                'FatZebraGateway' => [
                     'iframeSrc' => $this->getIframeSrc(),
                     'fraudFingerprintSrc' => $this->getFraudFingerprintSource(),
                     'isSandbox' => $this->getIsSandbox(),
                     'canSaveCard' => $this->canSaveCard(),
                     'customerHasSavedCC' => $this->customerHasSavedCC(),
-                    'ccVaultCode' => \PMNTS\Gateway\Helper\Data::VAULT_METHOD_CODE
+                    'ccVaultCode' => \FatZebra\Gateway\Helper\Data::VAULT_METHOD_CODE
                 ]
             ]
         ];
@@ -71,9 +71,9 @@ private function getFraudFingerprintSource()
         $is_sandbox = $this->getConfigValue("sandbox_mode");
         $username = $this->getConfigValue("username");
         if ($is_sandbox) {
-            return "https://gateway.pmnts-sandbox.io/fraud/fingerprint/{$username}.js";
+            return "https://gateway.FatZebra-sandbox.io/fraud/fingerprint/{$username}.js";
         } else {
-            return "https://gateway.pmnts.io/fraud/fingerprint/{$username}.js";
+            return "https://gateway.FatZebra.io/fraud/fingerprint/{$username}.js";
         }
     }
 
@@ -86,9 +86,9 @@ private function getIframeSrc()
         $hash_payload = "{$nonce}:1.0:AUD";
         $hash = hash_hmac("md5", $hash_payload, $shared_secret);
 
-        $base_url = "https://paynow.pmnts.io";
+        $base_url = "https://paynow.FatZebra.io";
         if ($is_sandbox) {
-            $base_url = "https://paynow.pmnts-sandbox.io";
+            $base_url = "https://paynow.FatZebra-sandbox.io";
         }
 
         $url = "{$base_url}/v2/{$username}/{$nonce}/AUD/1.0/{$hash}?show_extras=false&show_email=false&iframe=true&paypal=false&tokenize_only=true&masterpass=false&visacheckout=false&hide_button=true&postmessage=true&return_target=_self&ajax=true";
@@ -113,7 +113,7 @@ private function getIsSandbox()
     private function canSaveCard()
     {
         $customer = $this->currentCustomer->getCustomerId();
-        return !is_null($customer) && $this->scopeConfig->getValue('payment/pmnts_gateway_vault/active', 'stores');
+        return !is_null($customer) && $this->scopeConfig->getValue('payment/fatzebra_gateway_vault/active', 'stores');
     }
 
     private function customerHasSavedCC()
@@ -129,7 +129,7 @@ private function customerHasSavedCC()
         }
         $tokens = $this->paymentTokenManagement->getVisibleAvailableTokens($customerId);
         foreach ($tokens as $token) {
-            if ($token->getPaymentMethodCode() === \PMNTS\Gateway\Helper\Data::METHOD_CODE) {
+            if ($token->getPaymentMethodCode() === \FatZebra\Gateway\Helper\Data::METHOD_CODE) {
                 return true;
             }
         }
diff --git a/Model/Config/Source/Order/Status/Pendingpayment.php b/Model/Config/Source/Order/Status/Pendingpayment.php
index e940da5..a2d3152 100755
--- a/Model/Config/Source/Order/Status/Pendingpayment.php
+++ b/Model/Config/Source/Order/Status/Pendingpayment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PMNTS\Gateway\Model\Config\Source\Order\Status;
+namespace FatZebra\Gateway\Model\Config\Source\Order\Status;
 
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Config\Source\Order\Status;
diff --git a/Model/Gateway.php b/Model/Gateway.php
index 8e11c26..27990df 100755
--- a/Model/Gateway.php
+++ b/Model/Gateway.php
@@ -24,7 +24,7 @@
     *
     * @package FatZebra
     */
-namespace PMNTS\Gateway\Model;
+namespace FatZebra\Gateway\Model;
 
 use Zend\Http\Client\Adapter\Exception\TimeoutException;
 
@@ -41,12 +41,12 @@ class Gateway
     /**
     * The URL of the Fat Zebra gateway
     */
-    public $url = "https://gateway.fatzebra.com.au";
+    public $url = "https://gateway.pmnts.io";
 
     /**
     * The sandbox URL of the Fat Zebra gateway
     */
-    public $sandbox_url = "https://gateway.sandbox.fatzebra.com.au";
+    public $sandbox_url = "https://gateway.pmnts-sandbox.io";
 
     /**
     * The API version for the requests
diff --git a/Model/Source/Action.php b/Model/Source/Action.php
index cd3852c..f738948 100755
--- a/Model/Source/Action.php
+++ b/Model/Source/Action.php
@@ -2,13 +2,13 @@
 /**
  * Payment CC Types Source Model
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace PMNTS\Gateway\Model\Source;
+namespace FatZebra\Gateway\Model\Source;
 
 class Action
 {
diff --git a/Model/Source/Cctype.php b/Model/Source/Cctype.php
index afc5305..702d0fc 100755
--- a/Model/Source/Cctype.php
+++ b/Model/Source/Cctype.php
@@ -2,13 +2,13 @@
 /**
  * Payment CC Types Source Model
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace PMNTS\Gateway\Model\Source;
+namespace FatZebra\Gateway\Model\Source;
 
 class Cctype extends \Magento\Payment\Model\Source\Cctype
 {
diff --git a/Model/Source/EnabledMethods.php b/Model/Source/EnabledMethods.php
index dd558f7..93f5d60 100755
--- a/Model/Source/EnabledMethods.php
+++ b/Model/Source/EnabledMethods.php
@@ -3,13 +3,13 @@
 /**
  * Enabled carriers source model
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-namespace PMNTS\Gateway\Model\Source;
+namespace FatZebra\Gateway\Model\Source;
 
 class EnabledMethods implements \Magento\Framework\Option\ArrayInterface
 {
diff --git a/Model/Ui/TokenUiComponentProvider.php b/Model/Ui/TokenUiComponentProvider.php
index a63ef01..decf7a5 100644
--- a/Model/Ui/TokenUiComponentProvider.php
+++ b/Model/Ui/TokenUiComponentProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PMNTS\Gateway\Model\Ui;
+namespace FatZebra\Gateway\Model\Ui;
 
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
@@ -46,11 +46,11 @@ public function getComponentForToken(PaymentTokenInterface $paymentToken)
         $component = $this->componentFactory->create(
             [
                 'config' => [
-                    'code' => \PMNTS\Gateway\Helper\Data::VAULT_METHOD_CODE,
+                    'code' => \FatZebra\Gateway\Helper\Data::VAULT_METHOD_CODE,
                     TokenUiComponentProviderInterface::COMPONENT_DETAILS => $jsonDetails,
                     TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash()
                 ],
-                'name' => 'PMNTS_Gateway/js/view/payment/method-renderer/vault'
+                'name' => 'FatZebra_Gateway/js/view/payment/method-renderer/vault'
             ]
         );
 
diff --git a/Observer/AssignDataObserver.php b/Observer/AssignDataObserver.php
index e10e41b..0f6f1a0 100644
--- a/Observer/AssignDataObserver.php
+++ b/Observer/AssignDataObserver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PMNTS\Gateway\Observer;
+namespace FatZebra\Gateway\Observer;
 
 class AssignDataObserver extends \Magento\Payment\Observer\AbstractDataAssignObserver
 {
@@ -18,13 +18,13 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         // Track whether a logged-in customer has opted to tokenize and store this card in the Vault
         if (array_key_exists('cc_save', $additionalData)) {
-            $paymentInfo->setAdditionalInformation('pmnts_save_token', $additionalData['cc_save']);
+            $paymentInfo->setAdditionalInformation('fatzebra_save_token', $additionalData['cc_save']);
         }
         if (array_key_exists('cc_token', $additionalData)) {
-            $paymentInfo->setAdditionalInformation('pmnts_token', $additionalData['cc_token']);
+            $paymentInfo->setAdditionalInformation('fatzebra_token', $additionalData['cc_token']);
         }
         if (isset($additionalData['pmnts_id']) && !empty($additionalData['pmnts_id'])) {
-            $paymentInfo->setAdditionalInformation('pmnts_device_id', $additionalData['pmnts_id']);
+            $paymentInfo->setAdditionalInformation('fatzebra_device_id', $additionalData['pmnts_id']);
         }
     }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 3642b3b..839c683 100755
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-PMNTS Magento 2 Module
+Fat Zebra Magento 2 Module
 ======================
 
 Overview
 --------
-The PMNTS Magento 2 module provides a simple integration method for Magento 2.x with the Fat Zebra, Cloud Payments and PMNTS gateway services. This module includes support for the following functionality:
+The Fat Zebra Magento 2 module provides a simple integration method for Magento 2.x with the Fat Zebra gateway services. This module includes support for the following functionality:
 
 * IFRAME card details capture for de-scoping of PCI requirements
 * Card tokenization and one-click saved card payment using the Magento Vault
@@ -26,16 +26,16 @@ Installation using Composer
 
 1.	Under the Magento root folder run the following command to setup the repository:
 ```
-composer config repositories.pmnts git https://github.com/PMNTS/magento2-pmnts.git
+composer config repositories.fatzebra git https://github.com/fatzebra/magento2-fatzebra.git
 ```
 2.	Then run the following command to add the module:
 ```
-composer require pmnts/magento2-pmnts:dev-master
+composer require fatzebra/magento2-fatzebra:dev-master
 ```
 3.	Following this the dependencies will be fetched or updated where required – this may take a few minutes.
 4.	Once all dependencies have installed the module needs to be enabled using the following commands:
 ```
-php bin/magento module:enable PMNTS_Gateway --clear-static-content && php bin/magento setup:upgrade
+php bin/magento module:enable FatZebra_Gateway --clear-static-content && php bin/magento setup:upgrade
 ```
 5.	Once the setup:upgrade command completes the module will be available within the Store Admin to configure.
 
@@ -43,11 +43,11 @@ php bin/magento module:enable PMNTS_Gateway --clear-static-content && php bin/ma
 Manual Installation
 -------------------
 
-1.	Download the latest archive of the module from https://github.com/PMNTS/magento2-pmnts/archive/master.zip
+1.	Download the latest archive of the module from https://github.com/fatzebra/magento2-fatzebra/archive/master.zip
 2.	Copy the archive to the server and extract – the files should be extracted into the Magento root folder, or copied over ensuring directories are included/preserved.
 3.	Run enable the module by running the following commands:
 ```
-php bin/magento module:enable PMNTS_Gateway --clear-static-content && php bin/magento setup:upgrade
+php bin/magento module:enable FatZebra_Gateway --clear-static-content && php bin/magento setup:upgrade
 ```
 4.	Once the setup:upgrade command completed the module will be available within the Store Admin to configure
 
@@ -59,7 +59,7 @@ To configure the module the following steps should be taken:
 1.	Login to the Magento Admin area (this is commonly at https://www.yoursite.com/admin, however it may be different)
 2.	From the menu on the left hand side select Stores and then Configuration
 3.  Under the Configuration menu select Sales and then Payment Methods
-4.	Under the PMNTS payment method set the configuration details as required
+4.	Under the Fat Zebra payment method set the configuration details as required
 5.	Once the configuration has been entered click Save Config – this will commit the changes to the database. The payment method can now be tested.
 
 Notes on Fraud Shipping Maps
diff --git a/composer.json b/composer.json
index 4951a06..6e35468 100755
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,19 @@
 {
-    "description": "PMNTS Payment Gateway integration for Magento 2",
+    "description": "Fat Zebra Payment Gateway integration for Magento 2",
     "license": [
         "OSL-3.0"
     ],
-    "name": "pmnts/magento2-pmnts",
+    "name": "fatzebra/magento2-fatzebra",
     "require": {
     },
     "type": "magento2-module",
-    "version": "dev-master",
+    "version": "1.0.0",
     "autoload": {
         "files": [
             "registration.php"
         ],
         "psr-4": {
-            "PMNTS\\Gateway\\": ""
+            "FatZebra\\Gateway\\": ""
         }
     }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index eb191e4..ed225d6 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway admin configuration
+* FatZebra_Gateway admin configuration
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="payment">
-            <group id="pmnts_gateway" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="100" translate="label" type="text">
-                <label>PMNTS</label>
+            <group id="fatzebra_gateway" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="100" translate="label" type="text">
+                <label>Fat Zebra</label>
                 <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -47,14 +47,14 @@
                 </field>
                 <field id="order_status" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="70" translate="label" type="select">
                     <label>New Order Status</label>
-                    <source_model>PMNTS\Gateway\Model\Config\Source\Order\Status\Pendingpayment</source_model>
+                    <source_model>FatZebra\Gateway\Model\Config\Source\Order\Status\Pendingpayment</source_model>
                 </field>
                 <field id="reference_prefix" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="75" translate="label" type="text">
                   <label>Prefix for Reference</label>
                 </field>
                 <field id="auth_type" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="80" translate="label" type="select">
                     <label>Payment Action</label>
-                    <source_model>PMNTS\Gateway\Model\Source\Action</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\Action</source_model>
                 </field>
                 <field id="shared_secret" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="91" translate="label" type="text">
                     <label>Shared Secret</label>
@@ -66,7 +66,7 @@
                 </field>
                 <field id="cctypes" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="100" translate="label" type="multiselect">
                     <label>Credit Card Types</label>
-                    <source_model>PMNTS\Gateway\Model\Source\Cctype</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\Cctype</source_model>
                 </field>
                 <field id="currencies" translate="label" type="multiselect" sortOrder="105" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Accepted Currencies</label>
@@ -88,7 +88,7 @@
                     <label>Customer can save Credit Card</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Allow customers credit card tokens to be saved for future use.</comment>
-                    <config_path>payment/pmnts_gateway_vault/active</config_path>
+                    <config_path>payment/fatzebra_gateway_vault/active</config_path>
                 </field>
                 <field id="fraud_detection_enabled" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="130" translate="label" type="select">
                     <label>Fraud Detection</label>
@@ -97,42 +97,42 @@
                 </field>
                 <field id="fraud_ship_lowcost" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="131" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - Low Cost</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
                 </field>
                 <field id="fraud_ship_sameday" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="132" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - Same Day</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
                 </field>
                 <field id="fraud_ship_overnight" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="133" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - Overnight</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
                 </field>
                 <field id="fraud_ship_express" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="134" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - Express</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
                 </field>
                 <field id="fraud_ship_international" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="135" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - International</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
                 </field>
                 <field id="fraud_ship_pickup" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="136" translate="label" type="multiselect">
                     <label>Fraud Shipping Map - Pickup</label>
-                    <source_model>PMNTS\Gateway\Model\Source\EnabledMethods</source_model>
+                    <source_model>FatZebra\Gateway\Model\Source\EnabledMethods</source_model>
                     <depends>
                         <field id="fraud_detection_enabled">1</field>
                     </depends>
diff --git a/etc/config.xml b/etc/config.xml
index 0a22b04..801bb9f 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway default configuration
+* FatZebra_Gateway default configuration
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <payment>
-            <pmnts_gateway>
+            <fatzebra_gateway>
                 <active>0</active>
-                <model>PmntsPayment</model>
+                <model>FatZebraPayment</model>
                 <payment_action>authorize_capture</payment_action>
                 <title>Credit Card</title>
                 <order_status>processing</order_status>
@@ -30,11 +30,11 @@
                 <iframe_css>https://pmnts-resources.s3.amazonaws.com/magento2/magento2-iframe.css</iframe_css>
                 <can_use_checkout>1</can_use_checkout>
                 <token backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-            </pmnts_gateway>
-            <pmnts_gateway_vault>
-                <model>PmntsVaultProvider</model>
+            </fatzebra_gateway>
+            <fatzebra_gateway_vault>
+                <model>FatZebraVaultProvider</model>
                 <title>My Saved Cards</title>
-            </pmnts_gateway_vault>
+            </fatzebra_gateway_vault>
         </payment>
     </default>
 </config>
diff --git a/etc/di.xml b/etc/di.xml
index e855ce1..f95e61d 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,119 +1,119 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
 
-    <virtualType name="PmntsPayment" type="Magento\Payment\Model\Method\Adapter">
+    <virtualType name="FatZebraPayment" type="Magento\Payment\Model\Method\Adapter">
         <arguments>
-            <argument name="code" xsi:type="const">PMNTS\Gateway\Helper\Data::METHOD_CODE</argument>
+            <argument name="code" xsi:type="const">FatZebra\Gateway\Helper\Data::METHOD_CODE</argument>
             <argument name="infoBlockType" xsi:type="string">Magento\Payment\Block\Info</argument>
             <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form\Cc</argument>
-            <argument name="valueHandlerPool" xsi:type="object">PmntsValueHandlerPool</argument>
-            <!--<argument name="validatorPool" xsi:type="object">PmntsValidatorPool</argument>-->
-            <argument name="commandPool" xsi:type="object">PmntsCommandPool</argument>
+            <argument name="valueHandlerPool" xsi:type="object">FatZebraValueHandlerPool</argument>
+            <!--<argument name="validatorPool" xsi:type="object">FatZebraValidatorPool</argument>-->
+            <argument name="commandPool" xsi:type="object">FatZebraCommandPool</argument>
         </arguments>
     </virtualType>
 
     <!-- Commands infrastructure -->
-    <virtualType name="PmntsCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+    <virtualType name="FatZebraCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
         <arguments>
             <argument name="commands" xsi:type="array">
-                <item name="capture" xsi:type="string">PMNTS\Gateway\Gateway\CaptureCommand</item>
-                <item name="vault_sale" xsi:type="string">PMNTS\Gateway\Gateway\VaultCaptureCommand</item>
-                <item name="refund" xsi:type="string">PMNTS\Gateway\Gateway\RefundCommand</item>
+                <item name="capture" xsi:type="string">FatZebra\Gateway\Gateway\CaptureCommand</item>
+                <item name="vault_sale" xsi:type="string">FatZebra\Gateway\Gateway\VaultCaptureCommand</item>
+                <item name="refund" xsi:type="string">FatZebra\Gateway\Gateway\RefundCommand</item>
             </argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+    <virtualType name="FatZebraValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="default" xsi:type="string">PmntsValueHandler</item>
-                <item name="vault" xsi:type="string">PmntsVaultValueHandler</item>
+                <item name="default" xsi:type="string">FatZebraValueHandler</item>
+                <item name="vault" xsi:type="string">FatZebraVaultValueHandler</item>
             </argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+    <virtualType name="FatZebraValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
         <arguments>
-            <argument name="configInterface" xsi:type="object">PmntsPaymentConfig</argument>
+            <argument name="configInterface" xsi:type="object">FatZebraPaymentConfig</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
+    <virtualType name="FatZebraPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
         <arguments>
-            <argument name="methodCode" xsi:type="const">PMNTS\Gateway\Helper\Data::METHOD_CODE</argument>
+            <argument name="methodCode" xsi:type="const">FatZebra\Gateway\Helper\Data::METHOD_CODE</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsVaultValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+    <virtualType name="FatZebraVaultValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
         <arguments>
-            <argument name="configInterface" xsi:type="object">PmntsVaultPaymentConfig</argument>
+            <argument name="configInterface" xsi:type="object">FatZebraVaultPaymentConfig</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsVaultValueHandlerPool" type="VaultPaymentValueHandlerPool">
+    <virtualType name="FatZebraVaultValueHandlerPool" type="VaultPaymentValueHandlerPool">
         <arguments>
             <argument name="handlers" xsi:type="array">
-                <item name="default" xsi:type="string">PmntsVaultValueHandler</item>
+                <item name="default" xsi:type="string">FatZebraVaultValueHandler</item>
             </argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsVaultPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
+    <virtualType name="FatZebraVaultPaymentConfig" type="Magento\Payment\Gateway\Config\Config">
         <arguments>
-            <argument name="methodCode" xsi:type="const">PMNTS\Gateway\Helper\Data::VAULT_METHOD_CODE</argument>
+            <argument name="methodCode" xsi:type="const">FatZebra\Gateway\Helper\Data::VAULT_METHOD_CODE</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsVaultProvider" type="Magento\Vault\Model\Method\Vault">
+    <virtualType name="FatZebraVaultProvider" type="Magento\Vault\Model\Method\Vault">
         <arguments>
-            <argument name="config" xsi:type="object">PmntsVaultPaymentConfig</argument>
-            <argument name="vaultProvider" xsi:type="object">PmntsPayment</argument>
-            <argument name="code" xsi:type="const">PMNTS\Gateway\Helper\Data::VAULT_METHOD_CODE</argument>
+            <argument name="config" xsi:type="object">FatZebraVaultPaymentConfig</argument>
+            <argument name="vaultProvider" xsi:type="object">FatZebraPayment</argument>
+            <argument name="code" xsi:type="const">FatZebra\Gateway\Helper\Data::VAULT_METHOD_CODE</argument>
         </arguments>
     </virtualType>
 
     <type name="Magento\Payment\Gateway\Command\CommandManagerPool">
         <arguments>
             <argument name="executors" xsi:type="array">
-                <item name="pmnts_gateway" xsi:type="string">PmntsCommandManager</item>
+                <item name="fatzebra_gateway" xsi:type="string">FatZebraCommandManager</item>
             </argument>
         </arguments>
     </type>
     <!-- Command managers section for Vault -->
-    <virtualType name="PmntsCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
+    <virtualType name="FatZebraCommandManager" type="Magento\Payment\Gateway\Command\CommandManager">
         <arguments>
-            <argument name="commandPool" xsi:type="object">PmntsCommandPool</argument>
+            <argument name="commandPool" xsi:type="object">FatZebraCommandPool</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsGatewayLoggerHandler" type="\Magento\Framework\Logger\Handler\Base">
+    <virtualType name="FatZebraGatewayLoggerHandler" type="\Magento\Framework\Logger\Handler\Base">
         <arguments>
-            <argument name="fileName" xsi:type="string">/var/log/pmnts_gateway.log</argument>
+            <argument name="fileName" xsi:type="string">/var/log/fatzebra_gateway.log</argument>
         </arguments>
     </virtualType>
 
-    <virtualType name="PmntsGatewayLogger" type="Magento\Framework\Logger\Monolog">
+    <virtualType name="FatZebraGatewayLogger" type="Magento\Framework\Logger\Monolog">
         <arguments>
-            <argument name="name" xsi:type="object">pmnts_gateway</argument>
+            <argument name="name" xsi:type="object">fatzebra_gateway</argument>
             <argument name="handlers" xsi:type="array">
-                <item name="default" xsi:type="object">PmntsGatewayLoggerHandler</item>
+                <item name="default" xsi:type="object">FatZebraGatewayLoggerHandler</item>
             </argument>
         </arguments>
     </virtualType>
 
-    <type name="\PMNTS\Gateway\Gateway\RefundCommand">
+    <type name="\FatZebra\Gateway\Gateway\RefundCommand">
         <arguments>
-            <argument name="logger" xsi:type="object">PmntsGatewayLogger</argument>
+            <argument name="logger" xsi:type="object">FatZebraGatewayLogger</argument>
         </arguments>
     </type>
-    <type name="\PMNTS\Gateway\Gateway\CaptureCommand">
+    <type name="\FatZebra\Gateway\Gateway\CaptureCommand">
         <arguments>
-            <argument name="logger" xsi:type="object">PmntsGatewayLogger</argument>
+            <argument name="logger" xsi:type="object">FatZebraGatewayLogger</argument>
         </arguments>
     </type>
-    <type name="\PMNTS\Gateway\Gateway\VaultCaptureCommand">
+    <type name="\FatZebra\Gateway\Gateway\VaultCaptureCommand">
         <arguments>
-            <argument name="logger" xsi:type="object">PmntsGatewayLogger</argument>
+            <argument name="logger" xsi:type="object">FatZebraGatewayLogger</argument>
         </arguments>
     </type>
 </config>
\ No newline at end of file
diff --git a/etc/events.xml b/etc/events.xml
index 6462ae9..3f02deb 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="payment_method_assign_data_pmnts_gateway">
-        <observer name="pmnts_gateway_assign_data" instance="PMNTS\Gateway\Observer\AssignDataObserver" />
+    <event name="payment_method_assign_data_fatzebra_gateway">
+        <observer name="fatzebra_gateway_assign_data" instance="FatZebra\Gateway\Observer\AssignDataObserver" />
     </event>
 </config>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index cfa8d9d..bb54b41 100755
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway DI definitions
+* FatZebra_Gateway DI definitions
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
 
-    <virtualType name="PMNTS\Gateway\Model\ConfigProvider" type="Magento\Payment\Model\CcGenericConfigProvider">
+    <virtualType name="FatZebra\Gateway\Model\ConfigProvider" type="Magento\Payment\Model\CcGenericConfigProvider">
         <arguments>
             <argument name="methodCodes" xsi:type="array">
-                <item name="pmnts_gateway" xsi:type="const">PMNTS\Gateway\Helper\Data::METHOD_CODE</item>
+                <item name="fatzebra_gateway" xsi:type="const">FatZebra\Gateway\Helper\Data::METHOD_CODE</item>
             </argument>
         </arguments>
     </virtualType>
@@ -22,8 +22,8 @@
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
             <argument name="configProviders" xsi:type="array">
-                <item name="pmnts_gateway_config_provider" xsi:type="object">PMNTS\Gateway\Model\ConfigProvider</item>
-                <item name="pmnts_gateway_iframe_config_provider" xsi:type="object">PMNTS\Gateway\Model\Config\PmntsConfigProvider</item>
+                <item name="fatzebra_gateway_config_provider" xsi:type="object">FatZebra\Gateway\Model\ConfigProvider</item>
+                <item name="fatzebra_gateway_iframe_config_provider" xsi:type="object">FatZebra\Gateway\Model\Config\FatZebraConfigProvider</item>
             </argument>
         </arguments>
     </type>
@@ -31,7 +31,7 @@
     <type name="Magento\Vault\Model\Ui\TokensConfigProvider">
         <arguments>
             <argument name="tokenUiComponentProviders" xsi:type="array">
-                <item name="pmnts_gateway" xsi:type="object">PMNTS\Gateway\Model\Ui\TokenUiComponentProvider</item>
+                <item name="fatzebra_gateway" xsi:type="object">FatZebra\Gateway\Model\Ui\TokenUiComponentProvider</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/module.xml b/etc/module.xml
index a9b54bf..bc1fd4a 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway module dependency
+* FatZebra_Gateway module dependency
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="PMNTS_Gateway" setup_version="2.0.10">
+    <module name="FatZebra_Gateway" setup_version="2.0.10">
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Sales" />
diff --git a/etc/payment.xml b/etc/payment.xml
index 849f198..cbb6e0f 100755
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway default payment configuration
+* FatZebra_Gateway default payment configuration
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
 <payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
     <methods>
-        <method name="pmnts_gateway">
+        <method name="fatzebra_gateway">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
     </methods>
diff --git a/registration.php b/registration.php
index 53b1323..6a47487 100755
--- a/registration.php
+++ b/registration.php
@@ -2,6 +2,6 @@
 
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'PMNTS_Gateway',
+    'FatZebra_Gateway',
     __DIR__
 );
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 8f1a42b..45c3e52 100755
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
 /**
-* PMNTS_Gateway layout configuration
+* FatZebra_Gateway layout configuration
 *
-* @category    PMNTS
-* @package     PMNTS_Gateway
-* @copyright   PMNTS (http://PMNTS.io)
+* @category    Fat Zebra
+* @package     FatZebra_Gateway
+* @copyright   Fat Zebra (https://www.fatzebra.com)
 * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 */
 -->
@@ -27,10 +27,10 @@
                                                         <item name="renders" xsi:type="array">
                                                             <!-- merge payment method renders here -->
                                                             <item name="children" xsi:type="array">
-                                                                <item name="pmnts_gateway-payments" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">PMNTS_Gateway/js/view/payment/pmnts-payments</item>
+                                                                <item name="fatzebra_gateway-payments" xsi:type="array">
+                                                                    <item name="component" xsi:type="string">FatZebra_Gateway/js/view/payment/fatzebra-payments</item>
                                                                     <item name="methods" xsi:type="array">
-                                                                        <item name="pmnts_gateway" xsi:type="array">
+                                                                        <item name="fatzebra_gateway" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
                                                                     </item>
diff --git a/view/frontend/layout/vault_cards_listaction.xml b/view/frontend/layout/vault_cards_listaction.xml
index 6a8abd6..adb5a58 100644
--- a/view/frontend/layout/vault_cards_listaction.xml
+++ b/view/frontend/layout/vault_cards_listaction.xml
@@ -4,7 +4,7 @@
     <body>
         <referenceContainer name="content">
             <referenceBlock name="vault.cards.list">
-                <block class="PMNTS\Gateway\Block\Customer\CardRenderer" name="pmnts.card.renderer" template="Magento_Vault::customer_account/credit_card.phtml"/>
+                <block class="FatZebra\Gateway\Block\Customer\CardRenderer" name="fatzebra.card.renderer" template="Magento_Vault::customer_account/credit_card.phtml"/>
             </referenceBlock>
         </referenceContainer>
     </body>
diff --git a/view/frontend/web/js/view/payment/pmnts-payments.js b/view/frontend/web/js/view/payment/fatzebra-payments.js
similarity index 62%
rename from view/frontend/web/js/view/payment/pmnts-payments.js
rename to view/frontend/web/js/view/payment/fatzebra-payments.js
index e3457dc..6c0df23 100755
--- a/view/frontend/web/js/view/payment/pmnts-payments.js
+++ b/view/frontend/web/js/view/payment/fatzebra-payments.js
@@ -1,9 +1,9 @@
 /**
- * PMNTS_Gateway Magento JS component
+ * FatZebra_Gateway Magento JS component
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 /*browser:true*/
@@ -20,8 +20,8 @@ define(
         'use strict';
         rendererList.push(
             {
-                type: 'pmnts_gateway',
-                component: 'PMNTS_Gateway/js/view/payment/method-renderer/pmnts-method'
+                type: 'fatzebra_gateway',
+                component: 'FatZebra_Gateway/js/view/payment/method-renderer/fatzebra-method'
             }
         );
         /** Add view logic here if needed */
diff --git a/view/frontend/web/js/view/payment/method-renderer/pmnts-method.js b/view/frontend/web/js/view/payment/method-renderer/fatzebra-method.js
similarity index 59%
rename from view/frontend/web/js/view/payment/method-renderer/pmnts-method.js
rename to view/frontend/web/js/view/payment/method-renderer/fatzebra-method.js
index 94bc6aa..b16526b 100755
--- a/view/frontend/web/js/view/payment/method-renderer/pmnts-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/fatzebra-method.js
@@ -1,9 +1,9 @@
 /**
- * PMNTS_Gateway Magento JS component
+ * FatZebra_Gateway Magento JS component
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 /*browser:true*/
@@ -20,12 +20,12 @@ define(
   function (Component, $, validator, messageList, fullScreenLoader, VaultEnabler) {
         'use strict';
 
-        window.pmntsGateway.messageList = messageList;
-        window.pmntsGateway.fullScreenLoader = fullScreenLoader;
+        window.fatzebraGateway.messageList = messageList;
+        window.fatzebraGateway.fullScreenLoader = fullScreenLoader;
 
         return Component.extend({
             defaults: {
-                template: 'PMNTS_Gateway/payment/pmnts-form'
+                template: 'FatZebra_Gateway/payment/fatzebra-form'
             },
 
             initialize: function() {
@@ -38,11 +38,11 @@ define(
              * @returns {String}
              */
             getVaultCode: function () {
-                return window.checkoutConfig.payment['pmntsGateway'].ccVaultCode;
+                return window.checkoutConfig.payment['fatzebraGateway'].ccVaultCode;
             },
 
             getCode: function() {
-                return 'pmnts_gateway';
+                return 'fatzebra_gateway';
             },
 
             isActive: function() {
@@ -50,27 +50,27 @@ define(
             },
 
             getIframeUrl: function() {
-              return window.checkoutConfig.payment.pmntsGateway.iframeSrc;
+              return window.checkoutConfig.payment.fatzebraGateway.iframeSrc;
             },
 
             canSaveCard: function() {
-              return window.checkoutConfig.payment.pmntsGateway.canSaveCard;
+              return window.checkoutConfig.payment.fatzebraGateway.canSaveCard;
             },
 
             customerHasSavedCC: function() {
-              return window.checkoutConfig.payment.pmntsGateway.customerHasSavedCC;
+              return window.checkoutConfig.payment.fatzebraGateway.customerHasSavedCC;
             },
 
-            pmntsPlaceOrder: function() {
-                window.pmntsGateway.processIframeOrder();
+            fatzebraPlaceOrder: function() {
+                window.fatzebraGateway.processIframeOrder();
             },
 
             getData: function() {
                 var data = {
                     'method': this.item.method,
                     'additional_data': {
-                        "cc_token": jQuery('#pmnts_gateway-token').val(),
-                        "cc_save": jQuery("#pmnts_gateway_cc_save").is(':checked')
+                        "cc_token": jQuery('#fatzebra_gateway-token').val(),
+                        "cc_save": jQuery("#fatzebra_gateway_cc_save").is(':checked')
                     }
                 };
 
@@ -83,17 +83,17 @@ define(
 
 setTimeout(function() {
   var s = document.createElement( 'script' );
-  s.setAttribute( 'src', window.checkoutConfig.payment.pmntsGateway.fraudFingerprintSrc );
+  s.setAttribute( 'src', window.checkoutConfig.payment.fatzebraGateway.fraudFingerprintSrc );
   document.body.appendChild( s );
 }, 1000);
 
 
-window.pmntsGateway = {
+window.fatzebraGateway = {
   attachEvents: function() {
     // Clear existing events...
-    window.removeEventListener ? window.removeEventListener("message", window.pmntsGateway.receiveMessage, false) : window.detatchEvent("onmessage", window.pmntsGateway.receiveMessage);
+    window.removeEventListener ? window.removeEventListener("message", window.fatzebraGateway.receiveMessage, false) : window.detatchEvent("onmessage", window.fatzebraGateway.receiveMessage);
     // And add...
-    window.addEventListener ? window.addEventListener("message", window.pmntsGateway.receiveMessage, false) : window.attachEvent("onmessage", window.pmntsGateway.receiveMessage);
+    window.addEventListener ? window.addEventListener("message", window.fatzebraGateway.receiveMessage, false) : window.attachEvent("onmessage", window.fatzebraGateway.receiveMessage);
   },
   processIframeOrder: function() {
     // PostMessage
@@ -102,18 +102,18 @@ window.pmntsGateway = {
 
     // Trigger the iframe
     var iframe = document.getElementById("checkout-iframe");
-    window.pmntsGateway.fullScreenLoader.startLoader();
+    window.fatzebraGateway.fullScreenLoader.startLoader();
     iframe.contentWindow.postMessage('doCheckout', '*');
   },
 
   receiveMessage: function(event) {
       if (event.origin.indexOf("paynow") === -1)  return;
-      window.pmntsGateway.fullScreenLoader.stopLoader();
+      window.fatzebraGateway.fullScreenLoader.stopLoader();
 
       var payload = event.data;
       if (typeof event.data == 'string') {
           if (/\[object/i.test(event.data)) {
-              window.pmntsGateway.messageList.addErrorMessage({message: "Sorry, it looks like there has been a problem communicating with your browsers..."});
+              window.fatzebraGateway.messageList.addErrorMessage({message: "Sorry, it looks like there has been a problem communicating with your browsers..."});
           }
           var pairs = payload.split("&");
           payload = {};
@@ -126,27 +126,27 @@ window.pmntsGateway = {
 
       if ('data' in payload) {
           if (payload.data.message == "form.invalid") {
-              window.pmntsGateway.messageList.addErrorMessage({message: "Validation error: " + payload.data.errors});
+              window.fatzebraGateway.messageList.addErrorMessage({message: "Validation error: " + payload.data.errors});
               return;
           }
           // Modern browser
           // Use payload.data.x
-          window.pmntsGateway.fillInPaymentForm(payload.data);
+          window.fatzebraGateway.fillInPaymentForm(payload.data);
       } else {
           // Old browser don't use payload.data.x
           if (payload.message == "form.invalid") {
-              window.pmntsGateway.messageList.addErrorMessage({message: "Validation error: " + payload.errors});
+              window.fatzebraGateway.messageList.addErrorMessage({message: "Validation error: " + payload.errors});
               return;
           }
-          window.pmntsGateway.fillInPaymentForm(payload);
+          window.fatzebraGateway.fillInPaymentForm(payload);
       }
   },
   fillInPaymentForm: function(data) {
-    jQuery("#pmnts_gateway-token").val(data.token);
-    jQuery('#pmnts-place-token-order').click();
+    jQuery("#fatzebra_gateway-token").val(data.token);
+    jQuery('#fatzebra-place-token-order').click();
   },
   messageList: null,
   fullScreenLoader: null
 };
 
-window.pmntsGateway.attachEvents();
+window.fatzebraGateway.attachEvents();
diff --git a/view/frontend/web/js/view/payment/method-renderer/vault.js b/view/frontend/web/js/view/payment/method-renderer/vault.js
index f2e59e5..7ea7575 100644
--- a/view/frontend/web/js/view/payment/method-renderer/vault.js
+++ b/view/frontend/web/js/view/payment/method-renderer/vault.js
@@ -10,7 +10,7 @@ define([
 
     return VaultComponent.extend({
         defaults: {
-            template: 'PMNTS_Gateway/payment/pmnts_vault_form'
+            template: 'FatZebra_Gateway/payment/fatzebra_vault_form'
         },
 
         /**
diff --git a/view/frontend/web/template/payment/pmnts-form.html b/view/frontend/web/template/payment/fatzebra-form.html
similarity index 91%
rename from view/frontend/web/template/payment/pmnts-form.html
rename to view/frontend/web/template/payment/fatzebra-form.html
index c4aa253..f45a29c 100755
--- a/view/frontend/web/template/payment/pmnts-form.html
+++ b/view/frontend/web/template/payment/fatzebra-form.html
@@ -1,10 +1,10 @@
 <!--
 /**
- * PMNTS_Gateway Template
+ * FatZebra_Gateway Template
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 -->
@@ -38,7 +38,7 @@
           <!-- ko if: canSaveCard() -->
             <div class="field">
               <div class="control">
-                  <input type="checkbox" name="payment[cc_save]" class="input-checkbox" value="1" id="pmnts_gateway_cc_save"
+                  <input type="checkbox" name="payment[cc_save]" class="input-checkbox" value="1" id="fatzebra_gateway_cc_save"
                          data-bind="attr: {
                                           autocomplete: off,
                                           id: getCode() + '_cc_save',
@@ -62,7 +62,7 @@
                 <button class="action primary checkout"
                         type="submit"
                         data-bind="
-                        click: pmntsPlaceOrder,
+                        click: fatzebraPlaceOrder,
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()},
                         enable: (getCode() == isChecked())
@@ -78,7 +78,7 @@
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
-                        style="display: none;" id="pmnts-place-token-order">
+                        style="display: none;" id="fatzebra-place-token-order">
                     <span data-bind="text: $t('Place Order')"></span>
                 </button>
             </div>
diff --git a/view/frontend/web/template/payment/pmnts_vault_form.html b/view/frontend/web/template/payment/fatzebra_vault_form.html
similarity index 93%
rename from view/frontend/web/template/payment/pmnts_vault_form.html
rename to view/frontend/web/template/payment/fatzebra_vault_form.html
index 35c178f..935c85a 100644
--- a/view/frontend/web/template/payment/pmnts_vault_form.html
+++ b/view/frontend/web/template/payment/fatzebra_vault_form.html
@@ -1,10 +1,10 @@
 <!--
 /**
- * PMNTS_Gateway Template
+ * FatZebra_Gateway Template
  *
- * @category    PMNTS
- * @package     PMNTS_Gateway
- * @copyright   PMNTS (http://PMNTS.io)
+ * @category    Fat Zebra
+ * @package     FatZebra_Gateway
+ * @copyright   Fat Zebra (https://www.fatzebra.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 -->