diff --git a/app/Gateways/MS_Gateway_CryptoPay.php b/app/Gateways/MS_Gateway_CryptoPay.php
index bef02be..3372a00 100644
--- a/app/Gateways/MS_Gateway_CryptoPay.php
+++ b/app/Gateways/MS_Gateway_CryptoPay.php
@@ -85,8 +85,8 @@ public function after_load(): void
 
         $this->id             = self::ID;
         $this->group          = 'cryptopay';
-        $this->name           = __('CryptoPay', 'md-cryptopay');
-        $this->description    = __('Cryptocurrency payments', 'md-cryptopay');
+        $this->name           = __('CryptoPay', 'cryptopay-gateway-for-memberdash');
+        $this->description    = __('Cryptocurrency payments', 'cryptopay-gateway-for-memberdash');
 
         $this->manual_payment = true;
         $this->pro_rate       = true;
diff --git a/app/Gateways/MS_Gateway_CryptoPay_Lite.php b/app/Gateways/MS_Gateway_CryptoPay_Lite.php
index 5be2efc..c0f889c 100644
--- a/app/Gateways/MS_Gateway_CryptoPay_Lite.php
+++ b/app/Gateways/MS_Gateway_CryptoPay_Lite.php
@@ -85,8 +85,8 @@ public function after_load(): void
 
         $this->id             = self::ID;
         $this->group          = 'cryptopay';
-        $this->name           = __('CryptoPay Lite', 'md-cryptopay');
-        $this->description    = __('Cryptocurrency payments', 'md-cryptopay');
+        $this->name           = __('CryptoPay Lite', 'cryptopay-gateway-for-memberdash');
+        $this->description    = __('Cryptocurrency payments', 'cryptopay-gateway-for-memberdash');
 
         $this->manual_payment = true;
         $this->pro_rate       = true;
diff --git a/app/Loader.php b/app/Loader.php
index 1ee8476..57acbbf 100644
--- a/app/Loader.php
+++ b/app/Loader.php
@@ -18,7 +18,7 @@ public function __construct()
 
         Helpers::registerIntegration('memberdash');
         Helpers::createTransactionPage(
-            esc_html__('MemberDash transactions', 'md-cryptopay'),
+            esc_html__('MemberDash transactions', 'cryptopay-gateway-for-memberdash'),
             'memberdash',
         );
 
@@ -38,7 +38,7 @@ private function getSubscription(int $userId, int $membershipId): object
         $subscription = \MS_Model_Relationship::get_subscription($userId, $membershipId);
 
         if (!$subscription) {
-            Helpers::response('error', esc_html__('Subscription not found', 'md-cryptopay'));
+            Helpers::response('error', esc_html__('Subscription not found', 'cryptopay-gateway-for-memberdash'));
         }
 
         return $subscription;
@@ -70,7 +70,7 @@ public function paymentFinished(object $data): void
         $subscription = $this->getSubscription($userId, $membershipId);
         $invoice = \MS_Factory::load('MS_Model_Invoice', $data->getOrder()->getId());
 
-        $invoice->add_notes($note = esc_html__('Payment successful!', 'md-cryptopay'));
+        $invoice->add_notes($note = esc_html__('Payment successful!', 'cryptopay-gateway-for-memberdash'));
 
         $invoice->pay_it($gateway, $data->getHash());
 
diff --git a/cryptopay-gateway-for-memberdash.php b/cryptopay-gateway-for-memberdash.php
index d39df6b..7e5af11 100644
--- a/cryptopay-gateway-for-memberdash.php
+++ b/cryptopay-gateway-for-memberdash.php
@@ -18,7 +18,7 @@
  * Author URI:  https://beycanpress.com
  * License:     GPLv3
  * License URI: https://www.gnu.org/licenses/gpl-3.0.html
- * Text Domain: md-cryptopay
+ * Text Domain: cryptopay-gateway-for-memberdash
  * Tags: Bitcoin, Ethereum, Cryptocurrency, Payments, MemberDash
  * Requires at least: 5.0
  * Tested up to: 6.6
@@ -50,7 +50,7 @@ function memberdash_cryptopay_addModels(): void
 
     memberdash_cryptopay_addModels();
 
