diff --git a/Api/CustomerAttributeInterface.php b/Api/CustomerAttributeInterface.php
index 0fbe87b..0c56afa 100755
--- a/Api/CustomerAttributeInterface.php
+++ b/Api/CustomerAttributeInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Api;
+namespace TrueLoyal\LoyaltyRewards\Api;
 
 interface CustomerAttributeInterface
 {
diff --git a/Api/CustomerAttributeUpdateInterface.php b/Api/CustomerAttributeUpdateInterface.php
index b8d4203..cad3bed 100755
--- a/Api/CustomerAttributeUpdateInterface.php
+++ b/Api/CustomerAttributeUpdateInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Api;
+namespace TrueLoyal\LoyaltyRewards\Api;
 
 interface CustomerAttributeUpdateInterface
 {
diff --git a/Block/Adminhtml/Group/Edit/Form.php b/Block/Adminhtml/Group/Edit/Form.php
index ce8a198..e643ffe 100755
--- a/Block/Adminhtml/Group/Edit/Form.php
+++ b/Block/Adminhtml/Group/Edit/Form.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Group\Edit;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Group\Edit;
 
 use Magento\Customer\Controller\RegistryConstants;
 
diff --git a/Block/Adminhtml/Sales/Order/ZinreloCreditMemoCreateDiscount.php b/Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoCreateDiscount.php
similarity index 86%
rename from Block/Adminhtml/Sales/Order/ZinreloCreditMemoCreateDiscount.php
rename to Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoCreateDiscount.php
index 4ade7ca..690d825 100755
--- a/Block/Adminhtml/Sales/Order/ZinreloCreditMemoCreateDiscount.php
+++ b/Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoCreateDiscount.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class ZinreloCreditMemoCreateDiscount extends Template
+class TrueLoyalCreditMemoCreateDiscount extends Template
 {
     /**
      * @var Data
@@ -20,7 +20,7 @@ class ZinreloCreditMemoCreateDiscount extends Template
     private $orderRepository;
 
     /**
-     * Zinrelo Credit MemoCreate Discount constructor.
+     * TrueLoyal Credit MemoCreate Discount constructor.
      *
      * @param Context $context
      * @param Data $helper
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * This function call initTotals
      *
-     * @return ZinreloCreditMemoCreateDiscount
+     * @return TrueLoyalCreditMemoCreateDiscount
      */
     public function initTotals()
     {
@@ -63,7 +63,7 @@ public function initTotals()
                 $this->getParentBlock()->addTotal(
                     new DataObject(
                         [
-                            'code' => 'zinrelo_discount',
+                            'code' => 'trueloyal_discount',
                             'strong' => $this->getStrong(),
                             'value' => $totalAmount["value"],
                             'base_value' => $totalAmount["value"],
diff --git a/Block/Adminhtml/Sales/Order/ZinreloCreditMemoViewDiscount.php b/Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoViewDiscount.php
similarity index 85%
rename from Block/Adminhtml/Sales/Order/ZinreloCreditMemoViewDiscount.php
rename to Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoViewDiscount.php
index 6c8e5db..60f77cd 100755
--- a/Block/Adminhtml/Sales/Order/ZinreloCreditMemoViewDiscount.php
+++ b/Block/Adminhtml/Sales/Order/TrueLoyalCreditMemoViewDiscount.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 
-class ZinreloCreditMemoViewDiscount extends Template
+class TrueLoyalCreditMemoViewDiscount extends Template
 {
     /**
      * @var Data
@@ -20,7 +20,7 @@ class ZinreloCreditMemoViewDiscount extends Template
     private $creditMemoRepository;
 
     /**
-     * Zinrelo Credit Memo View Discount constructor.
+     * TrueLoyal Credit Memo View Discount constructor.
      *
      * @param Context $context
      * @param Data $helper
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * This function call initTotals
      *
-     * @return ZinreloCreditMemoViewDiscount
+     * @return TrueLoyalCreditMemoViewDiscount
      */
     public function initTotals()
     {
@@ -55,7 +55,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Adminhtml/Sales/Order/ZinreloDiscount.php b/Block/Adminhtml/Sales/Order/TrueLoyalDiscount.php
similarity index 89%
rename from Block/Adminhtml/Sales/Order/ZinreloDiscount.php
rename to Block/Adminhtml/Sales/Order/TrueLoyalDiscount.php
index 87a5e90..bb44108 100755
--- a/Block/Adminhtml/Sales/Order/ZinreloDiscount.php
+++ b/Block/Adminhtml/Sales/Order/TrueLoyalDiscount.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class ZinreloDiscount extends Template
+class TrueLoyalDiscount extends Template
 {
     /**
      * @var Order
@@ -23,7 +23,7 @@ class ZinreloDiscount extends Template
     private $helper;
 
     /**
-     * Zinrelo Discount constructor.
+     * TrueLoyal Discount constructor.
      *
      * @param Context $context
      * @param Data $helper
@@ -91,7 +91,7 @@ public function getValueProperties()
     /**
      * This function call initTotals
      *
-     * @return ZinreloDiscount
+     * @return TrueLoyalDiscount
      */
     public function initTotals()
     {
@@ -101,7 +101,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Adminhtml/Sales/Order/ZinreloInvoiceCreateDiscount.php b/Block/Adminhtml/Sales/Order/TrueLoyalInvoiceCreateDiscount.php
similarity index 90%
rename from Block/Adminhtml/Sales/Order/ZinreloInvoiceCreateDiscount.php
rename to Block/Adminhtml/Sales/Order/TrueLoyalInvoiceCreateDiscount.php
index b89e98d..ac8e68a 100755
--- a/Block/Adminhtml/Sales/Order/ZinreloInvoiceCreateDiscount.php
+++ b/Block/Adminhtml/Sales/Order/TrueLoyalInvoiceCreateDiscount.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class ZinreloInvoiceCreateDiscount extends Template
+class TrueLoyalInvoiceCreateDiscount extends Template
 {
     /**
      * @var Order
@@ -28,7 +28,7 @@ class ZinreloInvoiceCreateDiscount extends Template
     private $orderRepository;
 
     /**
-     * Zinrelo Invoice Create Discount constructor.
+     * TrueLoyal Invoice Create Discount constructor.
      *
      * @param Context $context
      * @param Data $helper
@@ -99,7 +99,7 @@ public function getValueProperties()
     /**
      * This function call initTotals
      *
-     * @return ZinreloInvoiceCreateDiscount
+     * @return TrueLoyalInvoiceCreateDiscount
      */
     public function initTotals()
     {
@@ -118,7 +118,7 @@ public function initTotals()
                 $this->getParentBlock()->addTotal(
                     new DataObject(
                         [
-                            'code' => 'zinrelo_discount',
+                            'code' => 'trueloyal_discount',
                             'strong' => $this->getStrong(),
                             'value' => $totalAmount["value"],
                             'base_value' => $totalAmount["value"],
diff --git a/Block/Adminhtml/Sales/Order/ZinreloInvoiceViewDiscount.php b/Block/Adminhtml/Sales/Order/TrueLoyalInvoiceViewDiscount.php
similarity index 85%
rename from Block/Adminhtml/Sales/Order/ZinreloInvoiceViewDiscount.php
rename to Block/Adminhtml/Sales/Order/TrueLoyalInvoiceViewDiscount.php
index 5374756..6d9d93b 100755
--- a/Block/Adminhtml/Sales/Order/ZinreloInvoiceViewDiscount.php
+++ b/Block/Adminhtml/Sales/Order/TrueLoyalInvoiceViewDiscount.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class ZinreloInvoiceViewDiscount extends Template
+class TrueLoyalInvoiceViewDiscount extends Template
 {
 
     /**
@@ -21,7 +21,7 @@ class ZinreloInvoiceViewDiscount extends Template
     private $invoiceRepository;
 
     /**
-     * Zinrelo Invoice View Discount constructor.
+     * TrueLoyal Invoice View Discount constructor.
      *
      * @param Context $context
      * @param Data $helper
@@ -45,7 +45,7 @@ public function __construct(
     /**
      * This function call initTotals
      *
-     * @return ZinreloInvoiceViewDiscount
+     * @return TrueLoyalInvoiceViewDiscount
      */
     public function initTotals()
     {
@@ -57,7 +57,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Cart/RewardList.php b/Block/Cart/RewardList.php
index d1f4525..a0e4400 100755
--- a/Block/Cart/RewardList.php
+++ b/Block/Cart/RewardList.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Cart;
+namespace TrueLoyal\LoyaltyRewards\Block\Cart;
 
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\View\Element\Template;
-use Zinrelo\LoyaltyRewards\Helper\Reward;
-use Zinrelo\LoyaltyRewards\Logger\Logger as ZinreloLogger;
+use TrueLoyal\LoyaltyRewards\Helper\Reward;
+use TrueLoyal\LoyaltyRewards\Logger\Logger as TrueLoyalLogger;
 
 class RewardList extends Template
 {
@@ -15,7 +15,7 @@ class RewardList extends Template
     public $helper;
 
     /**
-     * @var ZinreloLogger
+     * @var TrueLoyalLogger
      */
     public $logger;
 
@@ -30,14 +30,14 @@ class RewardList extends Template
      * @param Template\Context $context
      * @param Reward $helper
      * @param CustomerSession $customerSession
-     * @param ZinreloLogger $logger
+     * @param TrueLoyalLogger $logger
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
         Reward $helper,
         CustomerSession $customerSession,
-        ZinreloLogger $logger,
+        TrueLoyalLogger $logger,
         array $data = []
     ) {
         $this->logger = $logger;
@@ -67,8 +67,8 @@ public function getFormAction()
     public function canCancelRedeem()
     {
         $quote = $this->helper->getQuote();
-        $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($quote->getId());
-        if (!empty($zinreloQuote->getRewardRulesData() && !empty($zinreloQuote->getRedeemRewardDiscount()))) {
+        $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($quote->getId());
+        if (!empty($trueloyalQuote->getRewardRulesData() && !empty($trueloyalQuote->getRedeemRewardDiscount()))) {
             return true;
         }
         return false;
diff --git a/Block/Dashboard.php b/Block/Dashboard.php
index b15c48f..2f6cba0 100755
--- a/Block/Dashboard.php
+++ b/Block/Dashboard.php
@@ -1,9 +1,16 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block;
+namespace TrueLoyal\LoyaltyRewards\Block;
 
+use Firebase\JWT\JWT;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\SessionFactory;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Framework\Locale\Resolver;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Element\Template;
-use Zinrelo\LoyaltyRewards\Helper\Config;
+use TrueLoyal\LoyaltyRewards\Helper\Config;
 
 class Dashboard extends Template
 {
@@ -12,20 +19,76 @@ class Dashboard extends Template
      */
     private $config;
 
+    /**
+     * @var JWT
+     */
+    private $jwt;
+
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var SessionFactory
+     */
+    private $sessionFactory;
+
+    /**
+     * @var CountryFactory
+     */
+    private $countryFactory;
+
+    /**
+     * @var Resolver
+     */
+    private $store;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
     /**
      * Dashboard constructor.
      *
      * @param Template\Context $context
      * @param Config $config
+     * @param JWT $jwt
+     * @param CustomerFactory $customerFactory
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param SessionFactory $sessionFactory
+     * @param CountryFactory $countryFactory
+     * @param Resolver $store
+     * @param SerializerInterface $serializer
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
+        Template\Context $context,
         Config $config,
+        JWT $jwt,
+        CustomerFactory $customerFactory,
+        CustomerRepositoryInterface $customerRepository,
+        SessionFactory $sessionFactory,
+        CountryFactory $countryFactory,
+        Resolver $store,
+        SerializerInterface $serializer,
         array $data = []
     ) {
-        parent::__construct($context, $data);
         $this->config = $config;
+        $this->jwt = $jwt;
+        $this->customerFactory = $customerFactory;
+        $this->customerRepository = $customerRepository;
+        $this->sessionFactory = $sessionFactory;
+        $this->countryFactory = $countryFactory;
+        $this->store = $store;
+        $this->serializer = $serializer;
+        parent::__construct($context, $data);
     }
 
     /**
@@ -33,7 +96,7 @@ public function __construct(
      *
      * @return bool
      */
-    public function isModuleEnabled()
+    public function isModuleEnabled(): bool
     {
         return $this->config->isModuleEnabled();
     }
@@ -47,4 +110,137 @@ public function getPartnerId()
     {
         return $this->config->getPartnerId();
     }
+
+    /**
+     * Build and return a signed JWT for the current customer.
+     * Returns empty string if the customer is not eligible.
+     *
+     * @return string
+     */
+    public function getJwtToken(): string
+    {
+        if ($this->config->isDashboardHiddenForGuests() && !$this->sessionFactory->create()->getCustomerId()) {
+            return '';
+        }
+
+        $key = $this->config->getApiKey();
+        $apiKeyIdentifier = $this->config->getApiKeyIdentifier();
+        $customerEmail = "";
+        $customerFirstName = "";
+        $customerLastName = "";
+        $customerBirthDate = "";
+        $street = [];
+        $city = "";
+        $region = "";
+        $postcode = "";
+        $country = "";
+        $telephone = "";
+        $lang = "";
+        $memberIdentifierValue = "";
+
+        $jsonConfigLanguage = $this->config->getConfigLanguage();
+        $preferredLanguage = $this->config->getPreferredLanguage();
+        if ($preferredLanguage) {
+            $lang = $preferredLanguage;
+        } elseif ($jsonConfigLanguage) {
+            $lang = $this->store->getLocale() ?? "";
+            $configLanguage = $this->serializer->unserialize($jsonConfigLanguage);
+            $config = stristr($lang, "_", true);
+            if (isset($configLanguage[$config]) && $configLanguage[$config]) {
+                $lang = $configLanguage[$config];
+            } else {
+                $lang = "";
+            }
+        }
+
+        $customerId = $this->sessionFactory->create()->getCustomerId();
+        if ($customerId && !$this->config->isAutoEnrollmentEnabled()) {
+            $customerData = $this->customerRepository->getById($customerId);
+            $optInAttribute = $this->config->getOptInAttributeCode();
+            $trueloyalOptedIn = $customerData->getCustomAttribute($optInAttribute);
+            if (!$trueloyalOptedIn || !$trueloyalOptedIn->getValue()) {
+                return '';
+            }
+        }
+
+        $customer = $this->customerFactory->create()->load($customerId);
+        if ($customer->getEntityId()) {
+            $billingAddress = $customer->getDefaultBillingAddress()
+                ? $customer->getDefaultBillingAddress()->getData()
+                : [];
+            $customerEmail = $customer->getEmail();
+            $customerFirstName = $customer->getFirstname();
+            $customerLastName = $customer->getLastname();
+            $customerBirthDate = $customer->getDob();
+            $pattern = '/(\d{4})-(\d{2})-(\d{2})/';
+            if ($customerBirthDate && preg_match($pattern, $customerBirthDate)) {
+                $customerBirthDate = preg_replace($pattern, '$2/$3/$1', $customerBirthDate);
+            }
+            $telephone = $billingAddress['telephone'] ?? "";
+            $city = $billingAddress['city'] ?? "";
+            $region = $billingAddress['region'] ?? "";
+            $postcode = $billingAddress['postcode'] ?? "";
+            $street = isset($billingAddress['street']) ? explode("\n", $billingAddress['street']) : [];
+            $country = isset($billingAddress['country_id'])
+                ? $this->getCountryName($billingAddress['country_id'])
+                : "";
+            $memberIdentifierValue = $this->config->getMemberIdentifierValue();
+        }
+
+        $customAttributes = [];
+        $customStoreIdKey = $this->config->getCustomMemberStoreId();
+        $customStoreCodeKey = $this->config->getCustomMemberStoreCode();
+        $customStoreCurrencyKey = $this->config->getCustomMemberStoreCurrency();
+        if ($customStoreIdKey) {
+            $customAttributes[$customStoreIdKey] = $this->_storeManager->getGroup()->getId();
+        }
+        if ($customStoreCodeKey) {
+            $customAttributes[$customStoreCodeKey] = $this->_storeManager->getGroup()->getCode();
+        }
+        if ($customStoreCurrencyKey) {
+            $customAttributes[$customStoreCurrencyKey] = $this->config->getStoreCurrencyCode();
+        }
+
+        $payload = [
+            'member_id'          => $memberIdentifierValue,
+            'sub'                => $apiKeyIdentifier,
+            'email_address'      => $customerEmail,
+            'first_name'         => $customerFirstName,
+            'last_name'          => $customerLastName,
+            'phone_number'       => $telephone
+                ? (preg_match('/^\+[0-9]{2}-[0-9]{10}+$/', $telephone) ? $telephone : "")
+                : "",
+            'birthdate'          => $customerBirthDate,
+            'preferred_language' => $lang,
+            'address'            => [
+                'line1'       => $street[0] ?? "",
+                'line2'       => $street[1] ?? ($street[0] ?? ""),
+                'city'        => $city,
+                'state'       => $region,
+                'country'     => $country,
+                'postal_code' => $postcode,
+            ],
+            'custom_attributes'  => $customAttributes,
+            'exp'                => round(microtime(true) * 1000),
+        ];
+
+        $token = $this->jwt->encode($payload, $key, 'HS256');
+
+        if ($memberIdentifierValue) {
+            $this->config->setCookie($token);
+        }
+
+        return $token;
+    }
+
+    /**
+     * Get Country Name
+     *
+     * @param string $countryCode
+     * @return string
+     */
+    private function getCountryName(string $countryCode): string
+    {
+        return $this->countryFactory->create()->loadByCode($countryCode)->getName();
+    }
 }
diff --git a/Block/Sales/CreditMemo/Discount.php b/Block/Sales/CreditMemo/Discount.php
index 6464274..301319f 100755
--- a/Block/Sales/CreditMemo/Discount.php
+++ b/Block/Sales/CreditMemo/Discount.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\CreditMemo;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\CreditMemo;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -103,7 +103,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Sales/CreditMemoPrint/Discount.php b/Block/Sales/CreditMemoPrint/Discount.php
index a99265d..53d5529 100755
--- a/Block/Sales/CreditMemoPrint/Discount.php
+++ b/Block/Sales/CreditMemoPrint/Discount.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\CreditMemoPrint;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\CreditMemoPrint;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -117,7 +117,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Sales/Invoice/Discount.php b/Block/Sales/Invoice/Discount.php
index d08376c..8cf8ad3 100755
--- a/Block/Sales/Invoice/Discount.php
+++ b/Block/Sales/Invoice/Discount.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\Invoice;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\Invoice;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -103,7 +103,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Sales/InvoicePrint/Discount.php b/Block/Sales/InvoicePrint/Discount.php
index 8e833a2..b6a978d 100755
--- a/Block/Sales/InvoicePrint/Discount.php
+++ b/Block/Sales/InvoicePrint/Discount.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\InvoicePrint;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\InvoicePrint;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -117,7 +117,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Sales/Order/Discount.php b/Block/Sales/Order/Discount.php
index 69ca1ba..7a8c51c 100755
--- a/Block/Sales/Order/Discount.php
+++ b/Block/Sales/Order/Discount.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\Order;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\Order;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -103,7 +103,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Block/Sales/OrderPrint/Discount.php b/Block/Sales/OrderPrint/Discount.php
index cecd7f3..a86c854 100755
--- a/Block/Sales/OrderPrint/Discount.php
+++ b/Block/Sales/OrderPrint/Discount.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Block\Sales\OrderPrint;
+namespace TrueLoyal\LoyaltyRewards\Block\Sales\OrderPrint;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Discount extends Template
 {
@@ -103,7 +103,7 @@ public function initTotals()
             $this->getParentBlock()->addTotal(
                 new DataObject(
                     [
-                        'code' => 'zinrelo_discount',
+                        'code' => 'trueloyal_discount',
                         'strong' => $this->getStrong(),
                         'value' => $totalAmount["value"],
                         'base_value' => $totalAmount["value"],
diff --git a/Controller/LoyaltyRewards/ApplyPoint.php b/Controller/LoyaltyRewards/ApplyPoint.php
index 7ba2566..022ea81 100755
--- a/Controller/LoyaltyRewards/ApplyPoint.php
+++ b/Controller/LoyaltyRewards/ApplyPoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Controller\LoyaltyRewards;
+namespace TrueLoyal\LoyaltyRewards\Controller\LoyaltyRewards;
 
 use Exception;
 use Magento\Customer\Model\Session;
@@ -14,14 +14,14 @@
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Quote\Model\Quote;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Checkout\Model\Cart;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Zinrelo\LoyaltyRewards\Logger\Logger;
-use Zinrelo\LoyaltyRewards\Model\ZinreloQuote;
+use TrueLoyal\LoyaltyRewards\Logger\Logger;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalQuote;
 
 class ApplyPoint implements HttpPostActionInterface
 {
@@ -124,9 +124,9 @@ public function execute()
     {
         $redeemReward = $this->request->getPost('redeem_reward');
         $quote = $this->checkoutSession->getQuote();
-        /*Managed Set zinrelo quote related to Data to custom table*/
+        /*Managed Set trueloyal quote related to Data to custom table*/
         $this->helper->setAbandonedCartSent($quote->getId(), 2);
-        $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($quote->getId());
+        $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($quote->getId());
         /*End*/
         $resultJson = $this->jsonFactory->create();
         $this->cart->setUpdatedAt()->save();
@@ -143,8 +143,8 @@ public function execute()
         $rewardRules = $this->helper->getRedeemRules();
         if (!empty($rewardRules)) {
             try {
-                $zinreloQuote->setRewardRulesData($this->helper->jsonSerialize($rewardRules));
-                $zinreloQuote->save();
+                $trueloyalQuote->setRewardRulesData($this->helper->jsonSerialize($rewardRules));
+                $trueloyalQuote->save();
             } catch (Exception $e) {
                 $this->logger->critical($e->getMessage());
             }
@@ -154,7 +154,7 @@ public function execute()
             $productId = $rewardData["product_id"];
             $product = $this->product->load($productId);
             if (!$product->getEntityId() || $product->getStatus() != Status::STATUS_ENABLED) {
-                $this->unsetRewardRules($zinreloQuote);
+                $this->unsetRewardRules($trueloyalQuote);
                 $this->messageManager->addError(__("Product that you are trying to add is not available."));
                 return $resultJson->setData([
                     'success' => false
@@ -170,7 +170,7 @@ public function execute()
                 $redeemPoints = min($subTotal*$conversion_rate, max($rewardData['minimum_redemption_limit'], min($redeemPoints, $rewardData['maximum_redemption_limit'])));
             }
             else {
-                $this->unsetRewardRules($zinreloQuote);
+                $this->unsetRewardRules($trueloyalQuote);
                 $this->messageManager->addError(__("Please enter the correct number of points to be redeemed."));
                 return $resultJson->setData([
                     'success' => false
@@ -178,21 +178,21 @@ public function execute()
             }
             $rewardData["points_to_be_redeemed"] = $redeemPoints;
             $rewardRules[$redeemReward]['points_to_be_redeemed'] = $redeemPoints;
-            $zinreloQuote->setRewardRulesData($this->helper->jsonSerialize($rewardRules));
-            $zinreloQuote->save();
+            $trueloyalQuote->setRewardRulesData($this->helper->jsonSerialize($rewardRules));
+            $trueloyalQuote->save();
         }
         $response = $this->getApiResponse($rewardData);
 
         if ($response["success"] && !empty($response["result"]["data"])) {
             $responseData = $response["result"]["data"];
             if ($responseData["status"] === "pending") {
-                $this->saveQuoteData($zinreloQuote, $responseData, $redeemReward, $rewardData);
+                $this->saveQuoteData($trueloyalQuote, $responseData, $redeemReward, $rewardData);
                 $this->messageManager->addSuccess(__('You have redeemed %1 successfully.', $rewardData['reward_name']));
                 return $resultJson->setData([
                     'success' => true
                 ]);
             } else {
-                $this->unsetRewardRules($zinreloQuote);
+                $this->unsetRewardRules($trueloyalQuote);
                 $this->messageManager->addError(
                     __("This reward rule can not be redeemed, try with another reward rule")
                 );
@@ -201,7 +201,7 @@ public function execute()
                 ]);
             }
         } else {
-            $this->unsetRewardRules($zinreloQuote);
+            $this->unsetRewardRules($trueloyalQuote);
             $this->messageManager->addError(__("This reward rule can not be redeemed, try with another reward rule"));
             return $resultJson->setData([
                 'success' => false
@@ -212,13 +212,13 @@ public function execute()
     /**
      * Delete reward relus from quote when getting error from response
      *
-     * @param ZinreloQuote $zinreloQuote
+     * @param TrueLoyalQuote $trueloyalQuote
      */
-    public function unsetRewardRules($zinreloQuote)
+    public function unsetRewardRules($trueloyalQuote)
     {
         try {
-            $zinreloQuote->setRewardRulesData('');
-            $zinreloQuote->save();
+            $trueloyalQuote->setRewardRulesData('');
+            $trueloyalQuote->save();
         } catch (Exception $e) {
             $this->logger->critical($e->getMessage());
         }
@@ -246,9 +246,8 @@ public function getApiResponse($rewardData)
      */
     public function getParamsData($rewardData)
     {
-        $customerEmail = $this->customerSession->getCustomer()->getEmail();
         $params = [
-            "member_id" => $customerEmail,
+            "member_id" => $this->helper->getMemberIdentifierValue(),
             "reward_id" => $rewardData["reward_id"],
             "transaction_attributes" => [
                 "reason" => "redeem",
@@ -270,23 +269,23 @@ public function getParamsData($rewardData)
     /**
      * Save Quote Data
      *
-     * @param ZinreloQuote $zinreloQuote
+     * @param TrueLoyalQuote $trueloyalQuote
      * @param mixed $responseData
      * @param mixed $redeemReward
      * @param mixed $rewardData
      */
-    public function saveQuoteData($zinreloQuote, $responseData, $redeemReward, $rewardData)
+    public function saveQuoteData($trueloyalQuote, $responseData, $redeemReward, $rewardData)
     {
         try {
             if ($rewardData["rule"] === "product_redemption" && !empty($rewardData["product_id"])) {
                 $this->addToCartProductWithNewPrice($rewardData);
             }
-            $allRewardRules = $this->helper->json->unserialize($zinreloQuote->getRewardRulesData());
+            $allRewardRules = $this->helper->json->unserialize($trueloyalQuote->getRewardRulesData());
             $allRewardRules[$responseData["reward_info"]["reward_id"]]["id"] = $responseData["id"];
             $encodedRule = $this->helper->json->serialize($allRewardRules);
-            $zinreloQuote->setRewardRulesData($encodedRule);
-            $zinreloQuote->setRedeemRewardDiscount($redeemReward);
-            $zinreloQuote->save();
+            $trueloyalQuote->setRewardRulesData($encodedRule);
+            $trueloyalQuote->setRedeemRewardDiscount($redeemReward);
+            $trueloyalQuote->save();
         } catch (Exception $e) {
             $this->logger->critical($e->getMessage());
         }
@@ -315,12 +314,12 @@ public function addToCartProductWithNewPrice($rewardData)
             $product->addCustomOption('additional_options', $this->serializer->serialize($additionalOptions));
             $this->cart->addProduct($product, $params);
             $this->cart->save();
-            /*Set free product to Zinrelo quote item*/
+            /*Set free product to TrueLoyal quote item*/
             $quoteItemCollection = $this->cart->getItems();
             foreach ($quoteItemCollection as $item) {
                 if($item->getProductId() == $productId && $item->getPrice() == 0) {
-                    $zinreloQuoteItem = $this->helper->getZinreloQuoteItemByItemId($item->getId());
-                    $zinreloQuoteItem->setIsZinreloFreeProduct(1)->setQuoteItemId($item->getId())->save();
+                    $trueloyalQuoteItem = $this->helper->getTrueLoyalQuoteItemByItemId($item->getId());
+                    $trueloyalQuoteItem->setIsTrueLoyalFreeProduct(1)->setQuoteItemId($item->getId())->save();
                     break;
                 }
             }
diff --git a/Controller/LoyaltyRewards/Index.php b/Controller/LoyaltyRewards/Index.php
index 056ebbd..c2b91f5 100755
--- a/Controller/LoyaltyRewards/Index.php
+++ b/Controller/LoyaltyRewards/Index.php
@@ -1,6 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Controller\LoyaltyRewards;
+/**
+ * This controller is used no more. The JWT token generation was moved to Block/Dashboard.php
+ */
+
+namespace TrueLoyal\LoyaltyRewards\Controller\LoyaltyRewards;
 
 use Firebase\JWT\JWT;
 use Magento\Customer\Model\CustomerFactory;
@@ -14,7 +18,7 @@
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Result\Layout;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class Index implements HttpPostActionInterface
 {
@@ -118,7 +122,10 @@ public function execute()
 
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $jsonConfigLanguage = $this->helper->getConfigLanguage();
-        if ($jsonConfigLanguage) {
+        $preferredLanguage = $this->helper->getPreferredLanguage();
+        if ($preferredLanguage) {
+            $lang = $preferredLanguage;
+        } elseif ($jsonConfigLanguage) {
             $lang = $this->store->getLocale() ?? "";
             $configLanguage = $this->serializer->unserialize($jsonConfigLanguage);
             $config = stristr($lang, "_", true);
@@ -132,8 +139,8 @@ public function execute()
         if ($customerId && !$this->helper->isAutoEnrollmentEnabled() ) {
             $customerData = $this->customerRepository->getById($customerId);
             $opt_in_attribute = $this->helper->getOptInAttributeCode();
-            $zinreloOptedIn = $customerData->getCustomAttribute($opt_in_attribute);
-            if (!$zinreloOptedIn || !$zinreloOptedIn->getValue()) {
+            $trueloyalOptedIn = $customerData->getCustomAttribute($opt_in_attribute);
+            if (!$trueloyalOptedIn || !$trueloyalOptedIn->getValue()) {
                 return $resultJson->setData([]);
             }
         }
@@ -152,10 +159,21 @@ public function execute()
             $postcode = $billingAddress['postcode'] ?? "";
             $street = isset($billingAddress['street']) ? explode("\n", $billingAddress['street']) : [];
             $country = isset($billingAddress['country_id']) ? $this->getCountryName($billingAddress['country_id']) : "";
+            $storeId = (string)$customer->getStoreId();
+            $storeCurrency = $this->helper->getStoreCurrencyCode();
+            $memberIdentifierValue = $this->helper->getMemberIdentifierValue();
+        }
+        $customAttributes = [];
+        $customStoreIdKey = $this->helper->getCustomMemberStoreId();
+        $customStoreCurrencyKey = $this->helper->getCustomMemberStoreCurrency();
+        if ($customStoreIdKey) {
+            $customAttributes[$customStoreIdKey] = $storeId ?? '';
+        }
+        if ($customStoreCurrencyKey) {
+            $customAttributes[$customStoreCurrencyKey] = $storeCurrency ?? '';
         }
-
         $payload = [
-            'member_id' => $customerEmail,
+            'member_id' => $memberIdentifierValue ?? '',
             'sub' => $apiKeyIdentifier,
             'email_address' => $customerEmail,
             'first_name' => $customerFirstName,
@@ -171,11 +189,12 @@ public function execute()
                 'country' => $country,
                 'postal_code' => $postcode,
             ],
+            'custom_attributes' => $customAttributes,
             'exp' => round(microtime(true) * 1000)
         ];
 
         $data = $this->jwt->encode($payload, $key, 'HS256');
-        if ($customerEmail) {
+        if ($memberIdentifierValue ?? false) {
             $this->helper->setCookie($data);
             $isSetCookies = true;
         }
diff --git a/Cron/RejectRedeemReward.php b/Cron/RejectRedeemReward.php
index 9ef0310..e4c16a2 100755
--- a/Cron/RejectRedeemReward.php
+++ b/Cron/RejectRedeemReward.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Cron;
+namespace TrueLoyal\LoyaltyRewards\Cron;
 
 use Exception;
 use Magento\Framework\Data\Collection\AbstractDb;
@@ -9,8 +9,8 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
-use Zinrelo\LoyaltyRewards\Logger\Logger;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Logger\Logger;
 
 class RejectRedeemReward
 {
@@ -33,7 +33,7 @@ class RejectRedeemReward
     /**
      * @var Logger
      */
-    private $zinreloLogger;
+    private $trueloyalLogger;
     /**
      * @var AbandonedCartTime
      */
@@ -45,22 +45,22 @@ class RejectRedeemReward
      * @param QuoteFactory $quoteFactory
      * @param Data $helper
      * @param TimezoneInterface $timezoneInterface
-     * @param Logger $zinreloLogger
+     * @param Logger $trueloyalLogger
      */
     public function __construct(
         QuoteFactory $quoteFactory,
         Data $helper,
         TimezoneInterface $timezoneInterface,
-        Logger $zinreloLogger
+        Logger $trueloyalLogger
     ) {
         $this->quoteFactory = $quoteFactory;
         $this->helper = $helper;
         $this->timezoneInterface = $timezoneInterface;
-        $this->zinreloLogger = $zinreloLogger;
+        $this->trueloyalLogger = $trueloyalLogger;
     }
 
     /**
-     * Send abandoned cart request to Zinrelo and Reject redeemed point
+     * Send abandoned cart request to TrueLoyal and Reject redeemed point
      *
      * @return void
      */
@@ -84,8 +84,8 @@ public function execute()
                     if (strtotime($currentTime) >= strtotime($rewardAppliedTime) && $item->getItemsCount()) {
                         /* Send reject reward request to Live API
                         We have to request event customer Quote wise so need to send an API one by one.*/
-                        $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($item->getId());
-                        if ($zinreloQuote->getRedeemRewardDiscount()) {
+                        $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($item->getId());
+                        if ($trueloyalQuote->getRedeemRewardDiscount()) {
                             $this->helper->sendRejectRewardRequest($item);
                         }
                         /*Send Cart abandonment request custom event API*/
@@ -110,12 +110,15 @@ public function execute()
                             $qItem = $this->helper->setFormatedPrice($qItem);
                             $quoteData["items"][] = $qItem;
                         }
-                        $memberId = $item->getCustomer() ? $item->getCustomer()->getEmail() : "";
-                        $this->sendToZinrelo($memberId, $quoteData, $url, $quoteObj);
+                        $memberId = $this->helper->getMemberIdentifierValueById(
+                            $item->getCustomerId(),
+                            $item->getCustomer() ? $item->getCustomer()->getEmail() : ""
+                        );
+                        $this->sendToTrueLoyal($memberId, $quoteData, $url, $quoteObj);
                     }
                 }
             } catch (Exception $e) {
-                $this->zinreloLogger->addErrorLog($e->getMessage());
+                $this->trueloyalLogger->addErrorLog($e->getMessage());
             }
         }
     }
@@ -128,12 +131,12 @@ public function execute()
     public function getQuoteCollections()
     {
         try {
-            $zinreloQuote = $this->helper->zinreloQuoteFactory->create()
+            $trueloyalQuote = $this->helper->trueloyalQuoteFactory->create()
                 ->getCollection()
                 ->addFieldToSelect(['quote_id'])
                 ->addFieldToFilter('is_abandoned_cart_sent', ['eq' => '2']);
             $quoteIds = [];
-            foreach ($zinreloQuote as $quote) {
+            foreach ($trueloyalQuote as $quote) {
                 $quoteIds[] = $quote->getQuoteId();
             }
             $quote = $this->quoteFactory->create()
@@ -148,7 +151,7 @@ public function getQuoteCollections()
             $quote->getSelect()->limit(self::COLLECTION_LIMIT);
             return $quote;
         } catch (Exception $e) {
-            $this->zinreloLogger->addErrorLog($e->getMessage());
+            $this->trueloyalLogger->addErrorLog($e->getMessage());
         }
     }
 
@@ -168,14 +171,14 @@ public function calculateTimeInterval($quoteTime, $currentTimeZone)
     }
 
     /**
-     * Send To Zinrelo
+     * Send To TrueLoyal
      *
      * @param mixed $memberId
      * @param mixed $quoteData
      * @param mixed $url
      * @param mixed $object
      */
-    public function sendToZinrelo($memberId, $quoteData, $url, $object)
+    public function sendToTrueLoyal($memberId, $quoteData, $url, $object)
     {
         try {
             $params = [
@@ -186,11 +189,11 @@ public function sendToZinrelo($memberId, $quoteData, $url, $object)
             $params = $this->helper->json->serialize($params);
             /*We have to request event customer Quote wise so need to send an API one by one.*/
             $this->helper->request($url, $params, "post");
-            $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($object->getId());
-            $zinreloQuote->setIsAbandonedCartSent(1);
-            $zinreloQuote->save();
+            $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($object->getId());
+            $trueloyalQuote->setIsAbandonedCartSent(1);
+            $trueloyalQuote->save();
         } catch (Exception $e) {
-            $this->zinreloLogger->addErrorLog($e->getMessage());
+            $this->trueloyalLogger->addErrorLog($e->getMessage());
         }
     }
 }
diff --git a/Framework/HTTP/Client/Curl.php b/Framework/HTTP/Client/Curl.php
index e8edfef..4627e2c 100755
--- a/Framework/HTTP/Client/Curl.php
+++ b/Framework/HTTP/Client/Curl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Framework\HTTP\Client;
+namespace TrueLoyal\LoyaltyRewards\Framework\HTTP\Client;
 
 use Magento\Framework\HTTP\Client\Curl as MainCurl;
 
diff --git a/Helper/Config.php b/Helper/Config.php
index ab513f1..269850d 100644
--- a/Helper/Config.php
+++ b/Helper/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Helper;
+namespace TrueLoyal\LoyaltyRewards\Helper;
 
 use Exception;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
@@ -37,37 +37,43 @@
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\Session\SessionManagerInterface;
-use Zinrelo\LoyaltyRewards\Logger\Logger as ZinreloLogger;
-use Zinrelo\LoyaltyRewards\Model\ZinreloEavAttributeFactory;
-use Zinrelo\LoyaltyRewards\Model\ZinreloQuoteFactory;
-use Zinrelo\LoyaltyRewards\Model\ZinreloQuoteItemFactory;
-use Zinrelo\LoyaltyRewards\Model\ZinreloReviewFactory;
-use Zinrelo\LoyaltyRewards\Model\ZinreloSalesOrderFactory;
+use TrueLoyal\LoyaltyRewards\Logger\Logger as TrueLoyalLogger;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalEavAttributeFactory;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalQuoteFactory;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalQuoteItemFactory;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalReviewFactory;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalSalesOrderFactory;
 
 class Config extends AbstractHelper
 {
-    public const XML_PATH_LOYALTY_REWARDS_ACTIVE = "zinrelo_loyaltyRewards/settings/loyalty_rewards_active";
-    public const XML_PATH_DASHBOARD_HIDDEN_FOR_GUESTS = "zinrelo_loyaltyRewards/settings/hide_for_guests";
-    public const XML_PATH_WEB_HOOK_URL = "zinrelo_loyaltyRewards/settings/web_hook_url";
-    public const XML_PATH_WEBHOOK_INTEGRATION_ID = 'zinrelo_loyaltyRewards/settings/webhook_integration_id';
-    public const XML_PATH_WEBHOOK_INTEGRATION_URL = 'zinrelo_loyaltyRewards/settings/webhook_integration_url';
-    public const XML_PATH_LIVE_WEB_HOOK_URL = "zinrelo_loyaltyRewards/settings/live_web_hook_url";
-    public const XML_PATH_ABANDONED_CART_TIME = "zinrelo_loyaltyRewards/settings/abandoned_cart_time";
-    public const XML_PATH_PARTNER_ID = "zinrelo_loyaltyRewards/settings/partner_id";
-    public const XML_PATH_API_KEY = "zinrelo_loyaltyRewards/settings/api_key";
-    public const XML_PATH_API_KEY_IDENTIFIER = "zinrelo_loyaltyRewards/settings/api_key_identifier";
-    public const XML_PATH_REWARD_EVENTS = "zinrelo_loyaltyRewards/settings/reward_events";
-    public const XML_PATH_REWARDS_DROPDOWN_ACTIVE = "zinrelo_loyaltyRewards/settings/rewards_event_drop_down_active";
-    public const XML_PATH_REWARDS_POINTS_AT_PDP = "zinrelo_loyaltyRewards/settings/product_page_rewards_point_enable";
-    public const XML_PATH_FREE_SHIPPING_LABEL = "zinrelo_loyaltyRewards/settings/free_shipping_label";
-    public const XML_PATH_PRODUCT_PAGE_REWARD_LABEL = "zinrelo_loyaltyRewards/settings/product_page_reward_label";
-    public const XML_PATH_PDP_CART_PAGE = "zinrelo_loyaltyRewards/settings/cart_page_rewards_point_enable";
-    public const XML_PATH_PDP_CART_PAGE_REWARD_LABEL = "zinrelo_loyaltyRewards/settings/cart_page_reward_label";
+    public const XML_PATH_LOYALTY_REWARDS_ACTIVE = "trueloyal_loyaltyRewards/settings/loyalty_rewards_active";
+    public const XML_PATH_DASHBOARD_HIDDEN_FOR_GUESTS = "trueloyal_loyaltyRewards/settings/hide_for_guests";
+    public const XML_PATH_WEB_HOOK_URL = "trueloyal_loyaltyRewards/settings/web_hook_url";
+    public const XML_PATH_WEBHOOK_INTEGRATION_ID = 'trueloyal_loyaltyRewards/settings/webhook_integration_id';
+    public const XML_PATH_WEBHOOK_INTEGRATION_URL = 'trueloyal_loyaltyRewards/settings/webhook_integration_url';
+    public const XML_PATH_LIVE_WEB_HOOK_URL = "trueloyal_loyaltyRewards/settings/live_web_hook_url";
+    public const XML_PATH_ABANDONED_CART_TIME = "trueloyal_loyaltyRewards/settings/abandoned_cart_time";
+    public const XML_PATH_PARTNER_ID = "trueloyal_loyaltyRewards/settings/partner_id";
+    public const XML_PATH_API_KEY = "trueloyal_loyaltyRewards/settings/api_key";
+    public const XML_PATH_API_KEY_IDENTIFIER = "trueloyal_loyaltyRewards/settings/api_key_identifier";
+    public const XML_PATH_REWARD_EVENTS = "trueloyal_loyaltyRewards/settings/reward_events";
+    public const XML_PATH_REWARDS_DROPDOWN_ACTIVE = "trueloyal_loyaltyRewards/settings/rewards_event_drop_down_active";
+    public const XML_PATH_REWARDS_POINTS_AT_PDP = "trueloyal_loyaltyRewards/settings/product_page_rewards_point_enable";
+    public const XML_PATH_FREE_SHIPPING_LABEL = "trueloyal_loyaltyRewards/settings/free_shipping_label";
+    public const XML_PATH_PRODUCT_PAGE_REWARD_LABEL = "trueloyal_loyaltyRewards/settings/product_page_reward_label";
+    public const XML_PATH_PDP_CART_PAGE = "trueloyal_loyaltyRewards/settings/cart_page_rewards_point_enable";
+    public const XML_PATH_PDP_CART_PAGE_REWARD_LABEL = "trueloyal_loyaltyRewards/settings/cart_page_reward_label";
     public const XML_PATH_CART_PAGE_REWARD_DROPDOWN_LABEL =
-        "zinrelo_loyaltyRewards/settings/cart_page_reward_dropdown_label";
-    public const XML_PATH_LANGUAGES = 'zinrelo_loyaltyRewards/settings/languages_mapping';
-    public const XML_PATH_AUTO_ENROLLMENT = 'zinrelo_loyaltyRewards/settings/auto_enrollment';
-    public const XML_PATH_OPT_IN_FIELD_NAME = 'zinrelo_loyaltyRewards/settings/opt_in_field_name';
+        "trueloyal_loyaltyRewards/settings/cart_page_reward_dropdown_label";
+    public const XML_PATH_LANGUAGES = 'trueloyal_loyaltyRewards/settings/languages_mapping';
+    public const XML_PATH_AUTO_ENROLLMENT = 'trueloyal_loyaltyRewards/settings/auto_enrollment';
+    public const XML_PATH_OPT_IN_FIELD_NAME = 'trueloyal_loyaltyRewards/settings/opt_in_field_name';
+    public const XML_PATH_MEMBER_IDENTIFIER_PREFIX = 'trueloyal_loyaltyRewards/settings/member_identifier_prefix';
+    public const XML_PATH_MEMBER_IDENTIFIER = 'trueloyal_loyaltyRewards/settings/member_identifier';
+    public const XML_PATH_CUSTOM_MEMBER_STORE_CODE = 'trueloyal_loyaltyRewards/settings/custom_member_attributes/store_code';
+    public const XML_PATH_CUSTOM_MEMBER_STORE_ID = 'trueloyal_loyaltyRewards/settings/custom_member_attributes/store_id';
+    public const XML_PATH_CUSTOM_MEMBER_STORE_CURRENCY = 'trueloyal_loyaltyRewards/settings/custom_member_attributes/store_currency';
+    public const XML_PATH_PREFERRED_LANGUAGE = 'trueloyal_loyaltyRewards/settings/preferred_language';
 
     /**
      * Cookie life time
@@ -76,14 +82,14 @@ class Config extends AbstractHelper
     /**
      * Name of Cookie that holds private content version
      */
-    public const COOKIE_NAME = 'zinrelo';
+    public const COOKIE_NAME = 'trueloyal';
 
     /**
      * @var Json
      */
     public $json;
     /**
-     * @var ZinreloLogger
+     * @var TrueLoyalLogger
      */
     public $logger;
     /**
@@ -171,25 +177,25 @@ class Config extends AbstractHelper
      */
     private $sessionManager;
     /**
-     * @var ZinreloEavAttributeFactory
+     * @var TrueLoyalEavAttributeFactory
      */
-    public $zinreloEavAttributeFactory;
+    public $trueloyalEavAttributeFactory;
     /**
-     * @var ZinreloQuoteFactory
+     * @var TrueLoyalQuoteFactory
      */
-    public $zinreloQuoteFactory;
+    public $trueloyalQuoteFactory;
     /**
-     * @var ZinreloQuoteItemFactory
+     * @var TrueLoyalQuoteItemFactory
      */
-    public $zinreloQuoteItemFactory;
+    public $trueloyalQuoteItemFactory;
     /**
-     * @var ZinreloReviewFactory
+     * @var TrueLoyalReviewFactory
      */
-    public $zinreloReviewFactory;
+    public $trueloyalReviewFactory;
     /**
-     * @var ZinreloSalesOrderFactory
+     * @var TrueLoyalSalesOrderFactory
      */
-    public $zinreloSalesOrderFactory;
+    public $trueloyalSalesOrderFactory;
     /**
      * @var Attribute
      */
@@ -199,7 +205,7 @@ class Config extends AbstractHelper
      * Data constructor.
      *
      * @param Context $context
-     * @param ZinreloLogger $logger
+     * @param TrueLoyalLogger $logger
      * @param Curl $curl
      * @param RequestInterface $request
      * @param ProductCategoryList $productCategory
@@ -221,16 +227,16 @@ class Config extends AbstractHelper
      * @param CookieManagerInterface $cookieManager
      * @param CookieMetadataFactory $cookieMetadataFactory
      * @param SessionManagerInterface $sessionManager
-     * @param ZinreloEavAttributeFactory $zinreloEavAttributeFactory
-     * @param ZinreloQuoteFactory $zinreloQuoteFactory
-     * @param ZinreloQuoteItemFactory $zinreloQuoteItemFactory
-     * @param ZinreloReviewFactory $zinreloReviewFactory
-     * @param ZinreloSalesOrderFactory $zinreloSalesOrderFactory
+     * @param TrueLoyalEavAttributeFactory $trueloyalEavAttributeFactory
+     * @param TrueLoyalQuoteFactory $trueloyalQuoteFactory
+     * @param TrueLoyalQuoteItemFactory $trueloyalQuoteItemFactory
+     * @param TrueLoyalReviewFactory $trueloyalReviewFactory
+     * @param TrueLoyalSalesOrderFactory $trueloyalSalesOrderFactory
      * @param Attribute $eavAttribute
      */
     public function __construct(
         Context $context,
-        ZinreloLogger $logger,
+        TrueLoyalLogger $logger,
         Curl $curl,
         RequestInterface $request,
         ProductCategoryList $productCategory,
@@ -253,11 +259,11 @@ public function __construct(
         CookieMetadataFactory $cookieMetadataFactory,
         SessionManagerInterface $sessionManager,
         CartRepositoryInterface $quoteRepository,
-        ZinreloEavAttributeFactory $zinreloEavAttributeFactory,
-        ZinreloQuoteFactory $zinreloQuoteFactory,
-        ZinreloQuoteItemFactory $zinreloQuoteItemFactory,
-        ZinreloReviewFactory $zinreloReviewFactory,
-        ZinreloSalesOrderFactory $zinreloSalesOrderFactory,
+        TrueLoyalEavAttributeFactory $trueloyalEavAttributeFactory,
+        TrueLoyalQuoteFactory $trueloyalQuoteFactory,
+        TrueLoyalQuoteItemFactory $trueloyalQuoteItemFactory,
+        TrueLoyalReviewFactory $trueloyalReviewFactory,
+        TrueLoyalSalesOrderFactory $trueloyalSalesOrderFactory,
         Attribute $eavAttribute
     ) {
         $this->curl = $curl;
@@ -282,11 +288,11 @@ public function __construct(
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->sessionManager = $sessionManager;
-        $this->zinreloEavAttributeFactory = $zinreloEavAttributeFactory;
-        $this->zinreloQuoteFactory = $zinreloQuoteFactory;
-        $this->zinreloQuoteItemFactory = $zinreloQuoteItemFactory;
-        $this->zinreloReviewFactory = $zinreloReviewFactory;
-        $this->zinreloSalesOrderFactory = $zinreloSalesOrderFactory;
+        $this->trueloyalEavAttributeFactory = $trueloyalEavAttributeFactory;
+        $this->trueloyalQuoteFactory = $trueloyalQuoteFactory;
+        $this->trueloyalQuoteItemFactory = $trueloyalQuoteItemFactory;
+        $this->trueloyalReviewFactory = $trueloyalReviewFactory;
+        $this->trueloyalSalesOrderFactory = $trueloyalSalesOrderFactory;
         $this->quoteRepository = $quoteRepository;
         $this->eavAttribute = $eavAttribute;
         parent::__construct($context);
@@ -302,6 +308,11 @@ public function getConfigLanguage()
         return $this->getConfig(self::XML_PATH_LANGUAGES);
     }
 
+    public function getPreferredLanguage(): string
+    {
+        return $this->getConfig(self::XML_PATH_PREFERRED_LANGUAGE) ?? '';
+    }
+
     /**
      * Get Config
      *
@@ -332,7 +343,7 @@ public function saveConfig($config_path, $config_value)
     }
     
     /**
-     * Web Hook Url, which is received from Zinrelo to sent API resquest
+     * Web Hook Url, which is received from TrueLoyal to sent API resquest
      *
      * @return mixed
      */
@@ -499,8 +510,8 @@ public function isModuleEnabled()
             if(!$this->isAutoEnrollmentEnabled()) {
                 $customerId = $this->customerSession->create()->getCustomerId();
                 if ($customerId) {
-                    $zinreloOptedIn = $this->getOptInCustomAttributeValue($customerId);
-                    if (!$zinreloOptedIn) {
+                    $trueloyalOptedIn = $this->getOptInCustomAttributeValue($customerId);
+                    if (!$trueloyalOptedIn) {
                         return false;
                     }
                 }
@@ -550,8 +561,8 @@ public function isRewardPointAtPdpEnabled()
         $isModuleEnable = $this->isModuleEnabled();
         $isRewardPointAtPdpEnabled = $this->getConfig(self::XML_PATH_REWARDS_POINTS_AT_PDP) ?? false;
         $isDashboardHiddenForGuests = $this->isDashboardHiddenForGuests();
-        if($isDashboardHiddenForGuests && !$this->getCustomerEmailBySession()) { 
-            return false; 
+        if($isDashboardHiddenForGuests && !$this->getMemberIdentifierValue()) {
+            return false;
         }
         return ($isRewardPointAtPdpEnabled && $isModuleEnable) ?? false;
     }
@@ -576,7 +587,7 @@ public function isPDPAtCartEnabled()
         $isModuleEnable = $this->isModuleEnabled();
         $isRewardPointAtCartEnabled = $this->getConfig(self::XML_PATH_PDP_CART_PAGE) ?? false;
         $isDashboardHiddenForGuests = $this->isDashboardHiddenForGuests();
-        if($isDashboardHiddenForGuests && !$this->getCustomerEmailBySession()) {
+        if($isDashboardHiddenForGuests && !$this->getMemberIdentifierValue()) {
             return false;
         }
         return ($isRewardPointAtCartEnabled && $isModuleEnable) ?? false;
@@ -666,14 +677,14 @@ public function getRewardAppliedRuleLabel($quote): string
      */
     public function getRewardRulesData($quote, $ruleId = "")
     {
-        $zinreloQuote = $this->getZinreloQuoteByQuoteId($quote->getId());
-        if ($ruleId == "" && $zinreloQuote) {
-            $ruleId = !$zinreloQuote->isEmpty() ? $zinreloQuote->getRedeemRewardDiscount() : '';
+        $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($quote->getId());
+        if ($ruleId == "" && $trueloyalQuote) {
+            $ruleId = !$trueloyalQuote->isEmpty() ? $trueloyalQuote->getRedeemRewardDiscount() : '';
         }
 
-        if (!$zinreloQuote->isEmpty()) {
-            if ($zinreloQuote->getRewardRulesData()) {
-                $rewardRules = $this->json->unserialize($zinreloQuote->getRewardRulesData());
+        if (!$trueloyalQuote->isEmpty()) {
+            if ($trueloyalQuote->getRewardRulesData()) {
+                $rewardRules = $this->json->unserialize($trueloyalQuote->getRewardRulesData());
                 return $rewardRules[$ruleId] ?? [];
             }
         }
@@ -687,8 +698,8 @@ public function getRewardRulesData($quote, $ruleId = "")
      */
     public function getRedeemRules()
     {
-        $customerEmail = $this->getCustomerEmailBySession();
-        $url = $this->getLiveWebHookUrl() . "members/" . $customerEmail . "/rewards";
+        $memberId = $this->getMemberIdentifierValue();
+        $url = $this->getLiveWebHookUrl() . "members/" . $memberId . "/rewards";
         $url = $this->getIdParam($url);
         $response = $this->request($url, "", "get", "live_api");
         $rewardRules = [];
@@ -739,6 +750,97 @@ public function getCustomerEmailBySession()
         return $this->customerSession->create()->getCustomer()->getEmail() ?? '';
     }
 
+    /**
+     * Get configured member identifier prefix
+     *
+     * @return string
+     */
+    public function getMemberIdentifierPrefix(): string
+    {
+        return $this->getConfig(self::XML_PATH_MEMBER_IDENTIFIER_PREFIX) ?? '';
+    }
+        
+    /**
+     * Get configured member identifier type ('member_id' or 'member_email')
+     *
+     * @return string
+     */
+    public function getMemberIdentifier(): string
+    {
+        return $this->getConfig(self::XML_PATH_MEMBER_IDENTIFIER) ?? 'member_email';
+    }
+
+    /**
+     * Get Custom Member Attribute: Store ID
+     *
+     * @return string
+     */
+    public function getCustomMemberStoreCode(): string
+    {
+        return $this->getConfig(self::XML_PATH_CUSTOM_MEMBER_STORE_CODE) ?? '';
+    }
+
+    public function getCustomMemberStoreId(): string
+    {
+        return $this->getConfig(self::XML_PATH_CUSTOM_MEMBER_STORE_ID) ?? '';
+    }
+
+    /**
+     * Get Custom Member Attribute: Store Currency
+     *
+     * @return string
+     */
+    public function getCustomMemberStoreCurrency(): string
+    {
+        return $this->getConfig(self::XML_PATH_CUSTOM_MEMBER_STORE_CURRENCY) ?? '';
+    }
+
+    /**
+     * Get current store currency code
+     *
+     * @return string
+     */
+    public function getStoreCurrencyCode(): string
+    {
+        return $this->storeManager->getStore()->getCurrentCurrencyCode() ?? '';
+    }
+
+    /**
+     * Get the member identifier value based on the configured type.
+     * Returns str_pad formatted customer ID for member_id, or customer email for member_email.
+     *
+     * @return string
+     */
+    public function getMemberIdentifierValue(): string
+    {
+        $prefix = $this->getMemberIdentifierPrefix();
+        if ($this->getMemberIdentifier() === 'member_id') {
+            $value = $this->getFormattedMemberId($prefix);
+            return $value ?? '';
+        }
+        $value = $this->getCustomerEmailBySession();
+        return $value ? $prefix . $value : '';
+    }
+
+    /**
+     * Get Formatted Member ID (ID as string with leading zeros)
+     *
+     * @return string
+     */
+    public function getFormattedMemberId($prefix = '')
+    {
+        $customerId = $this->customerSession->create()->getCustomerId();
+        if (!$customerId) {
+            return '';
+        }
+        $customerIdStr = (string)$customerId;
+        if (strlen($prefix) + strlen($customerIdStr) < 3) {
+            $padLength = max(0, 3 - strlen($prefix));
+            return $prefix . str_pad($customerIdStr, $padLength, "0", STR_PAD_LEFT);
+        }
+        return $prefix . $customerIdStr;
+    }
+
     /**
      * Get Customer Custom Attribute Value
      *
@@ -748,9 +850,9 @@ public function getOptInCustomAttributeValue($customerId)
     {
         $customerData = $this->customerRepository->getById($customerId);
         $opt_in_attribute = $this->getOptInAttributeCode();
-        $zinreloOptedIn = $customerData->getCustomAttribute($opt_in_attribute);
-        if ($zinreloOptedIn) {
-            return $zinreloOptedIn->getValue();
+        $trueloyalOptedIn = $customerData->getCustomAttribute($opt_in_attribute);
+        if ($trueloyalOptedIn) {
+            return $trueloyalOptedIn->getValue();
         }
         return null;
     }
@@ -797,7 +899,7 @@ public function getIdParam($url): string
     }
 
     /**
-     * Request to zinrelo for specific event URL
+     * Request to trueloyal for specific event URL
      *
      * @param mixed $url
      * @param mixed $params
@@ -915,8 +1017,8 @@ public function getDefaultRewardTypes(): array
     public function getRewardPoints()
     {
         try {
-            $customerEmail = $this->getCustomerEmailBySession();
-            $url = $this->getLiveWebHookUrl() . "members/" . $customerEmail;
+            $memberId = $this->getMemberIdentifierValue();
+            $url = $this->getLiveWebHookUrl() . "members/" . $memberId;
             $url = $this->getIdParam($url);
             $response = $this->request($url, "", "get", "live_api");
             if ($response) {
@@ -994,86 +1096,86 @@ public function deleteCookie()
         );
     }
 
-    /*Managed to set zinrelo quote, quoteItem, review, sales related data to custom table*/
+    /*Managed to set trueloyal quote, quoteItem, review, sales related data to custom table*/
 
     /**
-     * Get Zinrelo quote specific Data using QuoteId
+     * Get TrueLoyal quote specific Data using QuoteId
      *
      * @param int $quoteId
      */
-    public function getZinreloQuoteByQuoteId($quoteId)
+    public function getTrueLoyalQuoteByQuoteId($quoteId)
     {
-        return $this->zinreloQuoteFactory->create()
+        return $this->trueloyalQuoteFactory->create()
             ->getCollection()
             ->addFieldToFilter('quote_id', $quoteId)
             ->getFirstItem();
     }
 
     /**
-     * Get Zinrelo quote item specific Data using itemId
+     * Get TrueLoyal quote item specific Data using itemId
      *
      * @param int $itemId
      */
-    public function getZinreloQuoteItemByItemId($itemId)
+    public function getTrueLoyalQuoteItemByItemId($itemId)
     {
-        return $this->zinreloQuoteItemFactory->create()
+        return $this->trueloyalQuoteItemFactory->create()
             ->getCollection()
             ->addFieldToFilter('quote_item_id', $itemId)
             ->getFirstItem();
     }
 
     /**
-     * Set zinrelo abandoned cart sent status
+     * Set trueloyal abandoned cart sent status
      *
      * @param int $quoteId
      * @param int $value
      */
     public function setAbandonedCartSent($quoteId, $value)
     {
-        $zinreloQuote = $this->getZinreloQuoteByQuoteId($quoteId);
-        if (!$zinreloQuote->isEmpty()) {
-            $zinreloQuote->setIsAbandonedCartSent($value)->save();
+        $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($quoteId);
+        if (!$trueloyalQuote->isEmpty()) {
+            $trueloyalQuote->setIsAbandonedCartSent($value)->save();
         } else {
-            $zinreloQuote->setIsAbandonedCartSent($value);
-            $zinreloQuote->setQuoteId($quoteId);
-            $zinreloQuote->save();
+            $trueloyalQuote->setIsAbandonedCartSent($value);
+            $trueloyalQuote->setQuoteId($quoteId);
+            $trueloyalQuote->save();
         }
     }
 
     /**
-     * Get Zinrelo Order item specific Data using orderID
+     * Get TrueLoyal Order item specific Data using orderID
      *
      * @param int $orderId
      */
-    public function getZinreloOrderByOrderId($orderId)
+    public function getTrueLoyalOrderByOrderId($orderId)
     {
-        return $this->zinreloSalesOrderFactory->create()
+        return $this->trueloyalSalesOrderFactory->create()
             ->getCollection()
             ->addFieldToFilter('order_id', $orderId)
             ->getFirstItem();
     }
 
     /**
-     * Get Zinrelo product review using reviewId
+     * Get TrueLoyal product review using reviewId
      *
      * @param int $reviewId
      */
-    public function getZinreloReviewByReviewId($reviewId)
+    public function getTrueLoyalReviewByReviewId($reviewId)
     {
-        return $this->zinreloReviewFactory->create()
+        return $this->trueloyalReviewFactory->create()
             ->getCollection()
             ->addFieldToFilter('review_id', $reviewId)
             ->getFirstItem();
     }
 
     /**
-     * Get Zinrelo attribute related data using attribute Id
+     * Get TrueLoyal attribute related data using attribute Id
      *
      * @param int $attributeId
      */
-    public function getZinreloAttributeByAttributeId($attributeId)
+    public function getTrueLoyalAttributeByAttributeId($attributeId)
     {
-        return $this->zinreloEavAttributeFactory->create()
+        return $this->trueloyalEavAttributeFactory->create()
             ->getCollection()
             ->addFieldToFilter('attribute_id', $attributeId)
             ->getFirstItem();
diff --git a/Helper/Data.php b/Helper/Data.php
index 3a792d7..4fa0908 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Helper;
+namespace TrueLoyal\LoyaltyRewards\Helper;
 
 use Magento\Customer\Api\Data\CustomerInterface;
 
 class Data extends Config
 {
     /**
-     * Set zinrelo reward when order from Admin, and get OrderID for Zinrelo
+     * Set trueloyal reward when order from Admin, and get OrderID for TrueLoyal
      *
      * @param mixed $orderId
      * @param bool $isset
@@ -19,9 +19,9 @@ public function getReplacedOrderID($orderId, $isset = true)
         /*This condition only true when $isset passed as false.
         We have passed false when it needed else this condition will not true and order will not nested save*/
         if (!$isset) {
-            $zinreloOrder = $this->getZinreloOrderByOrderId($orderId);
-            $zinreloOrder->setZinreloReward("{}")->setOrderId($orderId);
-            $zinreloOrder->save();
+            $trueloyalOrder = $this->getTrueLoyalOrderByOrderId($orderId);
+            $trueloyalOrder->setTrueLoyalReward("{}")->setOrderId($orderId);
+            $trueloyalOrder->save();
         }
         return $order->getIncrementId();
     }
@@ -37,8 +37,8 @@ public function getRedeemRewardDiscountData($orderId)
         $order = $this->orderRepository->get($orderId);
         $quoteID = $order->getQuoteId();
         $quote = $this->quoteFactory->create()->load($quoteID);
-        $zinreloQuote = $this->getZinreloQuoteByQuoteId($quote->getId());
-        $redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+        $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($quote->getId());
+        $redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
         $rewardData = $this->getRewardRulesData($quote, $redeemReward);
         $discountAmount = "";
         $discountLabel = "";
@@ -63,6 +63,36 @@ public function getRedeemRewardDiscountData($orderId)
         ];
     }
 
+    /**
+     * Get member identifier value from a customer ID and email (for order/customer event context).
+     * Returns formatted ID when setting is member_id, email otherwise.
+     * Falls back to email when customer ID is absent (guest).
+     *
+     * @param int|null $customerId
+     * @param string|null $email
+     * @return string
+     */
+    public function getMemberIdentifierValueById($customerId, $email = null): string
+    {
+        $prefix = $this->getMemberIdentifierPrefix() ?? '';
+        if ($this->getMemberIdentifier() === 'member_id') {
+            if ($customerId) {
+                $customerIdStr = (string)$customerId;
+                if (strlen($prefix) + strlen($customerIdStr) < 3) {
+                    $padLength = max(0, 3 - strlen($prefix));
+                    return $prefix . str_pad($customerIdStr, $padLength, "0", STR_PAD_LEFT);
+                }
+                return $prefix . $customerIdStr;
+            }
+            return $email ? $prefix . $email : '';
+        }
+        if ($email !== null) {
+            return $email ? $prefix . $email : '';
+        }
+        $resolvedEmail = $customerId ? ($this->getCustomerEmailById($customerId) ?? '') : '';
+        return $resolvedEmail ? $prefix . $resolvedEmail : '';
+    }
+
     /**
      * Get Customer Email By Id
      *
@@ -102,7 +132,7 @@ public function getCustomerById($customerId)
     }
 
     /**
-     * Send Reject reward point API request to Zinrelo when cart gone Abandoned or Redeem Cancel button clicked
+     * Send Reject reward point API request to TrueLoyal when cart gone Abandoned or Redeem Cancel button clicked
      *
      * @param Quote $quote
      * @return bool
@@ -110,24 +140,24 @@ public function getCustomerById($customerId)
     public function sendRejectRewardRequest($quote)
     {
         try {
-            $zinreloQuote = $this->getZinreloQuoteByQuoteId($quote->getId());
-            $redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+            $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($quote->getId());
+            $redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
             $rewardData = $this->getRewardRulesData($quote, $redeemReward);
             if (!empty($rewardData)) {
                 $url = $this->getLiveWebHookUrl() . "transactions/" . $rewardData['id'] . "/reject";
                 $this->request($url, "", "post", "live_api");
                 $items = $quote->getAllItems();
                 foreach ($items as $item) {
-                    $zinreloQuoteItem = $this->getZinreloQuoteItemByItemId($item->getId());
-                    if ($zinreloQuoteItem->getIsZinreloFreeProduct()) {
+                    $trueloyalQuoteItem = $this->getTrueLoyalQuoteItemByItemId($item->getId());
+                    if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) {
                         $item->delete();
                         $item->save();
                         break;
                     }
                 }
-                $zinreloQuote->setRedeemRewardDiscount('');
-                $zinreloQuote->setRewardRulesData('');
-                $zinreloQuote->save();
+                $trueloyalQuote->setRedeemRewardDiscount('');
+                $trueloyalQuote->setRewardRulesData('');
+                $trueloyalQuote->save();
                 return true;
             }
         } catch (Exception $e) {
@@ -168,14 +198,14 @@ public function returnResponseData($responseData): array
     }
 
     /**
-     * Request to Zinrelo for order_create
+     * Request to TrueLoyal for order_create
      *
      * @param string $id
      * @param string $replacedOrderId
      * @return bool
      * @throws NoSuchEntityException
      */
-    public function createZinreloOrder($id, $replacedOrderId)
+    public function createTrueLoyalOrder($id, $replacedOrderId)
     {
         $order = $this->orderRepository->get($id);
         $couponCode = $this->getCouponCodes($order);
@@ -197,9 +227,9 @@ public function createZinreloOrder($id, $replacedOrderId)
                 continue;
             }
             $quote = $this->quoteRepository->get($order->getQuoteId());
-            $zinreloQuote = $this->getZinreloQuoteByQuoteId($order->getQuoteId());
-            if (!empty($zinreloQuote->getRedeemRewardDiscount())) {
-                $redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+            $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($order->getQuoteId());
+            if (!empty($trueloyalQuote->getRedeemRewardDiscount())) {
+                $redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
                 $rewardData = $this->getRewardRulesData($quote, $redeemReward);
                 if ($rewardData) {
                     $discountValue = $rewardData['reward_value'];
@@ -288,7 +318,7 @@ public function createZinreloOrder($id, $replacedOrderId)
         }
         $orderData['total_qty_ordered'] = (int)$orderData['total_qty_ordered'];
         $params = [
-            "member_id" => $order->getCustomerEmail(),
+            "member_id" => $this->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
             "activity_id" => "order_create",
             "data" => $orderData
         ];
diff --git a/Helper/OrderComplete.php b/Helper/OrderComplete.php
index aa51f7b..4d8d700 100755
--- a/Helper/OrderComplete.php
+++ b/Helper/OrderComplete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Helper;
+namespace TrueLoyal\LoyaltyRewards\Helper;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -8,7 +8,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\OrderFactory;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class OrderComplete extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * Order complete event to zinrelo
+     * Order complete event to trueloyal
      *
      * @param $order
      * @return bool
@@ -55,10 +55,10 @@ public function getCompletedOrder($order)
     {
         $event = $this->helper->getRewardEvents();
         $orderId = $order->getEntityId();
-        $zinreloOrder = $this->helper->getZinreloOrderByOrderId($orderId);
+        $trueloyalOrder = $this->helper->getTrueLoyalOrderByOrderId($orderId);
         if (in_array('order_complete', $event, true) &&
             $order->getState() == 'complete' &&
-            $zinreloOrder->getCompleteRequestSent() == 0
+            $trueloyalOrder->getCompleteRequestSent() == 0
         ) {
             $order = $this->orderRepository->get($orderId);
             $order->getPayment()->setMethodInstance();
@@ -126,7 +126,7 @@ public function getCompletedOrder($order)
             $orderData['coupon_code'] = $couponCode;
             $orderData['total_qty_ordered'] = (int)$orderData['total_qty_ordered'];
             $params = [
-                "member_id" => $order->getCustomerEmail(),
+                "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                 "activity_id" => "order_complete",
                 "data" => $orderData
             ];
@@ -134,9 +134,9 @@ public function getCompletedOrder($order)
             $params = $this->helper->json->serialize($params);
             $this->helper->request($url, $params, "post");
             try {
-                /*Set complete request send to Zinrelo*/
-                $zinreloOrder->setCompleteRequestSent(1);
-                $zinreloOrder->save();
+                /*Set complete request send to TrueLoyal*/
+                $trueloyalOrder->setCompleteRequestSent(1);
+                $trueloyalOrder->save();
             } catch (CouldNotSaveException $e) {
                 $this->helper->addErrorLog($e->getMessage());
             }
diff --git a/Helper/Reward.php b/Helper/Reward.php
index a5a56c7..f6aef7a 100755
--- a/Helper/Reward.php
+++ b/Helper/Reward.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Helper;
+namespace TrueLoyal\LoyaltyRewards\Helper;
 
 class Reward extends Config
 {
@@ -17,8 +17,8 @@ public function getCollectRewardValueData($orderId, $flag, $actionData)
         $order = $this->orderRepository->get($orderId);
         $quoteID = $order->getQuoteId();
         $quote = $this->quoteFactory->create()->load($quoteID);
-        $zinreloQuote = $this->getZinreloQuoteByQuoteId($quote->getId());
-        $redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+        $trueloyalQuote = $this->getTrueLoyalQuoteByQuoteId($quote->getId());
+        $redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
         $rewardData = $this->getRewardRulesData($quote, $redeemReward);
         if (isset($rewardData['rule'])
             && ($rewardData['rule'] == 'fixed_amount_discount'
diff --git a/Logger/Handler.php b/Logger/Handler.php
index e3e3813..7934a23 100755
--- a/Logger/Handler.php
+++ b/Logger/Handler.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zinrelo\LoyaltyRewards\Logger;
+namespace TrueLoyal\LoyaltyRewards\Logger;
 
 use Monolog\Logger;
 
@@ -17,5 +17,5 @@ class Handler extends \Magento\Framework\Logger\Handler\Base
      *
      * @var string
      */
-    protected $fileName = '/var/log/zinrelo.log';
+    protected $fileName = '/var/log/trueloyal.log';
 }
diff --git a/Logger/Logger.php b/Logger/Logger.php
index 2221395..381a3a0 100755
--- a/Logger/Logger.php
+++ b/Logger/Logger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Logger;
+namespace TrueLoyal\LoyaltyRewards\Logger;
 
 use Monolog\Logger as MonologLogger;
 
diff --git a/Model/Api/CustomerAttribute.php b/Model/Api/CustomerAttribute.php
index e5e6060..410d06a 100755
--- a/Model/Api/CustomerAttribute.php
+++ b/Model/Api/CustomerAttribute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Api;
+namespace TrueLoyal\LoyaltyRewards\Model\Api;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\Attribute;
@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Rest\Request;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CustomerAttribute
 {
@@ -75,8 +75,8 @@ public function createCustomerAttribute()
         if (!$this->helper->isModuleEnabled()) {
             $response[] = [
                         'status' => false,
-                        'message' => __('Zinrelo LoyaltyRewards module is not enabled.') . " " .
-                        __('Enable module from: Stores → Configuration →Zinrelo Loyalty Rewards → Zinrelo Settings.')
+                        'message' => __('TrueLoyal LoyaltyRewards module is not enabled.') . " " .
+                        __('Enable module from: Stores → Configuration →TrueLoyal Loyalty Rewards → TrueLoyal Settings.')
                     ];
             return $response;
         /*Check header api-key and partner-id with configured auth key*/
@@ -114,10 +114,10 @@ public function createCustomerAttribute()
                         'adminhtml_customer'
                     ]);
                     $this->attributeResource->save($attribute);
-                    /*Set attribute as Zinrelo*/
+                    /*Set attribute as TrueLoyal*/
                     $attributeId = $this->helper->getCustomerAttributeId($customerAttribute['attribute_code']);
-                    $eavAttribute = $this->helper->getZinreloAttributeByAttributeId($attributeId);
-                    $eavAttribute->setAttributeId($attributeId)->setIsZinreloAttribute(1)->save();
+                    $eavAttribute = $this->helper->getTrueLoyalAttributeByAttributeId($attributeId);
+                    $eavAttribute->setAttributeId($attributeId)->setIsTrueLoyalAttribute(1)->save();
                     /*End*/
                     $response[] = [
                         'status' => true,
diff --git a/Model/Api/CustomerAttributeUpdate.php b/Model/Api/CustomerAttributeUpdate.php
index 135b216..3c04e1c 100755
--- a/Model/Api/CustomerAttributeUpdate.php
+++ b/Model/Api/CustomerAttributeUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Api;
+namespace TrueLoyal\LoyaltyRewards\Model\Api;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
@@ -11,7 +11,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Store\Model\StoreManagerInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CustomerAttributeUpdate
 {
@@ -82,8 +82,8 @@ public function updateCustomerAttributeValue()
         if (!$this->helper->isModuleEnabled()) {
             $response[] = [
                         'status' => false,
-                        'message' => __('Zinrelo LoyaltyRewards module is not enabled.') . " " .
-                        __('Enable module from: Stores → Configuration →Zinrelo Loyalty Rewards → Zinrelo Settings.')
+                        'message' => __('TrueLoyal LoyaltyRewards module is not enabled.') . " " .
+                        __('Enable module from: Stores → Configuration →TrueLoyal Loyalty Rewards → TrueLoyal Settings.')
                     ];
             return $response;
         /*Check header api-key and partner-id with configured auth key*/
@@ -98,8 +98,8 @@ public function updateCustomerAttributeValue()
                 $attributeValues = $this->eavConfig->getAttribute(Customer::ENTITY, $attribute['attribute_code']);
                 $websiteID = $this->storeManager->getStore()->getWebsiteId();
                 $customer = $this->customer->create()->setWebsiteId($websiteID)->loadByEmail($attribute['customer_email']);
-                $eavAttribute = $this->helper->getZinreloAttributeByAttributeId($attributeValues->getAttributeId());
-                if ($eavAttribute->getIsZinreloAttribute() && $customer->getData()) {
+                $eavAttribute = $this->helper->getTrueLoyalAttributeByAttributeId($attributeValues->getAttributeId());
+                if ($eavAttribute->getIsTrueLoyalAttribute() && $customer->getData()) {
                     $customerData = $customer->getDataModel();
                     $customerData->setCustomAttribute($attribute['attribute_code'], $attribute['value']);
                     $customer->updateData($customerData);
diff --git a/Model/Carrier/ZinreloShipping.php b/Model/Carrier/TrueLoyalShipping.php
similarity index 87%
rename from Model/Carrier/ZinreloShipping.php
rename to Model/Carrier/TrueLoyalShipping.php
index 978aabb..71220c5 100755
--- a/Model/Carrier/ZinreloShipping.php
+++ b/Model/Carrier/TrueLoyalShipping.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Carrier;
+namespace TrueLoyal\LoyaltyRewards\Model\Carrier;
 
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -15,14 +15,14 @@
 use Magento\Shipping\Model\Rate\Result;
 use Magento\Shipping\Model\Rate\ResultFactory;
 use Psr\Log\LoggerInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class ZinreloShipping extends AbstractCarrier implements CarrierInterface
+class TrueLoyalShipping extends AbstractCarrier implements CarrierInterface
 {
     /**
      * @var string
      */
-    protected $_code = 'zinrelorate';
+    protected $_code = 'trueloyalrate';
     /**
      * @var bool
      */
@@ -45,7 +45,7 @@ class ZinreloShipping extends AbstractCarrier implements CarrierInterface
     private $helper;
 
     /**
-     * ZinreloShipping constructor.
+     * TrueLoyalShipping constructor.
      *
      * @param ScopeConfigInterface $scopeConfig
      * @param ErrorFactory $rateErrorFactory
@@ -80,11 +80,11 @@ public function __construct(
      */
     public function getAllowedMethods()
     {
-        return ['zinrelorate' => $this->getConfigData('name')];
+        return ['trueloyalrate' => $this->getConfigData('name')];
     }
 
     /**
-     * Zinrelo free shipping
+     * TrueLoyal free shipping
      *
      * @param RateRequest $request
      * @return bool|DataObject|Result|null
@@ -101,9 +101,9 @@ public function collectRates(RateRequest $request)
             $title = $this->helper->getFreeShippingLabel() ?? $this->getConfigData('title');
             $amount = $this->getConfigData('price');
             $shippingPrice = $this->getFinalPriceWithHandlingFee($amount);
-            $method->setCarrier('zinrelorate');
+            $method->setCarrier('trueloyalrate');
             $method->setCarrierTitle($this->getConfigData('name'));
-            $method->setMethod('zinrelorate');
+            $method->setMethod('trueloyalrate');
             $method->setMethodTitle($title);
             $method->setCost($amount);
             $method->setPrice($shippingPrice);
@@ -111,7 +111,7 @@ public function collectRates(RateRequest $request)
             return $result;
         } else {
             $error = $this->_rateErrorFactory->create();
-            $error->setCarrier('zinrelorate');
+            $error->setCarrier('trueloyalrate');
             $result->append($error);
             return $result;
         }
diff --git a/Model/ResourceModel/TrueLoyalEavAttribute.php b/Model/ResourceModel/TrueLoyalEavAttribute.php
new file mode 100755
index 0000000..0ada8bc
--- /dev/null
+++ b/Model/ResourceModel/TrueLoyalEavAttribute.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel;
+
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
+class TrueLoyalEavAttribute extends AbstractDb
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected function _construct()
+    {
+        $this->_init('trueloyal_eav_attribute', 'id');
+    }
+}
+
diff --git a/Model/ResourceModel/TrueLoyalEavAttribute/Collection.php b/Model/ResourceModel/TrueLoyalEavAttribute/Collection.php
new file mode 100755
index 0000000..b91a34a
--- /dev/null
+++ b/Model/ResourceModel/TrueLoyalEavAttribute/Collection.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalEavAttribute;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalEavAttribute as TrueLoyalEavAttributeModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalEavAttribute as TrueLoyalEavAttributeResourceModel;
+
+class Collection extends AbstractCollection
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected $_idFieldName = 'id';
+
+    /**
+     * @inheritDoc
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            TrueLoyalEavAttributeModel::class,
+            TrueLoyalEavAttributeResourceModel::class
+        );
+    }
+}
+
diff --git a/Model/ResourceModel/ZinreloQuote.php b/Model/ResourceModel/TrueLoyalQuote.php
similarity index 54%
rename from Model/ResourceModel/ZinreloQuote.php
rename to Model/ResourceModel/TrueLoyalQuote.php
index b852e55..880e6f3 100755
--- a/Model/ResourceModel/ZinreloQuote.php
+++ b/Model/ResourceModel/TrueLoyalQuote.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
-class ZinreloQuote extends AbstractDb
+class TrueLoyalQuote extends AbstractDb
 {
 
     /**
@@ -17,7 +17,7 @@ class ZinreloQuote extends AbstractDb
      */
     protected function _construct()
     {
-        $this->_init('zinrelo_quote', 'id');
+        $this->_init('trueloyal_quote', 'id');
     }
 }
 
diff --git a/Model/ResourceModel/ZinreloReview/Collection.php b/Model/ResourceModel/TrueLoyalQuote/Collection.php
similarity index 51%
rename from Model/ResourceModel/ZinreloReview/Collection.php
rename to Model/ResourceModel/TrueLoyalQuote/Collection.php
index 2c4853f..50645cf 100755
--- a/Model/ResourceModel/ZinreloReview/Collection.php
+++ b/Model/ResourceModel/TrueLoyalQuote/Collection.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloReview;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuote;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zinrelo\LoyaltyRewards\Model\ZinreloReview as ZinreloReviewModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloReview as ZinreloReviewResourceModel;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalQuote as TrueLoyalQuoteModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuote as TrueLoyalQuoteResourceModel;
 
 class Collection extends AbstractCollection
 {
@@ -25,8 +25,8 @@ class Collection extends AbstractCollection
     protected function _construct()
     {
         $this->_init(
-            ZinreloReviewModel::class,
-            ZinreloReviewResourceModel::class
+            TrueLoyalQuoteModel::class,
+            TrueLoyalQuoteResourceModel::class
         );
     }
 }
diff --git a/Model/ResourceModel/ZinreloEavAttribute.php b/Model/ResourceModel/TrueLoyalQuoteItem.php
similarity index 53%
rename from Model/ResourceModel/ZinreloEavAttribute.php
rename to Model/ResourceModel/TrueLoyalQuoteItem.php
index 4e070e3..1751561 100755
--- a/Model/ResourceModel/ZinreloEavAttribute.php
+++ b/Model/ResourceModel/TrueLoyalQuoteItem.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
-class ZinreloEavAttribute extends AbstractDb
+class TrueLoyalQuoteItem extends AbstractDb
 {
 
     /**
@@ -17,7 +17,7 @@ class ZinreloEavAttribute extends AbstractDb
      */
     protected function _construct()
     {
-        $this->_init('zinrelo_eav_attribute', 'id');
+        $this->_init('trueloyal_quote_item', 'id');
     }
 }
 
diff --git a/Model/ResourceModel/TrueLoyalQuoteItem/Collection.php b/Model/ResourceModel/TrueLoyalQuoteItem/Collection.php
new file mode 100755
index 0000000..d172847
--- /dev/null
+++ b/Model/ResourceModel/TrueLoyalQuoteItem/Collection.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuoteItem;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalQuoteItem as TrueLoyalQuoteItemModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuoteItem as TrueLoyalQuoteItemResourceModel;
+
+class Collection extends AbstractCollection
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected $_idFieldName = 'id';
+
+    /**
+     * @inheritDoc
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            TrueLoyalQuoteItemModel::class,
+            TrueLoyalQuoteItemResourceModel::class
+        );
+    }
+}
+
diff --git a/Model/ResourceModel/ZinreloQuoteItem.php b/Model/ResourceModel/TrueLoyalReview.php
similarity index 54%
rename from Model/ResourceModel/ZinreloQuoteItem.php
rename to Model/ResourceModel/TrueLoyalReview.php
index a0e5c27..0574f09 100755
--- a/Model/ResourceModel/ZinreloQuoteItem.php
+++ b/Model/ResourceModel/TrueLoyalReview.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
-class ZinreloQuoteItem extends AbstractDb
+class TrueLoyalReview extends AbstractDb
 {
 
     /**
@@ -17,7 +17,7 @@ class ZinreloQuoteItem extends AbstractDb
      */
     protected function _construct()
     {
-        $this->_init('zinrelo_quote_item', 'id');
+        $this->_init('trueloyal_review', 'id');
     }
 }
 
diff --git a/Model/ResourceModel/ZinreloQuoteItem/Collection.php b/Model/ResourceModel/TrueLoyalReview/Collection.php
similarity index 50%
rename from Model/ResourceModel/ZinreloQuoteItem/Collection.php
rename to Model/ResourceModel/TrueLoyalReview/Collection.php
index 3faa89a..0653439 100755
--- a/Model/ResourceModel/ZinreloQuoteItem/Collection.php
+++ b/Model/ResourceModel/TrueLoyalReview/Collection.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuoteItem;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalReview;
 
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zinrelo\LoyaltyRewards\Model\ZinreloQuoteItem as ZinreloQuoteItemModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuoteItem as ZinreloQuoteItemResourceModel;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalReview as TrueLoyalReviewModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalReview as TrueLoyalReviewResourceModel;
 
 class Collection extends AbstractCollection
 {
@@ -25,8 +25,8 @@ class Collection extends AbstractCollection
     protected function _construct()
     {
         $this->_init(
-            ZinreloQuoteItemModel::class,
-            ZinreloQuoteItemResourceModel::class
+            TrueLoyalReviewModel::class,
+            TrueLoyalReviewResourceModel::class
         );
     }
 }
diff --git a/Model/ResourceModel/ZinreloReview.php b/Model/ResourceModel/TrueLoyalSalesOrder.php
similarity index 53%
rename from Model/ResourceModel/ZinreloReview.php
rename to Model/ResourceModel/TrueLoyalSalesOrder.php
index 4e3cb36..87ec063 100755
--- a/Model/ResourceModel/ZinreloReview.php
+++ b/Model/ResourceModel/TrueLoyalSalesOrder.php
@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Zinrelo. All rights reserved.
+ * Copyright © TrueLoyal. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel;
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
-class ZinreloReview extends AbstractDb
+class TrueLoyalSalesOrder extends AbstractDb
 {
 
     /**
@@ -17,7 +17,7 @@ class ZinreloReview extends AbstractDb
      */
     protected function _construct()
     {
-        $this->_init('zinrelo_review', 'id');
+        $this->_init('trueloyal_sales_order', 'id');
     }
 }
 
diff --git a/Model/ResourceModel/TrueLoyalSalesOrder/Collection.php b/Model/ResourceModel/TrueLoyalSalesOrder/Collection.php
new file mode 100755
index 0000000..b0dfb90
--- /dev/null
+++ b/Model/ResourceModel/TrueLoyalSalesOrder/Collection.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalSalesOrder;
+
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use TrueLoyal\LoyaltyRewards\Model\TrueLoyalSalesOrder as TrueLoyalSalesOrderModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalSalesOrder as TrueLoyalSalesOrderResourceModel;
+class Collection extends AbstractCollection
+{
+
+    /**
+     * @inheritDoc
+     */
+    protected $_idFieldName = 'id';
+
+    /**
+     * @inheritDoc
+     */
+    protected function _construct()
+    {
+        $this->_init(
+            TrueLoyalSalesOrderModel::class,
+            TrueLoyalSalesOrderResourceModel::class
+        );
+    }
+}
+
diff --git a/Model/ResourceModel/ZinreloEavAttribute/Collection.php b/Model/ResourceModel/ZinreloEavAttribute/Collection.php
deleted file mode 100755
index 1b13001..0000000
--- a/Model/ResourceModel/ZinreloEavAttribute/Collection.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloEavAttribute;
-
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zinrelo\LoyaltyRewards\Model\ZinreloEavAttribute as ZinreloEavAttributeModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloEavAttribute as ZinreloEavAttributeResourceModel;
-
-class Collection extends AbstractCollection
-{
-
-    /**
-     * @inheritDoc
-     */
-    protected $_idFieldName = 'id';
-
-    /**
-     * @inheritDoc
-     */
-    protected function _construct()
-    {
-        $this->_init(
-            ZinreloEavAttributeModel::class,
-            ZinreloEavAttributeResourceModel::class
-        );
-    }
-}
-
diff --git a/Model/ResourceModel/ZinreloQuote/Collection.php b/Model/ResourceModel/ZinreloQuote/Collection.php
deleted file mode 100755
index 3f6d3ed..0000000
--- a/Model/ResourceModel/ZinreloQuote/Collection.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuote;
-
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zinrelo\LoyaltyRewards\Model\ZinreloQuote as ZinreloQuoteModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuote as ZinreloQuoteResourceModel;
-
-class Collection extends AbstractCollection
-{
-
-    /**
-     * @inheritDoc
-     */
-    protected $_idFieldName = 'id';
-
-    /**
-     * @inheritDoc
-     */
-    protected function _construct()
-    {
-        $this->_init(
-            ZinreloQuoteModel::class,
-            ZinreloQuoteResourceModel::class
-        );
-    }
-}
-
diff --git a/Model/ResourceModel/ZinreloSalesOrder.php b/Model/ResourceModel/ZinreloSalesOrder.php
deleted file mode 100755
index 32ce56f..0000000
--- a/Model/ResourceModel/ZinreloSalesOrder.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel;
-
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-
-class ZinreloSalesOrder extends AbstractDb
-{
-
-    /**
-     * @inheritDoc
-     */
-    protected function _construct()
-    {
-        $this->_init('zinrelo_sales_order', 'id');
-    }
-}
-
diff --git a/Model/ResourceModel/ZinreloSalesOrder/Collection.php b/Model/ResourceModel/ZinreloSalesOrder/Collection.php
deleted file mode 100755
index ee11303..0000000
--- a/Model/ResourceModel/ZinreloSalesOrder/Collection.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloSalesOrder;
-
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zinrelo\LoyaltyRewards\Model\ZinreloSalesOrder as ZinreloSalesOrderModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloSalesOrder as ZinreloSalesOrderResourceModel;
-class Collection extends AbstractCollection
-{
-
-    /**
-     * @inheritDoc
-     */
-    protected $_idFieldName = 'id';
-
-    /**
-     * @inheritDoc
-     */
-    protected function _construct()
-    {
-        $this->_init(
-            ZinreloSalesOrderModel::class,
-            ZinreloSalesOrderResourceModel::class
-        );
-    }
-}
-
diff --git a/Model/System/Config/EventsSelection.php b/Model/System/Config/EventsSelection.php
index 4c9f30c..78ac3d3 100644
--- a/Model/System/Config/EventsSelection.php
+++ b/Model/System/Config/EventsSelection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\System\Config;
+namespace TrueLoyal\LoyaltyRewards\Model\System\Config;
 
 use Magento\Framework\Data\OptionSourceInterface;
 
diff --git a/Model/System/Config/MemberIdentifier.php b/Model/System/Config/MemberIdentifier.php
new file mode 100644
index 0000000..03303bc
--- /dev/null
+++ b/Model/System/Config/MemberIdentifier.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace TrueLoyal\LoyaltyRewards\Model\System\Config;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class MemberIdentifier implements OptionSourceInterface
+{
+    public const MEMBER_ID = 'member_id';
+    public const MEMBER_EMAIL = 'member_email';
+
+    /**
+     * To Option Array
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => self::MEMBER_EMAIL, 'label' => __('Member Email')],
+            ['value' => self::MEMBER_ID, 'label' => __('Member ID')],
+        ];
+    }
+}
diff --git a/Model/System/Config/PreferredLanguage.php b/Model/System/Config/PreferredLanguage.php
new file mode 100644
index 0000000..41e9539
--- /dev/null
+++ b/Model/System/Config/PreferredLanguage.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace TrueLoyal\LoyaltyRewards\Model\System\Config;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+class PreferredLanguage implements OptionSourceInterface
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            ['value' => '',                      'label' => __(' ')],
+            ['value' => 'english',               'label' => __('English')],
+            ['value' => 'arabic',                'label' => __('Arabic')],
+            ['value' => 'french',                'label' => __('French')],
+            ['value' => 'german',                'label' => __('German')],
+            ['value' => 'italian',               'label' => __('Italian')],
+            ['value' => 'spanish',               'label' => __('Spanish')],
+            ['value' => 'custom language one',   'label' => __('Custom Language One')],
+            ['value' => 'custom language two',   'label' => __('Custom Language Two')],
+            ['value' => 'custom language three', 'label' => __('Custom Language Three')],
+            ['value' => 'custom language four',  'label' => __('Custom Language Four')],
+            ['value' => 'custom language five',  'label' => __('Custom Language Five')],
+            ['value' => 'custom language six',  'label' => __('Custom Language Six')],
+            ['value' => 'custom language seven',  'label' => __('Custom Language Seven')],
+            ['value' => 'custom language eight',  'label' => __('Custom Language Eight')],
+            ['value' => 'custom language nine',  'label' => __('Custom Language Nine')],
+            ['value' => 'custom language ten',  'label' => __('Custom Language Ten')],
+            ['value' => 'custom language eleven',  'label' => __('Custom Language Eleven')],
+            ['value' => 'custom language twelve',  'label' => __('Custom Language Twelve')],
+            ['value' => 'custom language thirteen',  'label' => __('Custom Language Thirteen')],
+            ['value' => 'custom language fourteen',  'label' => __('Custom Language Fourteen')],
+        ];
+    }
+}
diff --git a/Model/Total/CreditMemo/LoyaltyRewardsDiscount.php b/Model/Total/CreditMemo/LoyaltyRewardsDiscount.php
index 21fd993..1ffd746 100755
--- a/Model/Total/CreditMemo/LoyaltyRewardsDiscount.php
+++ b/Model/Total/CreditMemo/LoyaltyRewardsDiscount.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Total\CreditMemo;
+namespace TrueLoyal\LoyaltyRewards\Model\Total\CreditMemo;
 
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal;
-use Zinrelo\LoyaltyRewards\Helper\Reward;
+use TrueLoyal\LoyaltyRewards\Helper\Reward;
 
 class LoyaltyRewardsDiscount extends AbstractTotal
 {
diff --git a/Model/Total/Invoice/LoyaltyRewardsDiscount.php b/Model/Total/Invoice/LoyaltyRewardsDiscount.php
index d5f017f..4c4fe46 100755
--- a/Model/Total/Invoice/LoyaltyRewardsDiscount.php
+++ b/Model/Total/Invoice/LoyaltyRewardsDiscount.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Total\Invoice;
+namespace TrueLoyal\LoyaltyRewards\Model\Total\Invoice;
 
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Invoice\Total\AbstractTotal;
-use Zinrelo\LoyaltyRewards\Helper\Reward;
+use TrueLoyal\LoyaltyRewards\Helper\Reward;
 
 class LoyaltyRewardsDiscount extends AbstractTotal
 {
diff --git a/Model/Total/Quote/LoyaltyRewardsDiscount.php b/Model/Total/Quote/LoyaltyRewardsDiscount.php
index cdb5adf..f33b180 100755
--- a/Model/Total/Quote/LoyaltyRewardsDiscount.php
+++ b/Model/Total/Quote/LoyaltyRewardsDiscount.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Model\Total\Quote;
+namespace TrueLoyal\LoyaltyRewards\Model\Total\Quote;
 
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address\Total;
 use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class LoyaltyRewardsDiscount extends AbstractTotal
 {
@@ -56,8 +56,8 @@ public function collect(
             else {
                 $totalAmount = -($totalAmount * $rewardData['reward_value'] / 100);
             }
-            $total->addTotalAmount('zinrelo_discount', $totalAmount);
-            $total->addBaseTotalAmount('zinrelo_discount', $totalAmount);
+            $total->addTotalAmount('trueloyal_discount', $totalAmount);
+            $total->addBaseTotalAmount('trueloyal_discount', $totalAmount);
             $quote->setCustomDiscount($totalAmount);
             return $this;
         }
@@ -93,7 +93,7 @@ public function fetch(Quote $quote, Total $total)
                 $totalAmount = -($rewardData['points_to_be_redeemed'] / $rewardData['conversion_rate']);
             }
             return [
-                'code' => 'zinrelo_discount',
+                'code' => 'trueloyal_discount',
                 'title' => __($this->helper->getRewardAppliedRuleLabel($quote)),
                 'value' => $totalAmount
             ];
diff --git a/Model/TrueLoyalEavAttribute.php b/Model/TrueLoyalEavAttribute.php
new file mode 100755
index 0000000..ed72f7a
--- /dev/null
+++ b/Model/TrueLoyalEavAttribute.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright ©  TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalEavAttribute as TrueLoyalEavAttributeResourceModel;
+
+class TrueLoyalEavAttribute extends AbstractModel
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(TrueLoyalEavAttributeResourceModel::class);
+    }
+}
+
diff --git a/Model/TrueLoyalQuote.php b/Model/TrueLoyalQuote.php
new file mode 100755
index 0000000..4f91b2b
--- /dev/null
+++ b/Model/TrueLoyalQuote.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuote as TrueLoyalQuoteResourceModel;
+
+class TrueLoyalQuote extends AbstractModel
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(TrueLoyalQuoteResourceModel::class);
+    }
+}
+
diff --git a/Model/TrueLoyalQuoteItem.php b/Model/TrueLoyalQuoteItem.php
new file mode 100755
index 0000000..2adcfc9
--- /dev/null
+++ b/Model/TrueLoyalQuoteItem.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalQuoteItem as TrueLoyalQuoteItemResourceModel;
+
+class TrueLoyalQuoteItem extends AbstractModel
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(TrueLoyalQuoteItemResourceModel::class);
+    }
+}
+
diff --git a/Model/TrueLoyalReview.php b/Model/TrueLoyalReview.php
new file mode 100755
index 0000000..9ed05b9
--- /dev/null
+++ b/Model/TrueLoyalReview.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalReview as TrueLoyalReviewResourceModel;
+
+class TrueLoyalReview extends AbstractModel
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(TrueLoyalReviewResourceModel::class);
+    }
+}
+
diff --git a/Model/TrueLoyalSalesOrder.php b/Model/TrueLoyalSalesOrder.php
new file mode 100755
index 0000000..34983c0
--- /dev/null
+++ b/Model/TrueLoyalSalesOrder.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © TrueLoyal. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace TrueLoyal\LoyaltyRewards\Model;
+
+use Magento\Framework\Model\AbstractModel;
+use TrueLoyal\LoyaltyRewards\Model\ResourceModel\TrueLoyalSalesOrder as TrueLoyalSalesOrderResourceModel;
+
+class TrueLoyalSalesOrder extends AbstractModel
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function _construct()
+    {
+        $this->_init(TrueLoyalSalesOrderResourceModel::class);
+    }
+}
+
diff --git a/Model/ZinreloEavAttribute.php b/Model/ZinreloEavAttribute.php
deleted file mode 100755
index bb55a94..0000000
--- a/Model/ZinreloEavAttribute.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright ©  Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model;
-
-use Magento\Framework\Model\AbstractModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloEavAttribute as ZinreloEavAttributeResourceModel;
-
-class ZinreloEavAttribute extends AbstractModel
-{
-
-    /**
-     * @inheritDoc
-     */
-    public function _construct()
-    {
-        $this->_init(ZinreloEavAttributeResourceModel::class);
-    }
-}
-
diff --git a/Model/ZinreloQuote.php b/Model/ZinreloQuote.php
deleted file mode 100755
index 2051e9a..0000000
--- a/Model/ZinreloQuote.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model;
-
-use Magento\Framework\Model\AbstractModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuote as ZinreloQuoteResourceModel;
-
-class ZinreloQuote extends AbstractModel
-{
-
-    /**
-     * @inheritDoc
-     */
-    public function _construct()
-    {
-        $this->_init(ZinreloQuoteResourceModel::class);
-    }
-}
-
diff --git a/Model/ZinreloQuoteItem.php b/Model/ZinreloQuoteItem.php
deleted file mode 100755
index f1e4c8f..0000000
--- a/Model/ZinreloQuoteItem.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model;
-
-use Magento\Framework\Model\AbstractModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloQuoteItem as ZinreloQuoteItemResourceModel;
-
-class ZinreloQuoteItem extends AbstractModel
-{
-
-    /**
-     * @inheritDoc
-     */
-    public function _construct()
-    {
-        $this->_init(ZinreloQuoteItemResourceModel::class);
-    }
-}
-
diff --git a/Model/ZinreloReview.php b/Model/ZinreloReview.php
deleted file mode 100755
index 722936f..0000000
--- a/Model/ZinreloReview.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model;
-
-use Magento\Framework\Model\AbstractModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloReview as ZinreloReviewResourceModel;
-
-class ZinreloReview extends AbstractModel
-{
-
-    /**
-     * @inheritDoc
-     */
-    public function _construct()
-    {
-        $this->_init(ZinreloReviewResourceModel::class);
-    }
-}
-
diff --git a/Model/ZinreloSalesOrder.php b/Model/ZinreloSalesOrder.php
deleted file mode 100755
index f49461d..0000000
--- a/Model/ZinreloSalesOrder.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Zinrelo. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Zinrelo\LoyaltyRewards\Model;
-
-use Magento\Framework\Model\AbstractModel;
-use Zinrelo\LoyaltyRewards\Model\ResourceModel\ZinreloSalesOrder as ZinreloSalesOrderResourceModel;
-
-class ZinreloSalesOrder extends AbstractModel
-{
-
-    /**
-     * @inheritDoc
-     */
-    public function _construct()
-    {
-        $this->_init(ZinreloSalesOrderResourceModel::class);
-    }
-}
-
diff --git a/Observer/AddFreeProduct.php b/Observer/AddFreeProduct.php
index 414e1b5..4912cba 100755
--- a/Observer/AddFreeProduct.php
+++ b/Observer/AddFreeProduct.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class AddFreeProduct implements ObserverInterface
 {
diff --git a/Observer/AdminOrderCreate.php b/Observer/AdminOrderCreate.php
index 6fd3fd3..54fad0e 100755
--- a/Observer/AdminOrderCreate.php
+++ b/Observer/AdminOrderCreate.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class AdminOrderCreate implements ObserverInterface
 {
@@ -25,7 +25,7 @@ public function __construct(
     }
 
     /**
-     * Order Create event to zinrelo
+     * Order Create event to trueloyal
      *
      * @param Observer $observer
      */
@@ -35,7 +35,7 @@ public function execute(Observer $observer)
         if (in_array('order_create', $event, true)) {
             $order = $observer->getEvent()->getOrder();
             $replacedOrderId = $this->helper->getReplacedOrderID($order->getEntityId(), false);
-            return $this->helper->createZinreloOrder($order->getId(), $replacedOrderId);
+            return $this->helper->createTrueLoyalOrder($order->getId(), $replacedOrderId);
         }
     }
 }
diff --git a/Observer/ConfigSaveObserver.php b/Observer/ConfigSaveObserver.php
index ee1a2d9..da164c3 100755
--- a/Observer/ConfigSaveObserver.php
+++ b/Observer/ConfigSaveObserver.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
-use Zinrelo\LoyaltyRewards\Logger\Logger as ZinreloLogger;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Logger\Logger as TrueLoyalLogger;
 
 class ConfigSaveObserver implements ObserverInterface
 {
@@ -14,18 +14,18 @@ class ConfigSaveObserver implements ObserverInterface
      */
     private $helper;
     /**
-     * @var ZinreloLogger
+     * @var TrueLoyalLogger
      */
     private $logger;
     /**
      * Data constructor.
      *
      * @param Data $helper
-     * @param ZinreloLogger $logger
+     * @param TrueLoyalLogger $logger
      */
     public function __construct(
         Data $helper,
-        ZinreloLogger $logger,
+        TrueLoyalLogger $logger,
     ) {
         $this->helper = $helper;
         $this->logger = $logger;
diff --git a/Observer/CreateOrderAfter.php b/Observer/CreateOrderAfter.php
index 66b91fe..c6ac2c7 100755
--- a/Observer/CreateOrderAfter.php
+++ b/Observer/CreateOrderAfter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -9,7 +9,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CreateOrderAfter implements ObserverInterface
 {
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * Order Create event to zinrelo
+     * Order Create event to trueloyal
      *
      * @param Observer $observer
      * @return void
@@ -62,28 +62,28 @@ public function execute(Observer $observer)
         $event = $this->helper->getRewardEvents();
         $orderId = $observer->getEvent()->getOrder()->getId();
         $order = $this->orderRepository->get($orderId);
-        $zinreloOrder = $this->helper->getZinreloOrderByOrderId($orderId);
+        $trueloyalOrder = $this->helper->getTrueLoyalOrderByOrderId($orderId);
         $replacedOrderId = $order->getIncrementId();
-        if (!$zinreloOrder->getZinreloReward()) {
+        if (!$trueloyalOrder->getTrueLoyalReward()) {
             if ($order->getQuoteId() !== null) {
                 $quote = $this->quoteRepository->get($order->getQuoteId());
-                $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($order->getQuoteId());
+                $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($order->getQuoteId());
             }
-            if ($order->getQuoteId() !== null && $zinreloQuote->getRedeemRewardDiscount()) {
-                $redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+            if ($order->getQuoteId() !== null && $trueloyalQuote->getRedeemRewardDiscount()) {
+                $redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
                 $rewardData = $this->helper->getRewardRulesData($quote, $redeemReward);
                 $url = $this->helper->getLiveWebHookUrl() . "transactions/" . $rewardData['id'] . "/approve";
                 $this->helper->request($url, "", "post", "live_api");
-                $zinreloOrder->setZinreloReward($this->serializer->serialize($rewardData))->setOrderId($orderId);
+                $trueloyalOrder->setTrueLoyalReward($this->serializer->serialize($rewardData))->setOrderId($orderId);
             } else {
-                $zinreloOrder->setZinreloReward("{}")->setOrderId($orderId);
+                $trueloyalOrder->setTrueLoyalReward("{}")->setOrderId($orderId);
             }
             try {
-                $zinreloOrder->save();
+                $trueloyalOrder->save();
             } catch (CouldNotSaveException $e) {
                 $this->helper->addErrorLog($e->getMessage());
             }
         }
-        $this->helper->createZinreloOrder($orderId, $replacedOrderId);
+        $this->helper->createTrueLoyalOrder($orderId, $replacedOrderId);
     }
 }
diff --git a/Observer/Customer/CustomerLogoutObserver.php b/Observer/Customer/CustomerLogoutObserver.php
index bb88071..3801b22 100755
--- a/Observer/Customer/CustomerLogoutObserver.php
+++ b/Observer/Customer/CustomerLogoutObserver.php
@@ -1,9 +1,9 @@
 <?php
-namespace Zinrelo\LoyaltyRewards\Observer\Customer;
+namespace TrueLoyal\LoyaltyRewards\Observer\Customer;
 
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CustomerLogoutObserver implements ObserverInterface
 {
diff --git a/Observer/CustomerDelete.php b/Observer/CustomerDelete.php
index a47cf88..162015f 100755
--- a/Observer/CustomerDelete.php
+++ b/Observer/CustomerDelete.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CustomerDelete implements ObserverInterface
 {
@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * Send customer delete event to zinrelo
+     * Send customer delete event to trueloyal
      *
      * @param Observer $observer
      * @throws LocalizedException
@@ -45,13 +45,13 @@ public function __construct(
     public function execute(Observer $observer)
     {
         $event = $this->helper->getRewardEvents();
-        /*Check the customer_delete event is enabled, if enabled then will send customer_delete event to Zinrelo*/
+        /*Check the customer_delete event is enabled, if enabled then will send customer_delete event to TrueLoyal*/
         if (in_array('customer_delete', $event)) {
             $customerId = $observer->getEvent()->getCustomer()->getEntityId();
             $customer = $this->customerRepository->getById($customerId);
             $customerData = $customer->__toArray();
             $params = [
-                "member_id" => $customer->getEmail(),
+                "member_id" => $this->helper->getMemberIdentifierValueById($customerId, $customer->getEmail()),
                 "activity_id" => "customer_delete",
                 "data" => $customerData
             ];
diff --git a/Observer/CustomerSaveAfter.php b/Observer/CustomerSaveAfter.php
index fe74232..ba8e136 100755
--- a/Observer/CustomerSaveAfter.php
+++ b/Observer/CustomerSaveAfter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class CustomerSaveAfter implements ObserverInterface
 {
@@ -61,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * Create customer event to zinrelo
+     * Create customer event to trueloyal
      *
      * @param Observer $observer
      * @throws LocalizedException
@@ -121,7 +121,7 @@ public function execute(Observer $observer)
     }
 
     /**
-     * Prepare payload and Send customer create-update request Zinrelo
+     * Prepare payload and Send customer create-update request TrueLoyal
      *
      * @param Observer $observer
      * @param int|mixed $customerId
@@ -149,7 +149,7 @@ public function prepareParams($observer, $customerId, $addressId, $customerAddre
             }
         }
         $params = [
-            "member_id" => $customer->getEmail(),
+            "member_id" => $this->helper->getMemberIdentifierValueById($customerId, $customer->getEmail()),
             "activity_id" => $activity_id,
             "data" => $customerData
         ];
diff --git a/Observer/OrderCancel.php b/Observer/OrderCancel.php
index 6d41f3d..38a6651 100755
--- a/Observer/OrderCancel.php
+++ b/Observer/OrderCancel.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class OrderCancel implements ObserverInterface
 {
@@ -34,7 +34,7 @@ public function __construct(
     }
 
     /**
-     * Order cancel event to zinrelo
+     * Order cancel event to trueloyal
      *
      * @param Observer $observer
      * @return bool
@@ -81,7 +81,7 @@ public function execute(Observer $observer)
             }
             $orderData['total_qty_ordered'] = (int)$orderData['total_qty_ordered'];
             $params = [
-                "member_id" => $order->getCustomerEmail(),
+                "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                 "activity_id" => "order_cancel",
                 "data" => $orderData
             ];
diff --git a/Observer/OrderComplete.php b/Observer/OrderComplete.php
index 82e024b..f8bbc67 100644
--- a/Observer/OrderComplete.php
+++ b/Observer/OrderComplete.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\OrderFactory;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class OrderComplete implements ObserverInterface
 {
@@ -44,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * Order complete event to zinrelo
+     * Order complete event to trueloyal
      *
      * @param Observer $observer
      * @return bool
@@ -112,14 +112,14 @@ public function execute(Observer $observer)
             $orderData['coupon_code'] = $couponCode;
             $orderData['total_qty_ordered'] = (int)$orderData['total_qty_ordered'];
             $params = [
-                "member_id" => $order->getCustomerEmail(),
+                "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                 "activity_id" => "order_complete",
                 "data" => $orderData
             ];
             $url = $this->helper->getWebHookUrl();
             $params = $this->helper->json->serialize($params);
             $this->helper->request($url, $params, "post");
-            /*Set complete request send to Zinrelo*/
+            /*Set complete request send to TrueLoyal*/
             $orderModel = $this->orderFactory->create()->load($orderId);
             $orderModel->setCompleteRequestSent(1);
             try {
diff --git a/Observer/OrderFullInvoicePaid.php b/Observer/OrderFullInvoicePaid.php
index 46ab417..7ecedba 100755
--- a/Observer/OrderFullInvoicePaid.php
+++ b/Observer/OrderFullInvoicePaid.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Exception;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -10,8 +10,8 @@
 use Magento\Framework\Webapi\Rest\Request as RestRequest;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 use Magento\Sales\Model\OrderFactory;
-use Zinrelo\LoyaltyRewards\Helper\Data;
-use Zinrelo\LoyaltyRewards\Helper\OrderComplete;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\OrderComplete;
 
 class OrderFullInvoicePaid implements ObserverInterface
 {
@@ -74,7 +74,7 @@ public function __construct(
     }
 
     /**
-     * Send order paid event to zinrelo
+     * Send order paid event to trueloyal
      *
      * @param Observer $observer
      * @return bool
@@ -131,7 +131,7 @@ public function orderFullInvoiceData($order, $orderId)
             $invoicesItems['coupon_code'] = $couponCode;
             $invoicesItems['order_id'] = $replacedOrderId;
             $params = [
-                "member_id" => $order->getCustomerEmail(),
+                "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                 "activity_id" => "order_paid",
                 "data" => $invoicesItems
             ];
diff --git a/Observer/OrderRefund.php b/Observer/OrderRefund.php
index e3853c7..446f757 100755
--- a/Observer/OrderRefund.php
+++ b/Observer/OrderRefund.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Exception;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 
@@ -58,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * Send order refund  event to zinrelo
+     * Send order refund  event to trueloyal
      *
      * @param Observer $observer
      * @return bool
@@ -67,7 +67,7 @@ public function execute(Observer $observer)
     {
         $version = $this->productMetadata->getVersion();
         $event = $this->helper->getRewardEvents();
-        /*Check the order_refund event is enabled, if enabled then will send order_refund event to Zinrelo*/
+        /*Check the order_refund event is enabled, if enabled then will send order_refund event to TrueLoyal*/
         if (in_array('order_refund', $event)) {
             try {
                 /*This event should call only for Magento version 2.3.0*/
@@ -169,7 +169,7 @@ public function managePartialRefundItems($itemData, $refundData)
     }
 
     /**
-     * Send request to zinrelo when refund generated
+     * Send request to trueloyal when refund generated
      *
      * @param string $customerEmail
      * @param string $activityId
@@ -179,7 +179,7 @@ public function managePartialRefundItems($itemData, $refundData)
     public function sendRequest($customerEmail, $activityId, $refundData)
     {
         $params = [
-            "member_id" => $customerEmail,
+            "member_id" => $this->helper->getMemberIdentifierValueById(null, $customerEmail),
             "activity_id" => $activityId,
             "data" => $refundData
         ];
diff --git a/Observer/OrderShipped.php b/Observer/OrderShipped.php
index a26c323..5fe4063 100755
--- a/Observer/OrderShipped.php
+++ b/Observer/OrderShipped.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Exception;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Zinrelo\LoyaltyRewards\Helper\OrderComplete;
+use TrueLoyal\LoyaltyRewards\Helper\OrderComplete;
 
 class OrderShipped implements ObserverInterface
 {
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Order shipped event to zinrelo
+     * Order shipped event to trueloyal
      *
      * @param Observer $observer
      * @return bool
@@ -63,7 +63,7 @@ public function execute(Observer $observer)
         $shipment = $observer->getEvent()->getShipment();
         $order = $shipment->getOrder();
         $this->orderCompleteHelper->getCompletedOrder($order);
-        /*Check the order_shipped event is enabled, if enabled then will send order_shipped event to Zinrelo*/
+        /*Check the order_shipped event is enabled, if enabled then will send order_shipped event to TrueLoyal*/
         if (in_array('order_shipped', $event)) {
             if (!$order->canShip()) {
                 try {
@@ -127,7 +127,7 @@ public function execute(Observer $observer)
                     $shipmentItems['order_grand_total'] = (float)$order->getGrandTotal();
                     $shipmentItems['order_base_grand_total'] = (float)$order->getBaseGrandTotal();
                     $params = [
-                        "member_id" => $order->getCustomerEmail(),
+                        "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                         "activity_id" => "order_shipped",
                         "data" => $shipmentItems
                     ];
diff --git a/Observer/OrderUpdate.php b/Observer/OrderUpdate.php
index fa7d0bf..0c15428 100755
--- a/Observer/OrderUpdate.php
+++ b/Observer/OrderUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Event\Observer;
@@ -8,7 +8,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class OrderUpdate implements ObserverInterface
 {
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * Send order update event to zinrelo
+     * Send order update event to trueloyal
      *
      * @param Observer $observer
      * @return bool|void
@@ -61,7 +61,7 @@ public function execute(Observer $observer)
         if (isset($this->request->getParam('history')['comment'])) {
             $id = $this->request->getParam('order_id') ?? $this->restRequest->getParam('id');
             $event = $this->helper->getRewardEvents();
-            /*Check the order_update event is enabled, if enabled then will send order_update event to Zinrelo*/
+            /*Check the order_update event is enabled, if enabled then will send order_update event to TrueLoyal*/
             if (in_array('order_update', $event)) {
                 $order = $this->orderRepository->get($id);
                 $order->getPayment()->setMethodInstance();
@@ -118,7 +118,7 @@ public function execute(Observer $observer)
                 }
                 $orderData['total_qty_ordered'] = (int) $orderData['total_qty_ordered'];
                 $params = [
-                    "member_id" => $order->getCustomerEmail(),
+                    "member_id" => $this->helper->getMemberIdentifierValueById($order->getCustomerId(), $order->getCustomerEmail()),
                     "activity_id" => "order_update",
                     "data" => $orderData
                 ];
diff --git a/Observer/ProductReviewSaveAfter.php b/Observer/ProductReviewSaveAfter.php
index 7c83c18..7f884f8 100755
--- a/Observer/ProductReviewSaveAfter.php
+++ b/Observer/ProductReviewSaveAfter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -8,7 +8,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Review\Model\Review;
 use Magento\Review\Model\ReviewFactory;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class ProductReviewSaveAfter implements ObserverInterface
 {
@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * Product review create/approve event to Zinrelo
+     * Product review create/approve event to TrueLoyal
      *
      * @param Observer $observer
      * @throws NoSuchEntityException
@@ -53,16 +53,16 @@ public function execute(Observer $observer)
         $statusId = $review["status_id"];
         $review = $this->reviewFactory->create()->load($reviewId);
         $reviewData = $review->toArray();
-        $zinreloReview = $this->helper->getZinreloReviewByReviewId($reviewId);
+        $trueloyalReview = $this->helper->getTrueLoyalReviewByReviewId($reviewId);
         if ($statusId == Review::STATUS_APPROVED && in_array('review_approved', $event, true)) {
             $this->sendRequest($reviewData, $productId, $customerId, "review_approved");
         } elseif ($statusId == Review::STATUS_PENDING &&
             in_array('review_submitted', $event, true) &&
-            !$zinreloReview->getSubmittedToZinrelo()
+            !$trueloyalReview->getSubmittedToTrueLoyal()
         ) {
             $this->sendRequest($reviewData, $productId, $customerId, "review_submitted");
             try {
-                $zinreloReview->setSubmittedToZinrelo(1)->setReviewId($reviewId)->save();
+                $trueloyalReview->setSubmittedToTrueLoyal(1)->setReviewId($reviewId)->save();
             } catch (CouldNotSaveException $e) {
                 $this->helper->addErrorLog($e->getMessage());
             }
@@ -71,7 +71,7 @@ public function execute(Observer $observer)
     }
 
     /**
-     * Send review created - approved event to Zinrelo
+     * Send review created - approved event to TrueLoyal
      *
      * @param array $reviewData
      * @param int $productId
@@ -89,7 +89,7 @@ public function sendRequest($reviewData, $productId, $customerId, $activityId):
         $reviewData['product_image_url'] = $productInfo['product_image_url'];
         $reviewData['category_name'] = $this->helper->getCategoryName($productId);
         $params = [
-            "member_id" => $this->helper->getCustomerEmailById($customerId),
+            "member_id" => $this->helper->getMemberIdentifierValueById($customerId),
             "activity_id" => $activityId,
             "data" => $reviewData
         ];
diff --git a/Observer/RemoveZinreloDiscount.php b/Observer/RemoveTrueLoyalDiscount.php
similarity index 66%
rename from Observer/RemoveZinreloDiscount.php
rename to Observer/RemoveTrueLoyalDiscount.php
index d8769a1..104bab8 100755
--- a/Observer/RemoveZinreloDiscount.php
+++ b/Observer/RemoveTrueLoyalDiscount.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Observer;
+namespace TrueLoyal\LoyaltyRewards\Observer;
 
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
-class RemoveZinreloDiscount implements ObserverInterface
+class RemoveTrueLoyalDiscount implements ObserverInterface
 {
     /**
      * @var CheckoutSession
@@ -21,7 +21,7 @@ class RemoveZinreloDiscount implements ObserverInterface
     private $helper;
 
     /**
-     * Remove Zinrelo Discount constructor.
+     * Remove TrueLoyal Discount constructor.
      *
      * @param CheckoutSession $checkoutSession
      * @param Data $helper
@@ -44,24 +44,24 @@ public function __construct(
     public function execute(Observer $observer)
     {
         $quote = $this->checkoutSession->getQuote();
-        $zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($quote->getId());
-        if ($zinreloQuote->getIsAbandonedCartSent() || $zinreloQuote->getIsAbandonedCartSent() === null) {
+        $trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($quote->getId());
+        if ($trueloyalQuote->getIsAbandonedCartSent() || $trueloyalQuote->getIsAbandonedCartSent() === null) {
             $this->helper->setAbandonedCartSent($quote->getId(), 2);
         }
 
         $cart = $observer->getEvent()->getCart();
         if ($cart->getItemsCount() > 1) {
             return true;
-        } elseif ($cart->getItemsCount() === 1 && $zinreloQuote->getRedeemRewardDiscount()) {
+        } elseif ($cart->getItemsCount() === 1 && $trueloyalQuote->getRedeemRewardDiscount()) {
             foreach ($quote->getAllItems() as $item) {
-                $zinreloQuoteItem = $this->helper->getZinreloQuoteItemByItemId($item->getId());
-                if ($zinreloQuoteItem->getIsZinreloFreeProduct()) {
+                $trueloyalQuoteItem = $this->helper->getTrueLoyalQuoteItemByItemId($item->getId());
+                if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) {
                     $this->helper->sendRejectRewardRequest($quote);
                     $quote->delete();
                     return true;
                 }
             }
-        } elseif ($cart->getItemsCount() === 0 && $zinreloQuote->getRedeemRewardDiscount()) {
+        } elseif ($cart->getItemsCount() === 0 && $trueloyalQuote->getRedeemRewardDiscount()) {
             $this->helper->sendRejectRewardRequest($quote);
             return true;
         }
diff --git a/Plugin/Cart/DisableQty.php b/Plugin/Cart/DisableQty.php
index 39c013d..b82a7d4 100755
--- a/Plugin/Cart/DisableQty.php
+++ b/Plugin/Cart/DisableQty.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Plugin\Cart;
+namespace TrueLoyal\LoyaltyRewards\Plugin\Cart;
 
 use Magento\Checkout\Block\Cart\AbstractCart;
 use Magento\Checkout\Model\Session as CheckoutSession;
-use Zinrelo\LoyaltyRewards\Helper\Config as ZinreloHelper;
+use TrueLoyal\LoyaltyRewards\Helper\Config as TrueLoyalHelper;
 
 class DisableQty
 {
@@ -13,22 +13,22 @@ class DisableQty
      */
     private $checkoutSession;
     /**
-     * @var ZinreloHelper
+     * @var TrueLoyalHelper
      */
-    private $zinreloHelper;
+    private $trueloyalHelper;
 
     /**
      * Disable Qty for Free product
      *
      * @param CheckoutSession $checkoutSession
-     * @param ZinreloHelper $zinreloHelper
+     * @param TrueLoyalHelper $trueloyalHelper
      */
     public function __construct(
         CheckoutSession $checkoutSession,
-        ZinreloHelper $zinreloHelper
+        TrueLoyalHelper $trueloyalHelper
     ) {
         $this->checkoutSession = $checkoutSession;
-        $this->zinreloHelper = $zinreloHelper;
+        $this->trueloyalHelper = $trueloyalHelper;
     }
 
     /**
@@ -44,13 +44,13 @@ public function afterGetItemRenderer(AbstractCart $subject, $result)
         $quote = $this->checkoutSession->getQuote();
         $items = $quote->getAllItems();
         foreach ($items as $item) {
-            $zinreloQuoteItem = $this->zinreloHelper->getZinreloQuoteItemByItemId($item->getId());
-            if ($zinreloQuoteItem->getIsZinreloFreeProduct()) {
+            $trueloyalQuoteItem = $this->trueloyalHelper->getTrueLoyalQuoteItemByItemId($item->getId());
+            if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) {
                 $isFreeProduct = true;
             }
         }
         if ($isFreeProduct) {
-            $result->setTemplate('Zinrelo_LoyaltyRewards::cart/item/default.phtml');
+            $result->setTemplate('TrueLoyal_LoyaltyRewards::cart/item/default.phtml');
         }
         return $result;
     }
diff --git a/Plugin/Checkout/CustomerData/AroundPluginDefaultItem.php b/Plugin/Checkout/CustomerData/AroundPluginDefaultItem.php
index 7bdc97d..5e4c669 100755
--- a/Plugin/Checkout/CustomerData/AroundPluginDefaultItem.php
+++ b/Plugin/Checkout/CustomerData/AroundPluginDefaultItem.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Plugin\Checkout\CustomerData;
+namespace TrueLoyal\LoyaltyRewards\Plugin\Checkout\CustomerData;
 
 use Closure;
 use Magento\Quote\Model\Quote\Item;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class AroundPluginDefaultItem
 {
@@ -50,8 +50,8 @@ protected function isQtyBoxEnabled($item)
     {
         $productId = $this->helperData->getFreeProduct();
         if ($productId) {
-            $zinreloQuoteItem = $this->helperData->getZinreloQuoteItemByItemId($item->getId());
-            if ($zinreloQuoteItem->getIsZinreloFreeProduct() == 1) {
+            $trueloyalQuoteItem = $this->helperData->getTrueLoyalQuoteItemByItemId($item->getId());
+            if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct() == 1) {
                 return 0;
             }
         }
diff --git a/Plugin/Checkout/CustomerData/DefaultItem.php b/Plugin/Checkout/CustomerData/DefaultItem.php
index ddcfc13..672ca5c 100644
--- a/Plugin/Checkout/CustomerData/DefaultItem.php
+++ b/Plugin/Checkout/CustomerData/DefaultItem.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Plugin\Checkout\CustomerData;
+namespace TrueLoyal\LoyaltyRewards\Plugin\Checkout\CustomerData;
 
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Helper\Product\ConfigurationPool;
 use Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface;
 use Magento\Framework\Escaper;
 use Magento\Framework\UrlInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 use Magento\Checkout\CustomerData\DefaultItem as MainDefaultItem;
 use Magento\Msrp\Helper\Data as MsrpData;
 use Magento\Checkout\Helper\Data as CheckoutData;
@@ -76,7 +76,7 @@ protected function isQtyBoxEnabled($item)
     {
         $productId = $this->helper->getFreeProduct();
         if ($productId) {
-            if ($item->getIsZinreloFreeProduct() == 1) {
+            if ($item->getIsTrueLoyalFreeProduct() == 1) {
                 return 0;
             }
         }
diff --git a/Setup/Patch/Data/RewardPoint.php b/Setup/Patch/Data/RewardPoint.php
index c0ef2b5..74a63b8 100755
--- a/Setup/Patch/Data/RewardPoint.php
+++ b/Setup/Patch/Data/RewardPoint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Setup\Patch\Data;
+namespace TrueLoyal\LoyaltyRewards\Setup\Patch\Data;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\ResourceModel\Attribute;
@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class RewardPoint implements DataPatchInterface
 {
@@ -107,10 +107,10 @@ public function apply()
                 'adminhtml_customer'
             ]);
             $this->attributeResource->save($attribute);
-            /*Set attribute as Zinrelo*/
+            /*Set attribute as TrueLoyal*/
             $attributeId = $this->helper->getCustomerAttributeId($attributeCode);
-            $eavAttribute = $this->helper->getZinreloAttributeByAttributeId($attributeId);
-            $eavAttribute->setAttributeId($attributeId)->setIsZinreloAttribute(1)->save();
+            $eavAttribute = $this->helper->getTrueLoyalAttributeByAttributeId($attributeId);
+            $eavAttribute->setAttributeId($attributeId)->setIsTrueLoyalAttribute(1)->save();
         }
         $this->moduleDataSetup->getConnection()->endSetup();
     }
diff --git a/Setup/Patch/Schema/DefaultTabelUpdate.php b/Setup/Patch/Schema/DefaultTabelUpdate.php
index b9ca42b..38591ed 100644
--- a/Setup/Patch/Schema/DefaultTabelUpdate.php
+++ b/Setup/Patch/Schema/DefaultTabelUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Zinrelo\LoyaltyRewards\Setup\Patch\Schema;
+namespace TrueLoyal\LoyaltyRewards\Setup\Patch\Schema;
 
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
@@ -71,32 +71,32 @@ public function apply()
         $quoteItemColumn = [
             'type' => Table::TYPE_SMALLINT,
             ['unsigned' => true, 'nullable' => false, 'identity' => false, 'default' => "0"],
-            'comment' => 'Is Zinrelo Free Product',
+            'comment' => 'Is TrueLoyal Free Product',
         ];
-        $connection->addColumn($quoteItemTable, 'is_zinrelo_free_product', $quoteItemColumn);
+        $connection->addColumn($quoteItemTable, 'is_trueloyal_free_product', $quoteItemColumn);
 
         /*customer_eav_attribute*/
         $customerEavAttributeTable = $installer->getTable('customer_eav_attribute');
         $customerEavAttributeColumn = [
             'type' => Table::TYPE_SMALLINT,
             ['unsigned' => true, 'nullable' => false, 'identity' => false, 'default' => "0"],
-            'comment' => 'Is Zinrelo Attribute',
+            'comment' => 'Is TrueLoyal Attribute',
         ];
-        $connection->addColumn($customerEavAttributeTable, 'is_zinrelo_attribute', $customerEavAttributeColumn);
+        $connection->addColumn($customerEavAttributeTable, 'is_trueloyal_attribute', $customerEavAttributeColumn);
 
         /*eav_attribute*/
         $eavAttributeTable = $installer->getTable('eav_attribute');
         $eavAttributeColumn = [
             'type' => Table::TYPE_SMALLINT,
             ['unsigned' => true, 'nullable' => false, 'identity' => false, 'default' => "0"],
-            'comment' => 'Is Zinrelo Attribute',
+            'comment' => 'Is TrueLoyal Attribute',
         ];
-        $connection->addColumn($eavAttributeTable, 'is_zinrelo_attribute', $eavAttributeColumn);
+        $connection->addColumn($eavAttributeTable, 'is_trueloyal_attribute', $eavAttributeColumn);
 
         /*sales_order*/
         $salesOrderTable = $installer->getTable('sales_order');
         $salesOrderColumns = [
-            'zinrelo_reward' => [
+            'trueloyal_reward' => [
                 'type' => Table::TYPE_TEXT,
                 'nullable' => true,
                 'comment' => 'Add applied reward rule data',
@@ -104,7 +104,7 @@ public function apply()
             'complete_request_sent' => [
                 'type' => Table::TYPE_SMALLINT,
                 ['unsigned' => true, 'nullable' => false, 'identity' => false, 'default' => "0"],
-                'comment' => 'Is order complete request sent to Zinrelo',
+                'comment' => 'Is order complete request sent to TrueLoyal',
             ]
         ];
         foreach ($salesOrderColumns as $name => $definition) {
@@ -116,9 +116,9 @@ public function apply()
         $reviewColumn = [
             'type' => Table::TYPE_SMALLINT,
             ['unsigned' => true, 'nullable' => false, 'identity' => false, 'default' => "0"],
-            'comment' => 'Is product review submitted Zinrelo',
+            'comment' => 'Is product review submitted TrueLoyal',
         ];
-        $connection->addColumn($reviewTable, 'submitted_to_zinrelo', $reviewColumn);
+        $connection->addColumn($reviewTable, 'submitted_to_trueloyal', $reviewColumn);
 
         $installer->endSetup();
     }
diff --git a/ViewModel/ProductView.php b/ViewModel/ProductView.php
index c440673..4a613a0 100755
--- a/ViewModel/ProductView.php
+++ b/ViewModel/ProductView.php
@@ -1,8 +1,8 @@
 <?php
-namespace Zinrelo\LoyaltyRewards\ViewModel;
+namespace TrueLoyal\LoyaltyRewards\ViewModel;
 
 use Magento\Framework\View\Element\Block\ArgumentInterface;
-use Zinrelo\LoyaltyRewards\Helper\Data;
+use TrueLoyal\LoyaltyRewards\Helper\Data;
 
 class ProductView implements ArgumentInterface
 {
diff --git a/composer.json b/composer.json
index 4dd475d..f8ef360 100755
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "zinrelo/extension",
-    "description": "Zinrelo Reward Point Integration Extension",
+    "name": "trueloyal/extension",
+    "description": "TrueLoyal Reward Point Integration Extension",
     "type": "magento2-module",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "require": {
         "php": "~7.2.0||~7.3.0||~7.4.0||~8.0.0||~8.1.0||~8.2.0||~8.3.0",
         "firebase/php-jwt": "*"
@@ -16,7 +16,7 @@
             "registration.php"
         ],
         "psr-4": {
-            "Zinrelo\\LoyaltyRewards\\": ""
+            "TrueLoyal\\LoyaltyRewards\\": ""
         }
     }
 }
diff --git a/etc/acl.xml b/etc/acl.xml
index 4b889c8..50d2601 100755
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -7,7 +7,7 @@
                 <resource id="Magento_Backend::stores">
                     <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_Config::config">
-                            <resource id="Zinrelo_LoyaltyRewards::config" title="Loyalty Rewards" translate="title" sortOrder="5"/>
+                            <resource id="TrueLoyal_LoyaltyRewards::config" title="Loyalty Rewards" translate="title" sortOrder="5"/>
                         </resource>
                     </resource>
                 </resource>
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index 154fb8c..5d38552 100755
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Customer\Block\Adminhtml\Group\Edit\Form" type="Zinrelo\LoyaltyRewards\Block\Adminhtml\Group\Edit\Form" />  
+    <preference for="Magento\Customer\Block\Adminhtml\Group\Edit\Form" type="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Group\Edit\Form" />  
 </config>
diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml
index b5a17a8..b8a64a3 100755
--- a/etc/adminhtml/events.xml
+++ b/etc/adminhtml/events.xml
@@ -2,6 +2,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="checkout_submit_all_after">
-        <observer name="orderCreateAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\AdminOrderCreate" />
+        <observer name="orderCreateAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\AdminOrderCreate" />
     </event>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 5ca4244..79cca5e 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <tab id="zinrelo_loyaltyRewards" sortOrder="999" translate="label">
-            <label>Zinrelo Loyalty Rewards</label>
+        <tab id="trueloyal_loyaltyRewards" sortOrder="999" translate="label">
+            <label>TrueLoyal Loyalty Rewards</label>
         </tab>
-        <section id="zinrelo_loyaltyRewards" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
-            <label>Zinrelo Settings</label>
-            <tab>zinrelo_loyaltyRewards</tab>
-            <resource>Zinrelo_LoyaltyRewards::config</resource>
+        <section id="trueloyal_loyaltyRewards" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
+            <label>TrueLoyal Settings</label>
+            <tab>trueloyal_loyaltyRewards</tab>
+            <resource>TrueLoyal_LoyaltyRewards::config</resource>
             <group id="settings" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
                 <label>Settings</label>
                 <field id="loyalty_rewards_active" showInDefault="1" showInStore="0" showInWebsite="1" sortOrder="10" translate="label" type="select">
@@ -31,7 +31,7 @@
                     <label>Add Partner id</label>
                     <comment>
                         <![CDATA[
-                            To get <strong>Partner id</strong> refer to <a href="https://help.zinrelo.com/reference/authentication" target="_blank">URL</a>.
+                            To get <strong>Partner id</strong> refer to <a href="https://help.trueloyal.com/reference/authentication" target="_blank">URL</a>.
                         ]]>
                     </comment>
                     <depends>
@@ -43,7 +43,7 @@
                     <label>Add API Key</label>
                     <comment>
                         <![CDATA[
-                            To get <strong>API Key</strong> refer to <a href="https://help.zinrelo.com/reference/authentication" target="_blank">URL</a>.
+                            To get <strong>API Key</strong> refer to <a href="https://help.trueloyal.com/reference/authentication" target="_blank">URL</a>.
                         ]]>
                     </comment>
                     <depends>
@@ -55,7 +55,7 @@
                     <label>Add API Key Identifier</label>
                     <comment>
                         <![CDATA[
-                            To get <strong>API Key Identifier</strong> refer to <a href="https://help.zinrelo.com/reference/web-api-authentication#where-can-i-find-api-key-and-api-key-identifier" target="_blank">URL</a>.
+                            To get <strong>API Key Identifier</strong> refer to <a href="https://help.trueloyal.com/reference/web-api-authentication#where-can-i-find-api-key-and-api-key-identifier" target="_blank">URL</a>.
                         ]]>
                     </comment>
                     <depends>
@@ -79,7 +79,7 @@
                     </depends>
                     <comment>
                         <![CDATA[
-                            Please note that this will remove Zinrelo dashboard as well as points on product page for all guest users.
+                            Please note that this will remove TrueLoyal dashboard as well as points on product page for all guest users.
                         ]]>
                     </comment>
                 </field>
@@ -151,8 +151,8 @@
                 <field id="reward_events" translate="label" type="multiselect" sortOrder="60" showInDefault="1"
                        showInWebsite="1" showInStore="0">
                     <label>Reward Events</label>
-                    <source_model>Zinrelo\LoyaltyRewards\Model\System\Config\EventsSelection</source_model>
-                    <comment>Only selected events will be sent to Zinrelo</comment>
+                    <source_model>TrueLoyal\LoyaltyRewards\Model\System\Config\EventsSelection</source_model>
+                    <comment>Only selected events will be sent to TrueLoyal</comment>
                     <depends>
                         <field id="loyalty_rewards_active">1</field>
                     </depends>
@@ -175,6 +175,49 @@
                     <label>Languages(Locale)</label>
                     <comment>Value Pass Like : {"fr": "french", "es": "spanish", "hi": "custom language one"}</comment>
                 </field>
+
+                <field id="preferred_language" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50" translate="label" type="select">
+                    <label>Preferred Language</label>
+                    <comment>
+                        <![CDATA[
+                            Select the preferred language from the available ones in TrueLoyal. This language will be used in the customer's EUD.<br>
+                            Make sure the Rewards and Activities are translated into this language.<br>
+                            This field is optional. If not selected, the preferred language will be the default one in TrueLoyal.
+                        ]]>
+                    </comment>
+                    <source_model>TrueLoyal\LoyaltyRewards\Model\System\Config\PreferredLanguage</source_model>
+                </field>
+
+                <field id="member_identifier_prefix" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="74" translate="label" type="text">
+                    <label>Member Identifier Prefix</label>
+                    <comment>This field is optional.</comment>
+                </field>
+
+                <field id="member_identifier" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="75" translate="label" type="select">
+                    <label>Member Identifier</label>
+                    <comment>Choose whether to use Member ID or Member Email when sending requests to TrueLoyal.</comment>
+                    <source_model>TrueLoyal\LoyaltyRewards\Model\System\Config\MemberIdentifier</source_model>
+                </field>
+
+                <group id="custom_member_attributes" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="80" translate="label">
+                    <label>Custom Member Attributes</label>
+                    <comment>
+                        <![CDATA[
+                            This field is optional<br>
+                            Enter names of TrueLoyal Member Custom Attributes corresponding to Magento data fields below.<br>
+                            <strong>Note:</strong> These custom attributes must be created in TrueLoyal before typing them here.
+                        ]]>
+                    </comment>
+                    <field id="store_id" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="text">
+                        <label>Store ID</label>
+                    </field>
+                    <field id="store_code" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
+                        <label>Store Code</label>
+                    </field>
+                    <field id="store_currency" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label" type="text">
+                        <label>Store Currency</label>
+                    </field>
+                </group>
             </group>
         </section>
     </system>
diff --git a/etc/config.xml b/etc/config.xml
index 4952fe4..a2e0e18 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -2,30 +2,30 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <zinrelo_loyaltyRewards>
+        <trueloyal_loyaltyRewards>
             <settings>
-                <live_web_hook_url>https://api.zinrelo.com/v2/loyalty/</live_web_hook_url>
-                <webhook_integration_url>https://api.zinrelo.com/v2/loyalty/integrations</webhook_integration_url>
+                <live_web_hook_url>https://api.trueloyal.com/v2/loyalty/</live_web_hook_url>
+                <webhook_integration_url>https://api.trueloyal.com/v2/loyalty/integrations</webhook_integration_url>
                 <abandoned_cart_time>30</abandoned_cart_time>
                 <product_page_reward_label>Earn {{EARN_POINTS}} points by ordering this product.</product_page_reward_label>
                 <cart_page_reward_label>Earn {{EARN_POINTS}} points by ordering this product.</cart_page_reward_label>
                 <cart_page_reward_dropdown_label>You have {{AVAILABLE_POINTS}} points. Select your reward to redeem.</cart_page_reward_dropdown_label>
                 <free_shipping_label>Reward</free_shipping_label>
             </settings>
-        </zinrelo_loyaltyRewards>
+        </trueloyal_loyaltyRewards>
         <carriers>
-            <zinrelorate>
+            <trueloyalrate>
                 <active>1</active>
-                <model>Zinrelo\LoyaltyRewards\Model\Carrier\ZinreloShipping</model>
+                <model>TrueLoyal\LoyaltyRewards\Model\Carrier\TrueLoyalShipping</model>
                 <name>Free Shipping</name>
                 <price>00.00</price>
                 <title>Free Shipping</title>
-            </zinrelorate>
+            </trueloyalrate>
         </carriers>
-        <zinrelo_loyaltyRewards>
+        <trueloyal_loyaltyRewards>
             <settings>
                 <auto_enrollment>1</auto_enrollment>
             </settings>
-        </zinrelo_loyaltyRewards>
+        </trueloyal_loyaltyRewards>
     </default>
 </config>
diff --git a/etc/crontab.xml b/etc/crontab.xml
index 10dc0b4..b7fe3a3 100755
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
-        <job instance="Zinrelo\LoyaltyRewards\Cron\RejectRedeemReward" method="execute" name="zinrelo_abandoned_cart_cron">
+        <job instance="TrueLoyal\LoyaltyRewards\Cron\RejectRedeemReward" method="execute" name="trueloyal_abandoned_cart_cron">
             <schedule>* * * * *</schedule>
         </job>
     </group>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index 3dfa28b..1581cec 100755
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -4,9 +4,9 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="uniqueId" type="host">https://app.zinrelo.com</value>
-                <value id="appzinrelo" type="host">app.zinrelo.com</value>
-                <value id="zinrelo" type="host">https://cdn.zinrelo.com/js/all.js</value>
+                <value id="uniqueId" type="host">https://app.trueloyal.com</value>
+                <value id="apptrueloyal" type="host">app.trueloyal.com</value>
+                <value id="trueloyal" type="host">https://cdn.trueloyal.com/js/all.js</value>
             </values>
         </policy>
     </policies>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index ee93c71..92e72aa 100755
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
-    <table name="zinrelo_quote" resource="checkout" engine="innodb" comment="Zinrelo Quote related data">
+    <table name="trueloyal_quote" resource="checkout" engine="innodb" comment="TrueLoyal Quote related data">
         <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="ID"/>
         <column xsi:type="varchar" name="redeem_reward_discount" nullable="true" length="255" comment="Redeem Reward Discount"/>
@@ -9,61 +9,61 @@
         <column xsi:type="smallint" name="is_abandoned_cart_sent" unsigned="true" nullable="true" identity="false" comment="Is abandoned cart request sent"/>
         <column xsi:type="int" name="quote_id" unsigned="true" nullable="false" identity="false"
                 comment="Quote ID"/>
-        <constraint xsi:type="foreign" referenceId="ZINRELO_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID" table="zinrelo_quote"
+        <constraint xsi:type="foreign" referenceId="TRUELOYAL_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID" table="trueloyal_quote"
                     column="quote_id" referenceTable="quote" referenceColumn="entity_id" onDelete="CASCADE"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
     </table>
-    <table name="zinrelo_quote_item" resource="checkout" engine="innodb" comment="Zinrelo Quote item related data">
+    <table name="trueloyal_quote_item" resource="checkout" engine="innodb" comment="TrueLoyal Quote item related data">
         <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="ID"/>
-        <column xsi:type="smallint" name="is_zinrelo_free_product" unsigned="true" nullable="false" identity="false" default="0" comment="Is Zinrelo Free Product"/>
+        <column xsi:type="smallint" name="is_trueloyal_free_product" unsigned="true" nullable="false" identity="false" default="0" comment="Is TrueLoyal Free Product"/>
         <column xsi:type="int" name="quote_item_id" unsigned="true" nullable="false" identity="false"
                 comment="Quote Item ID"/>
-        <constraint xsi:type="foreign" referenceId="ZINRELO_QUOTE_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
-                    table="zinrelo_quote_item"
+        <constraint xsi:type="foreign" referenceId="TRUELOYAL_QUOTE_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
+                    table="trueloyal_quote_item"
                     column="quote_item_id" referenceTable="quote_item" referenceColumn="item_id" onDelete="CASCADE"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
     </table>
-    <table name="zinrelo_sales_order" resource="sales" engine="innodb" comment="Zinrelo Order related data">
+    <table name="trueloyal_sales_order" resource="sales" engine="innodb" comment="TrueLoyal Order related data">
         <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
                 comment="ID"/>
-        <column xsi:type="text" name="zinrelo_reward" nullable="true" comment="Add applied reward rule data"/>
-        <column xsi:type="smallint" name="complete_request_sent" unsigned="true" nullable="false" identity="false" default="0" comment="Is order complete request sent to Zinrelo"/>
+        <column xsi:type="text" name="trueloyal_reward" nullable="true" comment="Add applied reward rule data"/>
+        <column xsi:type="smallint" name="complete_request_sent" unsigned="true" nullable="false" identity="false" default="0" comment="Is order complete request sent to TrueLoyal"/>
         <column xsi:type="int" name="order_id" unsigned="true" nullable="false" identity="false"
                 comment="Order ID"/>
-        <constraint xsi:type="foreign" referenceId="ZINRELO_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID"
-                    table="zinrelo_sales_order"
+        <constraint xsi:type="foreign" referenceId="TRUELOYAL_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID"
+                    table="trueloyal_sales_order"
                     column="order_id" referenceTable="sales_order" referenceColumn="entity_id" onDelete="CASCADE"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
     </table>
-    <table name="zinrelo_review" resource="default" engine="innodb" comment="Review base information">
+    <table name="trueloyal_review" resource="default" engine="innodb" comment="Review base information">
         <column xsi:type="bigint" name="id" unsigned="true" nullable="false" identity="true"
                 comment="ID"/>
-        <column xsi:type="smallint" name="submitted_to_zinrelo" unsigned="true" nullable="false" identity="false" default="0" comment="Is product review submitted Zinrelo"/>
+        <column xsi:type="smallint" name="submitted_to_trueloyal" unsigned="true" nullable="false" identity="false" default="0" comment="Is product review submitted TrueLoyal"/>
         <column xsi:type="bigint" name="review_id" unsigned="true" nullable="false" identity="false"
                 comment="Review ID"/>
-        <constraint xsi:type="foreign" referenceId="ZINRELO_REVIEW_REVIEW_ID_REVIEW_REVIEW_ID" table="zinrelo_review"
+        <constraint xsi:type="foreign" referenceId="TRUELOYAL_REVIEW_REVIEW_ID_REVIEW_REVIEW_ID" table="trueloyal_review"
                     column="review_id" referenceTable="review" referenceColumn="review_id" onDelete="CASCADE"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
         </constraint>
     </table>
-    <table name="zinrelo_eav_attribute" resource="default" engine="innodb" comment="Eav Attribute">
+    <table name="trueloyal_eav_attribute" resource="default" engine="innodb" comment="Eav Attribute">
         <column xsi:type="smallint" name="id" unsigned="true" nullable="false" identity="true"
                 comment="ID"/>
-        <column xsi:type="smallint" name="is_zinrelo_attribute" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Is Zinrelo Attribute"/>
+        <column xsi:type="smallint" name="is_trueloyal_attribute" unsigned="true" nullable="false" identity="false"
+                default="0" comment="Is TrueLoyal Attribute"/>
         <column xsi:type="smallint" name="attribute_id" unsigned="true" nullable="false" identity="false"
                 comment="Attribute ID"/>
         <constraint xsi:type="foreign"
-                    referenceId="ZINRELO_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
-                    table="zinrelo_eav_attribute" column="attribute_id"
+                    referenceId="TRUELOYAL_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID"
+                    table="trueloyal_eav_attribute" column="attribute_id"
                     referenceTable="eav_attribute" referenceColumn="attribute_id" onDelete="CASCADE"
         />
         <constraint xsi:type="primary" referenceId="PRIMARY">
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
index 3725be2..994cdba 100755
--- a/etc/db_schema_whitelist.json
+++ b/etc/db_schema_whitelist.json
@@ -1,5 +1,5 @@
 {
-    "zinrelo_quote": {
+    "trueloyal_quote": {
         "column": {
             "id": true,
             "redeem_reward_discount": true,
@@ -8,52 +8,52 @@
             "quote_id": true
         },
         "constraint": {
-            "ZINRELO_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID": true,
+            "TRUELOYAL_QUOTE_QUOTE_ID_QUOTE_ENTITY_ID": true,
             "PRIMARY": true
         }
     },
-    "zinrelo_quote_item": {
+    "trueloyal_quote_item": {
         "column": {
             "id": true,
-            "is_zinrelo_free_product": true,
+            "is_trueloyal_free_product": true,
             "quote_item_id": true
         },
         "constraint": {
-            "ZINRELO_QUOTE_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true,
+            "TRUELOYAL_QUOTE_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true,
             "PRIMARY": true
         }
     },
-    "zinrelo_sales_order": {
+    "trueloyal_sales_order": {
         "column": {
             "id": true,
-            "zinrelo_reward": true,
+            "trueloyal_reward": true,
             "complete_request_sent": true,
             "order_id": true
         },
         "constraint": {
-            "ZINRELO_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
+            "TRUELOYAL_SALES_ORDER_ORDER_ID_SALES_ORDER_ENTITY_ID": true,
             "PRIMARY": true
         }
     },
-    "zinrelo_review": {
+    "trueloyal_review": {
         "column": {
             "id": true,
-            "submitted_to_zinrelo": true,
+            "submitted_to_trueloyal": true,
             "review_id": true
         },
         "constraint": {
-            "ZINRELO_REVIEW_REVIEW_ID_REVIEW_REVIEW_ID": true,
+            "TRUELOYAL_REVIEW_REVIEW_ID_REVIEW_REVIEW_ID": true,
             "PRIMARY": true
         }
     },
-    "zinrelo_eav_attribute": {
+    "trueloyal_eav_attribute": {
         "column": {
             "id": true,
-            "is_zinrelo_attribute": true,
+            "is_trueloyal_attribute": true,
             "attribute_id": true
         },
         "constraint": {
-            "ZINRELO_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
+            "TRUELOYAL_EAV_ATTRIBUTE_ATTRIBUTE_ID_EAV_ATTRIBUTE_ATTRIBUTE_ID": true,
             "PRIMARY": true
         }
     }
diff --git a/etc/di.xml b/etc/di.xml
index d37fed1..d163c69 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <!--Create customer attribute from api-->
-    <preference for="Zinrelo\LoyaltyRewards\Api\CustomerAttributeInterface" type="Zinrelo\LoyaltyRewards\Model\Api\CustomerAttribute"/>
+    <preference for="TrueLoyal\LoyaltyRewards\Api\CustomerAttributeInterface" type="TrueLoyal\LoyaltyRewards\Model\Api\CustomerAttribute"/>
 
     <!--Update customer attribute from api-->
-    <preference for="Zinrelo\LoyaltyRewards\Api\CustomerAttributeUpdateInterface" type="Zinrelo\LoyaltyRewards\Model\Api\CustomerAttributeUpdate"/>
+    <preference for="TrueLoyal\LoyaltyRewards\Api\CustomerAttributeUpdateInterface" type="TrueLoyal\LoyaltyRewards\Model\Api\CustomerAttributeUpdate"/>
 
-    <!--<preference for="Magento\Checkout\CustomerData\DefaultItem" type="Zinrelo\LoyaltyRewards\Plugin\Checkout\CustomerData\DefaultItem"/>-->
+    <!--<preference for="Magento\Checkout\CustomerData\DefaultItem" type="TrueLoyal\LoyaltyRewards\Plugin\Checkout\CustomerData\DefaultItem"/>-->
     <type name="Magento\Checkout\CustomerData\DefaultItem">
-        <plugin name="zinrelo_add" type="Zinrelo\LoyaltyRewards\Plugin\Checkout\CustomerData\AroundPluginDefaultItem" disabled="false" sortOrder="10"/>
+        <plugin name="trueloyal_add" type="TrueLoyal\LoyaltyRewards\Plugin\Checkout\CustomerData\AroundPluginDefaultItem" disabled="false" sortOrder="10"/>
     </type>
     <!-- We need to use prefrences due to backward compatibility of M230  otherwise not need. The parseHeaders function is a protected of its class.-->
-    <preference for="Magento\Framework\HTTP\Client\Curl" type="Zinrelo\LoyaltyRewards\Framework\HTTP\Client\Curl"/>
+    <preference for="Magento\Framework\HTTP\Client\Curl" type="TrueLoyal\LoyaltyRewards\Framework\HTTP\Client\Curl"/>
 
     <!--Disable quantity box on checkout/cart page-->
     <type name="Magento\Checkout\Block\Cart\AbstractCart">
-        <plugin name="item-disable-qty" type="Zinrelo\LoyaltyRewards\Plugin\Cart\DisableQty" sortOrder="1"/>
+        <plugin name="item-disable-qty" type="TrueLoyal\LoyaltyRewards\Plugin\Cart\DisableQty" sortOrder="1"/>
     </type>
 
-    <!-- Adding log file for Zinrelo log -->
-    <type name="Zinrelo\LoyaltyRewards\Logger\Handler">
+    <!-- Adding log file for TrueLoyal log -->
+    <type name="TrueLoyal\LoyaltyRewards\Logger\Handler">
         <arguments>
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
         </arguments>
     </type>
-    <type name="Zinrelo\LoyaltyRewards\Logger\Logger">
+    <type name="TrueLoyal\LoyaltyRewards\Logger\Logger">
         <arguments>
-            <argument name="name" xsi:type="string">zinreloLog</argument>
+            <argument name="name" xsi:type="string">trueloyalLog</argument>
             <argument name="handlers"  xsi:type="array">
-                <item name="system" xsi:type="object">Zinrelo\LoyaltyRewards\Logger\Handler</item>
+                <item name="system" xsi:type="object">TrueLoyal\LoyaltyRewards\Logger\Handler</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/events.xml b/etc/events.xml
index 9edea2d..bd809ab 100755
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -3,64 +3,64 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <!-- Manage free product price after free-product redemption -->
     <event name="checkout_cart_product_add_after">
-        <observer name="free_product" instance="Zinrelo\LoyaltyRewards\Observer\AddFreeProduct"/>
+        <observer name="free_product" instance="TrueLoyal\LoyaltyRewards\Observer\AddFreeProduct"/>
     </event>
-    <!-- After Customer save our code will run to send customer create/update api to Zinrelo -->
+    <!-- After Customer save our code will run to send customer create/update api to TrueLoyal -->
     <event name="customer_save_commit_after">
-        <observer name="customerSaveAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\CustomerSaveAfter" />
+        <observer name="customerSaveAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\CustomerSaveAfter" />
     </event>
-    <!-- After Customer address save our code will run to send customer create/update api to Zinrelo -->
+    <!-- After Customer address save our code will run to send customer create/update api to TrueLoyal -->
     <event name="customer_address_save_commit_after">
-        <observer name="customerAddressSaveAfter" instance="Zinrelo\LoyaltyRewards\Observer\CustomerSaveAfter" />
+        <observer name="customerAddressSaveAfter" instance="TrueLoyal\LoyaltyRewards\Observer\CustomerSaveAfter" />
     </event>
-    <!-- After Customer address develete our code will run to send customer update api to Zinrelo -->
+    <!-- After Customer address develete our code will run to send customer update api to TrueLoyal -->
     <event name="customer_address_delete_commit_after">
-        <observer name="customerAddressDeleteAfter" instance="Zinrelo\LoyaltyRewards\Observer\CustomerSaveAfter" />
+        <observer name="customerAddressDeleteAfter" instance="TrueLoyal\LoyaltyRewards\Observer\CustomerSaveAfter" />
     </event>
-    <!-- Send review create-approve event to zinrelo -->
+    <!-- Send review create-approve event to trueloyal -->
     <event name="review_save_commit_after">
-        <observer name="productReviewSaveAfter" instance="Zinrelo\LoyaltyRewards\Observer\ProductReviewSaveAfter" />
+        <observer name="productReviewSaveAfter" instance="TrueLoyal\LoyaltyRewards\Observer\ProductReviewSaveAfter" />
     </event>
     <!-- Remove free product from cart when all item removed -->
     <event name="checkout_cart_save_after">
-        <observer name="removeZinreloDiscountZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\RemoveZinreloDiscount"/>
+        <observer name="removeTrueLoyalDiscountTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\RemoveTrueLoyalDiscount"/>
     </event>
-    <!-- Send customer delete event to zinrelo -->
+    <!-- Send customer delete event to trueloyal -->
     <event name="customer_delete_after">
-        <observer name="customerDeleteAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\CustomerDelete"/>
+        <observer name="customerDeleteAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\CustomerDelete"/>
     </event>
-    <!-- Send order update event to zinrelo -->
+    <!-- Send order update event to trueloyal -->
     <event name="sales_order_status_history_save_after">
-        <observer name="orderUpdateZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderUpdate"/>
+        <observer name="orderUpdateTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderUpdate"/>
     </event>
-    <!-- Send order invoice paid event to zinrelo -->
+    <!-- Send order invoice paid event to trueloyal -->
     <event name="sales_order_invoice_save_commit_after">
-        <observer name="invoiceSaveAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderFullInvoicePaid"/>
+        <observer name="invoiceSaveAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderFullInvoicePaid"/>
     </event>
-    <!-- Send order shipped event to zinrelo -->
+    <!-- Send order shipped event to trueloyal -->
     <event name="sales_order_shipment_save_commit_after">
-        <observer name="shipmentSaveAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderShipped"/>
+        <observer name="shipmentSaveAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderShipped"/>
     </event>
-    <!-- Send order cancel event to zinrelo -->
+    <!-- Send order cancel event to trueloyal -->
     <event name="order_cancel_after">
-        <observer name="orderCancelAfterZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderCancel"/>
+        <observer name="orderCancelAfterTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderCancel"/>
     </event>
-    <!-- Send order refund  event to zinrelo when order partial or Full refunded
+    <!-- Send order refund  event to trueloyal when order partial or Full refunded
         This event will call only for Magento version 2.3.0
      -->
     <event name="sales_order_creditmemo_save_after">
-        <observer name="orderRefundZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderRefund"/>
+        <observer name="orderRefundTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderRefund"/>
     </event>
-    <!-- Send order refund  event to zinrelo when order partial or Full refunded -->
+    <!-- Send order refund  event to trueloyal when order partial or Full refunded -->
     <event name="sales_order_creditmemo_save_commit_after">
-        <observer name="orderRefundZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\OrderRefund"/>
+        <observer name="orderRefundTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\OrderRefund"/>
     </event>
-    <!-- Clear zinrelo cookie customer logged out -->
+    <!-- Clear trueloyal cookie customer logged out -->
     <event name="customer_logout">
-        <observer name="reset-cokkies-logout" instance="Zinrelo\LoyaltyRewards\Observer\Customer\CustomerLogoutObserver" />
+        <observer name="reset-cokkies-logout" instance="TrueLoyal\LoyaltyRewards\Observer\Customer\CustomerLogoutObserver" />
     </event>
-    <!-- Call Zinrelo API after Config Save to Get Webhook Url -->
-    <event name="admin_system_config_changed_section_zinrelo_loyaltyRewards">
-        <observer name="configSaveObserver" instance="Zinrelo\LoyaltyRewards\Observer\ConfigSaveObserver"/>
+    <!-- Call TrueLoyal API after Config Save to Get Webhook Url -->
+    <event name="admin_system_config_changed_section_trueloyal_loyaltyRewards">
+        <observer name="configSaveObserver" instance="TrueLoyal\LoyaltyRewards\Observer\ConfigSaveObserver"/>
     </event>
 </config>
diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
index d235f3c..6fd9e09 100755
--- a/etc/frontend/routes.xml
+++ b/etc/frontend/routes.xml
@@ -3,7 +3,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="standard">
         <route frontName="loyaltyRewards" id="loyaltyRewards">
-            <module name="Zinrelo_LoyaltyRewards"/>
+            <module name="TrueLoyal_LoyaltyRewards"/>
         </route>
     </router>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
index f8e4383..1f2b12a 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Zinrelo_LoyaltyRewards" setup_version="2.4.0">
+    <module name="TrueLoyal_LoyaltyRewards" setup_version="2.5.0">
         <sequence>
             <module name="Magento_Catalog"></module>
         </sequence>
diff --git a/etc/sales.xml b/etc/sales.xml
index 0c15515..1a05686 100755
--- a/etc/sales.xml
+++ b/etc/sales.xml
@@ -1,19 +1,19 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Sales:etc/sales.xsd">
     <section name="quote">
         <group name="totals">
-            <item name="zinrelo_discount" instance="Zinrelo\LoyaltyRewards\Model\Total\Quote\LoyaltyRewardsDiscount" sort_order="420"/>
+            <item name="trueloyal_discount" instance="TrueLoyal\LoyaltyRewards\Model\Total\Quote\LoyaltyRewardsDiscount" sort_order="420"/>
         </group>
     </section>
 
     <section name="order_invoice">
         <group name="totals">
-            <item name="grand_total" instance="Zinrelo\LoyaltyRewards\Model\Total\Invoice\LoyaltyRewardsDiscount" sort_order="160"/>
+            <item name="grand_total" instance="TrueLoyal\LoyaltyRewards\Model\Total\Invoice\LoyaltyRewardsDiscount" sort_order="160"/>
         </group>
     </section>
 
     <section name="order_creditmemo">
         <group name="totals">
-            <item name="grand_total" instance="Zinrelo\LoyaltyRewards\Model\Total\CreditMemo\LoyaltyRewardsDiscount" sort_order="160"/>
+            <item name="grand_total" instance="TrueLoyal\LoyaltyRewards\Model\Total\CreditMemo\LoyaltyRewardsDiscount" sort_order="160"/>
         </group>
     </section>
 </config>
diff --git a/etc/webapi.xml b/etc/webapi.xml
index ae0db27..27c2275 100755
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../app/code/Magento/Webapi/etc/webapi.xsd">
     <route method="POST" url="/V1/customer/attribute/create">
-        <service class="Zinrelo\LoyaltyRewards\Api\CustomerAttributeInterface" method="createCustomerAttribute"/>
+        <service class="TrueLoyal\LoyaltyRewards\Api\CustomerAttributeInterface" method="createCustomerAttribute"/>
         <resources>
             <resource ref="anonymous"/>
         </resources>
     </route>
 
     <route method="POST" url="/V1/customer/attribute/update">
-        <service class="Zinrelo\LoyaltyRewards\Api\CustomerAttributeUpdateInterface" method="updateCustomerAttributeValue"/>
+        <service class="TrueLoyal\LoyaltyRewards\Api\CustomerAttributeUpdateInterface" method="updateCustomerAttributeValue"/>
         <resources>
             <resource ref="anonymous"/>
         </resources>
diff --git a/etc/webapi_rest/events.xml b/etc/webapi_rest/events.xml
index 2eb209e..0c00b21 100755
--- a/etc/webapi_rest/events.xml
+++ b/etc/webapi_rest/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="sales_order_save_commit_after">
-        <observer name="orderCreateAfterApiZinrelo" instance="Zinrelo\LoyaltyRewards\Observer\CreateOrderAfter" />
+        <observer name="orderCreateAfterApiTrueLoyal" instance="TrueLoyal\LoyaltyRewards\Observer\CreateOrderAfter" />
     </event>
 </config>
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index d0e5b2f..1ee2d70 100755
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -12,8 +12,8 @@
 "Attribute value updated successfully.","Attribute value updated successfully."
 "Attribute value can not be updated.","Attribute value can not be updated."
 "An invalid request data passed. Kindly check auth header data and try again.","An invalid request data passed. Kindly check auth header data and try again."
-"Zinrelo LoyaltyRewards module is not enabled.","Zinrelo LoyaltyRewards module is not enabled."
-"Enable module from: Stores → Configuration →Zinrelo Loyalty Rewards → Zinrelo Settings.","Enable module from: Stores → Configuration →Zinrelo Loyalty Rewards → Zinrelo Settings."
+"TrueLoyal LoyaltyRewards module is not enabled.","TrueLoyal LoyaltyRewards module is not enabled."
+"Enable module from: Stores → Configuration →TrueLoyal Loyalty Rewards → TrueLoyal Settings.","Enable module from: Stores → Configuration →TrueLoyal Loyalty Rewards → TrueLoyal Settings."
 "Enable the loyalty rewards module","Enable the loyalty rewards module"
 "Enable reward points text on product pages","Enable reward points text on product pages"
 "Reward points text on product pages","Reward points text on product pages"
diff --git a/registration.php b/registration.php
index 23b52f0..3800b39 100755
--- a/registration.php
+++ b/registration.php
@@ -1,6 +1,6 @@
 <?php
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Zinrelo_LoyaltyRewards',
+    'TrueLoyal_LoyaltyRewards',
     __DIR__
 );
diff --git a/view/adminhtml/layout/sales_order_creditmemo_new.xml b/view/adminhtml/layout/sales_order_creditmemo_new.xml
index ddc94d7..268a2d1 100755
--- a/view/adminhtml/layout/sales_order_creditmemo_new.xml
+++ b/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -2,7 +2,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="creditmemo_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloCreditMemoCreateDiscount" name="creditmemo"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalCreditMemoCreateDiscount" name="creditmemo"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
index 89129bf..1b77df7 100755
--- a/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
+++ b/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -2,7 +2,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="creditmemo_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloDiscount" name="qtyUpdateCreditMemo"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalDiscount" name="qtyUpdateCreditMemo"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_creditmemo_view.xml b/view/adminhtml/layout/sales_order_creditmemo_view.xml
index 654a731..cf43640 100755
--- a/view/adminhtml/layout/sales_order_creditmemo_view.xml
+++ b/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -2,7 +2,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="creditmemo_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloCreditMemoViewDiscount" name="creditmemo"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalCreditMemoViewDiscount" name="creditmemo"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_invoice_new.xml b/view/adminhtml/layout/sales_order_invoice_new.xml
index 8ece635..09cd3cd 100755
--- a/view/adminhtml/layout/sales_order_invoice_new.xml
+++ b/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="invoice_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloInvoiceCreateDiscount" name="zinrelo_discount"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalInvoiceCreateDiscount" name="trueloyal_discount"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/view/adminhtml/layout/sales_order_invoice_updateqty.xml
index b45ca4e..ff412ff 100755
--- a/view/adminhtml/layout/sales_order_invoice_updateqty.xml
+++ b/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -2,7 +2,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="invoice_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloDiscount" name="qtyUpdateInvoice"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalDiscount" name="qtyUpdateInvoice"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_invoice_view.xml b/view/adminhtml/layout/sales_order_invoice_view.xml
index 14d2a2d..28d37a4 100755
--- a/view/adminhtml/layout/sales_order_invoice_view.xml
+++ b/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -2,7 +2,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="invoice_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloInvoiceViewDiscount" name="invoice"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalInvoiceViewDiscount" name="invoice"/> -->
         </referenceBlock>
     </body>
 </page>
diff --git a/view/adminhtml/layout/sales_order_view.xml b/view/adminhtml/layout/sales_order_view.xml
index ebdbdb0..4f278e0 100755
--- a/view/adminhtml/layout/sales_order_view.xml
+++ b/view/adminhtml/layout/sales_order_view.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="order_totals">
-            <block class="Zinrelo\LoyaltyRewards\Block\Adminhtml\Sales\Order\ZinreloDiscount" name="zinrelo_discount"/>
+            <block class="TrueLoyal\LoyaltyRewards\Block\Adminhtml\Sales\Order\TrueLoyalDiscount" name="trueloyal_discount"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
index 2abeb00..447b20b 100755
--- a/view/frontend/layout/catalog_product_view.xml
+++ b/view/frontend/layout/catalog_product_view.xml
@@ -3,10 +3,10 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="product.info.main">
-            <block class="Magento\Catalog\Block\Product\View" name="view.zinrelo.reward.earn.points"
-                   template="Zinrelo_LoyaltyRewards::catalog/reward_points.phtml" after="product.info.price">
+            <block class="Magento\Catalog\Block\Product\View" name="view.trueloyal.reward.earn.points"
+                   template="TrueLoyal_LoyaltyRewards::catalog/reward_points.phtml" after="product.info.price">
                 <arguments>
-                    <argument name="viewModel" xsi:type="object">Zinrelo\LoyaltyRewards\ViewModel\ProductView</argument>
+                    <argument name="viewModel" xsi:type="object">TrueLoyal\LoyaltyRewards\ViewModel\ProductView</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
index 37a0380..276f466 100755
--- a/view/frontend/layout/checkout_cart_index.xml
+++ b/view/frontend/layout/checkout_cart_index.xml
@@ -2,23 +2,23 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Zinrelo_LoyaltyRewards::css/reward-list.css"/>
+        <css src="TrueLoyal_LoyaltyRewards::css/reward-list.css"/>
     </head>
     <body>
         <referenceBlock name="checkout.cart.container">
             <block class="Magento\Framework\View\Element\Template"
-                name="zinrelo.cart.reward.points"
-                template="Zinrelo_LoyaltyRewards::cart/reward_points.phtml"
+                name="trueloyal.cart.reward.points"
+                template="TrueLoyal_LoyaltyRewards::cart/reward_points.phtml"
                 before="form">
                 <arguments>
-                    <argument name="viewModel" xsi:type="object">Zinrelo\LoyaltyRewards\ViewModel\ProductView</argument>
+                    <argument name="viewModel" xsi:type="object">TrueLoyal\LoyaltyRewards\ViewModel\ProductView</argument>
                 </arguments>
             </block>
         </referenceBlock>
         <referenceContainer name="checkout.cart.container">
-            <block class="Zinrelo\LoyaltyRewards\Block\Cart\RewardList"
+            <block class="TrueLoyal\LoyaltyRewards\Block\Cart\RewardList"
                 name="reward.points" as="rewardlist"
-                template="Zinrelo_LoyaltyRewards::cart/RewardList.phtml"
+                template="TrueLoyal_LoyaltyRewards::cart/RewardList.phtml"
             />
         </referenceContainer>
         <referenceBlock name="checkout.cart.totals">
@@ -27,8 +27,8 @@
                     <item name="components" xsi:type="array">
                         <item name="block-totals" xsi:type="array">
                             <item name="children" xsi:type="array">
-                                <item name="zinrelo_discount" xsi:type="array">
-                                    <item name="component"  xsi:type="string">Zinrelo_LoyaltyRewards/js/view/checkout/summary/zinrelo-discount</item>
+                                <item name="trueloyal_discount" xsi:type="array">
+                                    <item name="component"  xsi:type="string">TrueLoyal_LoyaltyRewards/js/view/checkout/summary/trueloyal-discount</item>
                                     <item name="sortOrder" xsi:type="string">20</item>
                                 </item>
                             </item>
diff --git a/view/frontend/layout/checkout_cart_item_renderers.xml b/view/frontend/layout/checkout_cart_item_renderers.xml
index 8aee734..3358b9a 100755
--- a/view/frontend/layout/checkout_cart_item_renderers.xml
+++ b/view/frontend/layout/checkout_cart_item_renderers.xml
@@ -4,18 +4,18 @@
     <body>
         <referenceBlock name="checkout.cart.item.renderers.simple.actions.remove">
            <action method="setTemplate">
-                <argument name="template" xsi:type="string">Zinrelo_LoyaltyRewards::cart/item/renderer/actions/remove.phtml</argument>
+                <argument name="template" xsi:type="string">TrueLoyal_LoyaltyRewards::cart/item/renderer/actions/remove.phtml</argument>
             </action>
         </referenceBlock>
 
         <referenceBlock name="checkout.cart.item.renderers.simple.actions.edit">
             <action method="setTemplate">
-                <argument name="template" xsi:type="string">Zinrelo_LoyaltyRewards::cart/item/renderer/actions/edit.phtml</argument>
+                <argument name="template" xsi:type="string">TrueLoyal_LoyaltyRewards::cart/item/renderer/actions/edit.phtml</argument>
             </action>
         </referenceBlock>
         <referenceBlock name="checkout.cart.item.renderers.simple.actions.move_to_wishlist">
             <action method="setTemplate">
-                <argument name="template" xsi:type="string">Zinrelo_LoyaltyRewards::cart/item/renderer/actions/move_to_wishlist.phtml</argument>
+                <argument name="template" xsi:type="string">TrueLoyal_LoyaltyRewards::cart/item/renderer/actions/move_to_wishlist.phtml</argument>
             </action>
         </referenceBlock>
     </body>
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 9937db8..bd805cf 100755
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -13,8 +13,8 @@
                                             <item name="children" xsi:type="array">
                                                 <item name="totals" xsi:type="array">
                                                     <item name="children" xsi:type="array">
-                                                        <item name="zinrelo_discount" xsi:type="array">
-                                                            <item name="component"  xsi:type="string">Zinrelo_LoyaltyRewards/js/view/checkout/summary/zinrelo-discount</item>
+                                                        <item name="trueloyal_discount" xsi:type="array">
+                                                            <item name="component"  xsi:type="string">TrueLoyal_LoyaltyRewards/js/view/checkout/summary/trueloyal-discount</item>
                                                             <item name="sortOrder" xsi:type="string">20</item>
                                                         </item>
                                                     </item>
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 02a6989..4b5c856 100755
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -2,7 +2,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="before.body.end">
-            <block class="Zinrelo\LoyaltyRewards\Block\Dashboard" name="zinrelo-dashboard" template="Zinrelo_LoyaltyRewards::dashboard.phtml"/>
+            <block class="TrueLoyal\LoyaltyRewards\Block\Dashboard" name="trueloyal-dashboard" template="TrueLoyal_LoyaltyRewards::dashboard.phtml"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_creditmemo.xml b/view/frontend/layout/sales_order_creditmemo.xml
index 9918759..304844c 100755
--- a/view/frontend/layout/sales_order_creditmemo.xml
+++ b/view/frontend/layout/sales_order_creditmemo.xml
@@ -3,7 +3,7 @@
 
     <body>
         <referenceContainer name="creditmemo_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Sales\CreditMemo\Discount" name="loyaltyRewards"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Sales\CreditMemo\Discount" name="loyaltyRewards"/> -->
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_invoice.xml b/view/frontend/layout/sales_order_invoice.xml
index 02f6fd4..43bc31a 100755
--- a/view/frontend/layout/sales_order_invoice.xml
+++ b/view/frontend/layout/sales_order_invoice.xml
@@ -3,7 +3,7 @@
 
     <body>
         <referenceContainer name="invoice_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Sales\Invoice\Discount" name="loyaltyRewards"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Sales\Invoice\Discount" name="loyaltyRewards"/> -->
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_print.xml b/view/frontend/layout/sales_order_print.xml
index 21fab65..5e86af9 100755
--- a/view/frontend/layout/sales_order_print.xml
+++ b/view/frontend/layout/sales_order_print.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="order_totals">
-            <block class="Zinrelo\LoyaltyRewards\Block\Sales\OrderPrint\Discount" name="loyaltyRewards"/>
+            <block class="TrueLoyal\LoyaltyRewards\Block\Sales\OrderPrint\Discount" name="loyaltyRewards"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_printcreditmemo.xml b/view/frontend/layout/sales_order_printcreditmemo.xml
index 3a64547..7c30af8 100755
--- a/view/frontend/layout/sales_order_printcreditmemo.xml
+++ b/view/frontend/layout/sales_order_printcreditmemo.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="creditmemo_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Sales\CreditMemoPrint\Discount" name="loyaltyRewards"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Sales\CreditMemoPrint\Discount" name="loyaltyRewards"/> -->
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_printinvoice.xml b/view/frontend/layout/sales_order_printinvoice.xml
index 48f36ad..2dab54b 100755
--- a/view/frontend/layout/sales_order_printinvoice.xml
+++ b/view/frontend/layout/sales_order_printinvoice.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="invoice_totals">
-            <!-- <block class="Zinrelo\LoyaltyRewards\Block\Sales\InvoicePrint\Discount" name="loyaltyRewards"/> -->
+            <!-- <block class="TrueLoyal\LoyaltyRewards\Block\Sales\InvoicePrint\Discount" name="loyaltyRewards"/> -->
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/layout/sales_order_view.xml b/view/frontend/layout/sales_order_view.xml
index e9e5b89..2499950 100755
--- a/view/frontend/layout/sales_order_view.xml
+++ b/view/frontend/layout/sales_order_view.xml
@@ -3,7 +3,7 @@
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="order_totals">
-            <block class="Zinrelo\LoyaltyRewards\Block\Sales\Order\Discount" name="loyaltyRewards"/>
+            <block class="TrueLoyal\LoyaltyRewards\Block\Sales\Order\Discount" name="loyaltyRewards"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index d457ec6..cf90d40 100755
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -1,15 +1,15 @@
 var config = {
     map: {
         "*": {
-            'Magento_Checkout/template/minicart/item/default.html': 'Zinrelo_LoyaltyRewards/template/minicart/item/default.html',
-            priceBox:'Zinrelo_LoyaltyRewards/js/price-box-zinrelo',
-            cartPoints: 'Zinrelo_LoyaltyRewards/js/cart-points'
+            'Magento_Checkout/template/minicart/item/default.html': 'TrueLoyal_LoyaltyRewards/template/minicart/item/default.html',
+            priceBox:'TrueLoyal_LoyaltyRewards/js/price-box-trueloyal',
+            cartPoints: 'TrueLoyal_LoyaltyRewards/js/cart-points'
         }
     },
     config: {
         mixins: {
             'Magento_Checkout/js/model/checkout-data-resolver': {
-                'Zinrelo_LoyaltyRewards/js/model/checkout-data-resolver': true
+                'TrueLoyal_LoyaltyRewards/js/model/checkout-data-resolver': true
             }
         }
     }
diff --git a/view/frontend/templates/cart/RewardList.phtml b/view/frontend/templates/cart/RewardList.phtml
index b207aa3..ff13d4f 100755
--- a/view/frontend/templates/cart/RewardList.phtml
+++ b/view/frontend/templates/cart/RewardList.phtml
@@ -1,15 +1,15 @@
 <?php
 $quote = $block->helper->getQuote();
-$zinreloQuote = $this->helper->getZinreloQuoteByQuoteId($quote->getId());
-$redeemReward = $zinreloQuote->getRedeemRewardDiscount();
+$trueloyalQuote = $this->helper->getTrueLoyalQuoteByQuoteId($quote->getId());
+$redeemReward = $trueloyalQuote->getRedeemRewardDiscount();
 $rewardData = $block->helper->getRewardRulesData($quote, $redeemReward);
-$customerEmail = $block->getCustomerEmail();
+$memberIdentifierValue = $block->helper->getMemberIdentifierValue();
 $points = $block->getRewardPoints();
 $redeemUrl = $block->getFormAction();
 $redeemRules = $block->getRedeemRules();
 $isEnabled = $block->helper->isRewardDropDownEnable();
-if (($isEnabled && !empty($customerEmail) && $points != "error" && !empty($redeemRules)) ||
-    ($isEnabled && $zinreloQuote->getRewardRulesData() != "")
+if (($isEnabled && !empty($memberIdentifierValue) && $points != "error" && !empty($redeemRules)) ||
+    ($isEnabled && $trueloyalQuote->getRewardRulesData() != "")
 ) {
     $points = ($points == "error") ? 0 : $points;
     $message = $block->helper->getRewardLabelAtCartPage();
@@ -80,8 +80,8 @@ if (($isEnabled && !empty($customerEmail) && $points != "error" && !empty($redee
             'mage/cookies'
         ], function ($, shippingrateservice) {
             <?php if (empty($rewardData)) : ?>
-                if ($.mage.cookies.get('zinrelo_shipping_selected')) {
-                    $.mage.cookies.clear('zinrelo_shipping_selected');
+                if ($.mage.cookies.get('trueloyal_shipping_selected')) {
+                    $.mage.cookies.clear('trueloyal_shipping_selected');
                 }
             <?php endif; ?>
 
diff --git a/view/frontend/templates/cart/item/default.phtml b/view/frontend/templates/cart/item/default.phtml
index 9dcf634..26ac9fe 100755
--- a/view/frontend/templates/cart/item/default.phtml
+++ b/view/frontend/templates/cart/item/default.phtml
@@ -10,10 +10,10 @@ use Magento\Msrp\Helper\Data;
 
 /** @var $block Renderer */
 
-$zinreloHelper = $this->helper(Zinrelo\LoyaltyRewards\Helper\Data ::class);
+$trueloyalHelper = $this->helper(TrueLoyal\LoyaltyRewards\Helper\Data ::class);
 
 $_item = $block->getItem();
-$zinreloQuoteItem = $zinreloHelper->getZinreloQuoteItemByItemId($_item->getId());
+$trueloyalQuoteItem = $trueloyalHelper->getTrueLoyalQuoteItemByItemId($_item->getId());
 $product = $_item->getProduct();
 $isVisibleProduct = $product->isVisibleInSiteVisibility();
 /** @var Data $helper */
@@ -106,7 +106,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
             <div class="control qty">
                 <label for="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty">
                     <span class="label"><?= $block->escapeHtml(__('Qty')) ?></span>
-                    <?php if ($zinreloQuoteItem->getIsZinreloFreeProduct()) {?>
+                    <?php if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) {?>
                         <input readonly="readonly" type="text" name="qty" id="qty" maxlength="12"
                                value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
                                title="<?= $block->escapeHtmlAttr(__('Qty')) ?>" disabled class="input-text qty disable"/>
diff --git a/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/view/frontend/templates/cart/item/renderer/actions/edit.phtml
index 21caea9..6ecb1a6 100755
--- a/view/frontend/templates/cart/item/renderer/actions/edit.phtml
+++ b/view/frontend/templates/cart/item/renderer/actions/edit.phtml
@@ -1,7 +1,7 @@
 <?php
-$zinreloHelper = $this->helper(Zinrelo\LoyaltyRewards\Helper\Config ::class);
-$zinreloQuoteItem = $zinreloHelper->getZinreloQuoteItemByItemId($block->getItem()->getId());
-if ($zinreloQuoteItem->getIsZinreloFreeProduct()) { ?>
+$trueloyalHelper = $this->helper(TrueLoyal\LoyaltyRewards\Helper\Config ::class);
+$trueloyalQuoteItem = $trueloyalHelper->getTrueLoyalQuoteItemByItemId($block->getItem()->getId());
+if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) { ?>
     <?php if ($block->isProductVisibleInSiteVisibility()):?>
     <?php endif ?>
 <?php } else {
diff --git a/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml b/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
index b4d586e..c2726b7 100755
--- a/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
+++ b/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
@@ -8,10 +8,10 @@ use Magento\Wishlist\Block\Cart\Item\Renderer\Actions\MoveToWishlist;
 
 /** @var MoveToWishlist $block */
 
-$zinreloHelper = $this->helper(Zinrelo\LoyaltyRewards\Helper\Config ::class);
-$zinreloQuoteItem = $zinreloHelper->getZinreloQuoteItemByItemId($block->getItem()->getId());
+$trueloyalHelper = $this->helper(TrueLoyal\LoyaltyRewards\Helper\Config ::class);
+$trueloyalQuoteItem = $trueloyalHelper->getTrueLoyalQuoteItemByItemId($block->getItem()->getId());
 ?>
-<?php if ($zinreloQuoteItem->getIsZinreloFreeProduct()) {
+<?php if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) {
     return;
 } else { ?>
     <?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()): ?>
diff --git a/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/view/frontend/templates/cart/item/renderer/actions/remove.phtml
index 83554a7..a2b0370 100755
--- a/view/frontend/templates/cart/item/renderer/actions/remove.phtml
+++ b/view/frontend/templates/cart/item/renderer/actions/remove.phtml
@@ -1,7 +1,7 @@
 <?php
-$zinreloHelper = $this->helper('Zinrelo\LoyaltyRewards\Helper\Config');
-$zinreloQuoteItem = $zinreloHelper->getZinreloQuoteItemByItemId($block->getItem()->getId());
-if ($zinreloQuoteItem->getIsZinreloFreeProduct()) { ?>
+$trueloyalHelper = $this->helper('TrueLoyal\LoyaltyRewards\Helper\Config');
+$trueloyalQuoteItem = $trueloyalHelper->getTrueLoyalQuoteItemByItemId($block->getItem()->getId());
+if ($trueloyalQuoteItem->getIsTrueLoyalFreeProduct()) { ?>
 <?php } else { ?>
     <a href="#"
        title="<?= $block->escapeHtml(__('Remove item')) ?>"
diff --git a/view/frontend/templates/cart/reward_points.phtml b/view/frontend/templates/cart/reward_points.phtml
index 2574435..494634a 100755
--- a/view/frontend/templates/cart/reward_points.phtml
+++ b/view/frontend/templates/cart/reward_points.phtml
@@ -9,9 +9,9 @@ $viewModel = $block->getData('viewModel');
 if ($viewModel->isPdpAtCartEnabled()) {
     $rewardLabel = $viewModel->getRewardLabelAtCartPage();
     if (str_contains($rewardLabel, "{{EARN_POINTS}}")) {
-        $rewardLabel = str_replace("{{EARN_POINTS}}", "<span class='zinrelo-product-price' id='zinrelo_cart_total_points' style='font-weight:bold;' data-zrl-cart-points></span>", $rewardLabel);
+        $rewardLabel = str_replace("{{EARN_POINTS}}", "<span class='trueloyal-product-price' id='trueloyal_cart_total_points' style='font-weight:bold;' data-zrl-cart-points></span>", $rewardLabel);
     } else {
-        $rewardLabel = "<span class='zinrelo-product-price' id='zinrelo_cart_total_points' data-zrl-cart-points></span>" . $rewardLabel;
+        $rewardLabel = "<span class='trueloyal-product-price' id='trueloyal_cart_total_points' data-zrl-cart-points></span>" . $rewardLabel;
     }
     ?>
     <div> <?=  /* @noEscape */  $rewardLabel;?> </div>
diff --git a/view/frontend/templates/catalog/reward_points.phtml b/view/frontend/templates/catalog/reward_points.phtml
index eff8080..846a316 100755
--- a/view/frontend/templates/catalog/reward_points.phtml
+++ b/view/frontend/templates/catalog/reward_points.phtml
@@ -3,10 +3,10 @@ $viewModel = $block->getData('viewModel');
 if ($viewModel->isPdpPointEnabled()) {
     $rewardLabel = $viewModel->getRewardLabel();
     if (str_contains($rewardLabel, "{{EARN_POINTS}}")) {
-        $rewardLabel = str_replace("{{EARN_POINTS}}", "<div class='zinrelo-product-price' id='potential_product_points'data-zrl-product-points></div>", $rewardLabel);
+        $rewardLabel = str_replace("{{EARN_POINTS}}", "<div class='trueloyal-product-price' id='potential_product_points'data-zrl-product-points></div>", $rewardLabel);
     } else {
-        $rewardLabel = "<div class='zinrelo-product-price' id='potential_product_points' data-zrl-product-points></div>" . $rewardLabel;
+        $rewardLabel = "<div class='trueloyal-product-price' id='potential_product_points' data-zrl-product-points></div>" . $rewardLabel;
     }
     ?>
-    <div class="zinrelo-earn-product-points"> <?=  /* @noEscape */  $rewardLabel;?> </div>
+    <div class="trueloyal-earn-product-points"> <?=  /* @noEscape */  $rewardLabel;?> </div>
 <?php } ?>
diff --git a/view/frontend/templates/dashboard.phtml b/view/frontend/templates/dashboard.phtml
index 0ce87ea..59d16f1 100755
--- a/view/frontend/templates/dashboard.phtml
+++ b/view/frontend/templates/dashboard.phtml
@@ -4,54 +4,27 @@ if (!$isEnabled) {
     return;
 }
 $partnerId = $block->getPartnerId();
+$jwtToken = $block->getJwtToken();
+if (!$jwtToken) {
+    return;
+}
 ?>
 <script>
     require.config({
         map: {
             '*': {
-                'zinrelo': 'https://cdn.zinrelo.com/js/all.js'
+                'trueloyal': 'https://cdn.trueloyal.com/js/all.js'
             }
         }
     });
 
-    require([
-            'jquery',
-            'zinrelo',
-            'js-cookie/cookie-wrapper'
-        ],
-        function ($, zinrelo,) {
-            $(document).ready(function () {
-                // Your AJAX request code here
-                let url = window.BASE_URL + "loyaltyRewards/loyaltyrewards/index";
-                let isRequest = $.cookie('zinrelo');
-                if (!isRequest | undefined) {
-                    $.ajax({
-                        url: url, // Adjust the URL as needed
-                        type: 'POST',
-                        dataType: 'json',
-                        cache: false,
-                        success: function (response) {
-                            let init_data = {
-                                "partner_id": response.partnerId,
-                                "jwt_token": response.tokenData,
-                                "version": "v2",
-                                "server": "https://app.zinrelo.com"
-                            };
-                            _zrl.push(['init', init_data]);
-                        },
-                        error: function () {
-                            console.error('AJAX request failed.');
-                        }
-                    });
-                } else {
-                    let init_data = {
-                        "partner_id": "<?= /* @noEscape */ $partnerId ?>",
-                        "jwt_token": isRequest,
-                        "version": "v2",
-                        "server": "https://app.zinrelo.com"
-                    };
-                    _zrl.push(['init', init_data]);
-                }
-            });
-        });
+    require(['trueloyal'], function () {
+        let init_data = {
+            "partner_id": "<?= /* @noEscape */ $partnerId ?>",
+            "jwt_token": "<?= $block->escapeJs($jwtToken) ?>",
+            "version": "v2",
+            "server": "https://app.trueloyal.com"
+        };
+        _zrl.push(['init', init_data]);
+    });
 </script>
diff --git a/view/frontend/web/css/module.css b/view/frontend/web/css/module.css
index e8759b2..6a66ed1 100755
--- a/view/frontend/web/css/module.css
+++ b/view/frontend/web/css/module.css
@@ -50,7 +50,7 @@
     background-color: #b7b7b7;
     border-color: #b3aeae;
 }
-.zinrelo-earn-product-points > div {
+.trueloyal-earn-product-points > div {
     display: inline-block;
     color: #ff5555;
     font-weight: bold;
diff --git a/view/frontend/web/css/source/_module.less b/view/frontend/web/css/source/_module.less
index 499a8ec..5497d6d 100644
--- a/view/frontend/web/css/source/_module.less
+++ b/view/frontend/web/css/source/_module.less
@@ -63,7 +63,7 @@
     }
 }
 
-.zinrelo-earn-product-points > div {
+.trueloyal-earn-product-points > div {
     display: inline-block;
     color: @pdp-point-color;
     font-weight: bold;
diff --git a/view/frontend/web/js/cart-points.js b/view/frontend/web/js/cart-points.js
index 03501fc..a7ca39b 100755
--- a/view/frontend/web/js/cart-points.js
+++ b/view/frontend/web/js/cart-points.js
@@ -6,12 +6,12 @@ define([
 ], function ($, quote, priceUtils, customerData) {
     'use strict';
 
-    function runZinrelo() {
+    function runTrueLoyal() {
         const cartItems = window.checkoutConfig.quoteItemData;
-        const zinreloItems = [];
+        const trueloyalItems = [];
 
         cartItems.forEach(function (item) {
-            zinreloItems.push({
+            trueloyalItems.push({
                 product_id: item.product_id,
                 quantity: item.qty,
                 price: item.price,
@@ -19,25 +19,25 @@ define([
             });
         });
 
-        if (zinreloItems.length && typeof zrl_mi !== 'undefined' && typeof zrl_mi.get_potential_points === 'function') {
+        if (trueloyalItems.length && typeof zrl_mi !== 'undefined' && typeof zrl_mi.get_potential_points === 'function') {
             zrl_mi.get_potential_points_success_handler = function () {
-                const element = document.getElementById("zinrelo_cart_total_points");
+                const element = document.getElementById("trueloyal_cart_total_points");
                 if (element && typeof potential_points !== 'undefined') {
                     element.innerText = potential_points;
                 }
             };
-            zrl_mi.get_potential_points(zinreloItems);
+            zrl_mi.get_potential_points(trueloyalItems);
         } else {
-            console.warn('Zinrelo not available or cart is empty.');
+            console.warn('TrueLoyal not available or cart is empty.');
         }
     }
 
     return function () {
         $(document).ready(function () {
-            runZinrelo();
+            runTrueLoyal();
             const cart = customerData.get('cart');
             cart.subscribe(function () {
-                setTimeout(runZinrelo, 500);
+                setTimeout(runTrueLoyal, 500);
             });
         });
     };
diff --git a/view/frontend/web/js/model/checkout-data-resolver.js b/view/frontend/web/js/model/checkout-data-resolver.js
index 43b1cd7..d2bafa3 100755
--- a/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/view/frontend/web/js/model/checkout-data-resolver.js
@@ -13,20 +13,20 @@ define([
         var config = window.checkoutConfig;
 
         /**
-         * Select zinrelo shipping method when free shipping rule Applied
+         * Select trueloyal shipping method when free shipping rule Applied
          */
         var resolveShippingRates = wrapper.wrap(
             checkoutDataResolver.resolveShippingRates,
             function (originalResolveShippingRates, ratesData) {
                 let method = this.getMethod('shipping', ratesData);
                 if (!_.isUndefined(method)) {
-                    let isZinreloShippingSelected = ($.mage.cookies.get('zinrelo_shipping_selected'));
-                    if (!isZinreloShippingSelected) {
-                        /*get zinrelo free shipping cart-data rates and make default selected */
+                    let isTrueLoyalShippingSelected = ($.mage.cookies.get('trueloyal_shipping_selected'));
+                    if (!isTrueLoyalShippingSelected) {
+                        /*get trueloyal free shipping cart-data rates and make default selected */
                         cartCache.clear('cart-data');
                         selectShippingMethodAction(method);
-                        checkoutData.setSelectedShippingRate('zinrelorate_zinrelorate');
-                        $.mage.cookies.set('zinrelo_shipping_selected', true, {lifetime: 86400});
+                        checkoutData.setSelectedShippingRate('trueloyalrate_trueloyalrate');
+                        $.mage.cookies.set('trueloyal_shipping_selected', true, {lifetime: 86400});
                     }
                 }
                 return originalResolveShippingRates(ratesData);
@@ -47,7 +47,7 @@ define([
                 self = this;
                 var matchedMethod;
                 matchedMethod = availableMethods.find(function (method) {
-                    return self.getMethodCode(method, type) === 'zinrelorate_zinrelorate';
+                    return self.getMethodCode(method, type) === 'trueloyalrate_trueloyalrate';
                 });
 
                 return matchedMethod;
diff --git a/view/frontend/web/js/model/checkout-data-resolver.js_bkp b/view/frontend/web/js/model/checkout-data-resolver.js_bkp
index 9c1a426..a3dac18 100755
--- a/view/frontend/web/js/model/checkout-data-resolver.js_bkp
+++ b/view/frontend/web/js/model/checkout-data-resolver.js_bkp
@@ -12,18 +12,18 @@ define([
         var config = window.checkoutConfig;
 
         /**
-         * Select zinrelo shipping method when free shipping rule Applied
+         * Select trueloyal shipping method when free shipping rule Applied
          */
         var resolveShippingRates = wrapper.wrap(
             checkoutDataResolver.resolveShippingRates,
             function (originalResolveShippingRates, ratesData) {
                 let method = this.getMethod('shipping', ratesData);
                 if (!_.isUndefined(method)) {
-                    let isZinreloShippingSelected = ($.mage.cookies.get('zinrelo_shipping_selected'));
-                    if (!isZinreloShippingSelected) {
+                    let isTrueLoyalShippingSelected = ($.mage.cookies.get('trueloyal_shipping_selected'));
+                    if (!isTrueLoyalShippingSelected) {
                         selectShippingMethodAction(method);
-                        checkoutData.setSelectedShippingRate('zinrelorate_zinrelorate');
-                        $.mage.cookies.set('zinrelo_shipping_selected', true, {lifetime: 86400});
+                        checkoutData.setSelectedShippingRate('trueloyalrate_trueloyalrate');
+                        $.mage.cookies.set('trueloyal_shipping_selected', true, {lifetime: 86400});
                     }
                 }
                 return originalResolveShippingRates(ratesData);
@@ -44,7 +44,7 @@ define([
                 self = this;
                 var matchedMethod;
                 matchedMethod = availableMethods.find(function (method) {
-                    return self.getMethodCode(method, type) === 'zinrelorate_zinrelorate';
+                    return self.getMethodCode(method, type) === 'trueloyalrate_trueloyalrate';
                 });
 
                 return matchedMethod;
diff --git a/view/frontend/web/js/price-box-zinrelo.js b/view/frontend/web/js/price-box-trueloyal.js
similarity index 100%
rename from view/frontend/web/js/price-box-zinrelo.js
rename to view/frontend/web/js/price-box-trueloyal.js
diff --git a/view/frontend/web/js/view/checkout/summary/zinrelo-discount.js b/view/frontend/web/js/view/checkout/summary/trueloyal-discount.js
similarity index 53%
rename from view/frontend/web/js/view/checkout/summary/zinrelo-discount.js
rename to view/frontend/web/js/view/checkout/summary/trueloyal-discount.js
index e2a4602..f5c6d2a 100755
--- a/view/frontend/web/js/view/checkout/summary/zinrelo-discount.js
+++ b/view/frontend/web/js/view/checkout/summary/trueloyal-discount.js
@@ -10,25 +10,25 @@ define(
         "use strict";
         return Component.extend({
             defaults: {
-                template: 'Zinrelo_LoyaltyRewards/checkout/summary/zinrelo-discount'
+                template: 'TrueLoyal_LoyaltyRewards/checkout/summary/trueloyal-discount'
             },
             totals: quote.getTotals(),
-            isDisplayedZinrelodiscountTotal : function () {
-                if(totals.getSegment('zinrelo_discount')) {
+            isDisplayedTrueLoyaldiscountTotal : function () {
+                if(totals.getSegment('trueloyal_discount')) {
                     return true;
                 }else {
                     return false;
                 }
             },
-            getZinrelodiscountTotal : function () {
-                if(totals.getSegment('zinrelo_discount')){
-                    var price =  totals.getSegment('zinrelo_discount').value;
+            getTrueLoyaldiscountTotal : function () {
+                if(totals.getSegment('trueloyal_discount')){
+                    var price =  totals.getSegment('trueloyal_discount').value;
                     return this.getFormattedPrice(price);
                 }
             },
-            getZinrelodiscountLabel : function () {
-                if(totals.getSegment('zinrelo_discount')){
-                    return totals.getSegment('zinrelo_discount').title;
+            getTrueLoyaldiscountLabel : function () {
+                if(totals.getSegment('trueloyal_discount')){
+                    return totals.getSegment('trueloyal_discount').title;
                 }
             }
         });
diff --git a/view/frontend/web/template/checkout/summary/trueloyal-discount.html b/view/frontend/web/template/checkout/summary/trueloyal-discount.html
new file mode 100755
index 0000000..eaed8e7
--- /dev/null
+++ b/view/frontend/web/template/checkout/summary/trueloyal-discount.html
@@ -0,0 +1,8 @@
+<!-- ko if: isDisplayedTrueLoyaldiscountTotal() -->
+<tr class="totals trueloyaldiscount">
+    <th class="mark" colspan="1" scope="row" data-bind="text: getTrueLoyaldiscountLabel()"></th>
+    <td class="amount">
+        <span class="price" data-bind="text: getTrueLoyaldiscountTotal()"></span>
+    </td>
+</tr>
+<!-- /ko -->
diff --git a/view/frontend/web/template/checkout/summary/zinrelo-discount.html b/view/frontend/web/template/checkout/summary/zinrelo-discount.html
deleted file mode 100755
index 451724b..0000000
--- a/view/frontend/web/template/checkout/summary/zinrelo-discount.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- ko if: isDisplayedZinrelodiscountTotal() -->
-<tr class="totals zinrelodiscount">
-    <th class="mark" colspan="1" scope="row" data-bind="text: getZinrelodiscountLabel()"></th>
-    <td class="amount">
-        <span class="price" data-bind="text: getZinrelodiscountTotal()"></span>
-    </td>
-</tr>
-<!-- /ko -->