-    load_plugin_textdomain('md-cryptopay', false, basename(__DIR__) . '/languages');
+    load_plugin_textdomain('cryptopay-gateway-for-memberdash', false, basename(__DIR__) . '/languages');
 
     if (!defined('MEMBERDASH_VERSION')) {
         Helpers::requirePluginMessage('MemberDash', 'https://www.learndash.com/memberdash-plugin/', false);
diff --git a/languages/md-cryptopay.pot b/languages/cryptopay-gateway-for-memberdash.pot
similarity index 62%
rename from languages/md-cryptopay.pot
rename to languages/cryptopay-gateway-for-memberdash.pot
index 30b314f..67173f3 100644
--- a/languages/md-cryptopay.pot
+++ b/languages/cryptopay-gateway-for-memberdash.pot
@@ -1,9 +1,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: CryptoPay Gateway for MemberDash\n"
+"Project-Id-Version: Cryptocurrency Payment Gateway for MemberDash by "
+"CryptoPay\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 01:19+0000\n"
+"POT-Creation-Date: 2024-10-18 13:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: \n"
@@ -13,8 +14,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Loco https://localise.biz/\n"
-"X-Loco-Version: 2.6.6; wp-6.4.3\n"
-"X-Domain: md-cryptopay"
+"X-Loco-Version: 2.6.11; wp-6.6.2\n"
+"X-Domain: cryptopay-gateway-for-memberdash"
 
 #. Description of the plugin
 msgid "Adds Cryptocurrency payment gateway (CryptoPay) for MemberDash."
@@ -24,8 +25,8 @@ msgstr ""
 msgid "BeycanPress LLC"
 msgstr ""
 
-#: cryptopay-gateway-for-memberdash.php:59 cryptopay-gateway-for-memberdash.php:72
-msgid "clicking here"
+#. Name of the plugin
+msgid "Cryptocurrency Payment Gateway for MemberDash by CryptoPay"
 msgstr ""
 
 #: app/Gateways/MS_Gateway_CryptoPay.php:89
@@ -33,12 +34,12 @@ msgstr ""
 msgid "Cryptocurrency payments"
 msgstr ""
 
-#: views/MS_Gateway_CryptoPay_View_Button.php:161
+#: views/MS_Gateway_CryptoPay_View_Button.php:158
 #: app/Gateways/MS_Gateway_CryptoPay.php:88
 msgid "CryptoPay"
 msgstr ""
 
-#: views/MS_Gateway_CryptoPay_Lite_View_Button.php:161
+#: views/MS_Gateway_CryptoPay_Lite_View_Button.php:158
 #: app/Gateways/MS_Gateway_CryptoPay_Lite.php:88
 msgid "CryptoPay Lite"
 msgstr ""
@@ -56,8 +57,8 @@ msgstr ""
 msgid "https://beycanpress.com/cryptopay/"
 msgstr ""
 
-#: views/MS_Gateway_CryptoPay_Lite_View_Button.php:72
-#: views/MS_Gateway_CryptoPay_View_Button.php:72
+#: views/MS_Gateway_CryptoPay_Lite_View_Button.php:70
+#: views/MS_Gateway_CryptoPay_View_Button.php:70
 msgid "Invoice ID:"
 msgstr ""
 
@@ -66,25 +67,6 @@ msgstr ""
 msgid "Light"
 msgstr ""
 
-#. Name of the plugin
-msgid "CryptoPay Gateway for MemberDash"
-msgstr ""
-
-#: cryptopay-gateway-for-memberdash.php:72
-#, php-format
-msgid ""
-"CryptoPay Gateway for MemberDash: This plugin is an extra feature plugin so it "
-"cannot do anything on its own. It needs CryptoPay to work. You can buy "
-"CryptoPay by %s."
-msgstr ""
-
-#: cryptopay-gateway-for-memberdash.php:59
-#, php-format
-msgid ""
-"CryptoPay Gateway for MemberDash: This plugin requires MemberDash to work. You "
-"can buy MemberDash by %s."
-msgstr ""
-
 #: app/Loader.php:21
 msgid "MemberDash transactions"
 msgstr ""
diff --git a/views/MS_Gateway_CryptoPay_Lite_View_Button.php b/views/MS_Gateway_CryptoPay_Lite_View_Button.php
index 30ab6dc..fc214f3 100644
--- a/views/MS_Gateway_CryptoPay_Lite_View_Button.php
+++ b/views/MS_Gateway_CryptoPay_Lite_View_Button.php
@@ -67,7 +67,7 @@ public function to_html(): string
         
         Hook::addFilter('lang', function(array $lang) {
             return array_merge($lang, [
-                'orderId' => __('Invoice ID:', 'md-cryptopay'),
+                'orderId' => __('Invoice ID:', 'cryptopay-gateway-for-memberdash'),
             ]);
         });
 
@@ -155,7 +155,7 @@ private function prepare_fields(): array
             'button' => array(
                 'id'    => 'mb-cryptopay-lite-start',
                 'type'  => MS_Helper_Html::INPUT_TYPE_BUTTON,
-                'value' => esc_html__('CryptoPay Lite', 'md-cryptopay'),
+                'value' => esc_html__('CryptoPay Lite', 'cryptopay-gateway-for-memberdash'),
             )
         );
 
diff --git a/views/MS_Gateway_CryptoPay_Lite_View_Settings.php b/views/MS_Gateway_CryptoPay_Lite_View_Settings.php
index 1a2d5a6..e424113 100644
--- a/views/MS_Gateway_CryptoPay_Lite_View_Settings.php
+++ b/views/MS_Gateway_CryptoPay_Lite_View_Settings.php
@@ -56,11 +56,11 @@ protected function prepare_fields(): array
             'theme' => array(
                 'id'            => 'theme',
                 'type'          => \MS_Helper_Html::INPUT_TYPE_SELECT,
-                'title'         => __('Theme', 'md-cryptopay'),
+                'title'         => __('Theme', 'cryptopay-gateway-for-memberdash'),
                 'value'         => $gateway->theme ?? 'light',
                 'field_options' => array(
-                    'light' => __('Light', 'md-cryptopay'),
-                    'dark'  => __('Dark', 'md-cryptopay'),
+                    'light' => __('Light', 'cryptopay-gateway-for-memberdash'),
+                    'dark'  => __('Dark', 'cryptopay-gateway-for-memberdash'),
                 ),
                 'class'         => 'ms-text-large',
                 'ajax_data'     => array(1),
diff --git a/views/MS_Gateway_CryptoPay_View_Button.php b/views/MS_Gateway_CryptoPay_View_Button.php
index 41b6000..09459f5 100644
--- a/views/MS_Gateway_CryptoPay_View_Button.php
+++ b/views/MS_Gateway_CryptoPay_View_Button.php
@@ -67,7 +67,7 @@ public function to_html(): string
         
         Hook::addFilter('lang', function(array $lang) {
             return array_merge($lang, [
-                'orderId' => __('Invoice ID:', 'md-cryptopay'),
+                'orderId' => __('Invoice ID:', 'cryptopay-gateway-for-memberdash'),
             ]);
         });
 
@@ -155,7 +155,7 @@ private function prepare_fields(): array
             'button' => array(
                 'id'    => 'mb-cryptopay-start',
                 'type'  => MS_Helper_Html::INPUT_TYPE_BUTTON,
-                'value' => esc_html__('CryptoPay', 'md-cryptopay'),
+                'value' => esc_html__('CryptoPay', 'cryptopay-gateway-for-memberdash'),
             )
         );
 
diff --git a/views/MS_Gateway_CryptoPay_View_Settings.php b/views/MS_Gateway_CryptoPay_View_Settings.php
index faa3d27..301c20d 100644
--- a/views/MS_Gateway_CryptoPay_View_Settings.php
+++ b/views/MS_Gateway_CryptoPay_View_Settings.php
@@ -56,11 +56,11 @@ protected function prepare_fields(): array
             'theme' => array(
                 'id'            => 'theme',
                 'type'          => \MS_Helper_Html::INPUT_TYPE_SELECT,
-                'title'         => __('Theme', 'md-cryptopay'),
+                'title'         => __('Theme', 'cryptopay-gateway-for-memberdash'),
                 'value'         => $gateway->theme ?? 'light',
                 'field_options' => array(
-                    'light' => __('Light', 'md-cryptopay'),
-                    'dark'  => __('Dark', 'md-cryptopay'),
+                    'light' => __('Light', 'cryptopay-gateway-for-memberdash'),
+                    'dark'  => __('Dark', 'cryptopay-gateway-for-memberdash'),
                 ),
                 'class'         => 'ms-text-large',
                 'ajax_data'     => array(1),