diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c4e5d121c..f532dfbe9 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -29,4 +29,4 @@ jobs:
     - name: Run test suite
       run: ./vendor/bin/phpunit
     - name: Run Woocommerce coding standards
-      run: ./vendor/bin/phpcs src modules woocommerce-paypal-commerce-gateway.php --extensions=php
\ No newline at end of file
+      run: ./vendor/bin/phpcs src modules woocommerce-paypal-payments.php --extensions=php
diff --git a/README.md b/README.md
index bd58a75ef..c17d1e9e6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# PayPal Payments for WooCommerce
+# WooCommerce PayPal Payments
 
 PayPal's latest complete payments processing solution. Accept PayPal, PayPal Credit, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
 
@@ -11,7 +11,7 @@ PayPal's latest complete payments processing solution. Accept PayPal, PayPal Cre
 ## Development
 
 1. Clone repository
-2. `$ cd paypal-for-woocommerce`
+2. `$ cd woocommerce-paypal-payments`
 3. `$ composer install`
 4. `$ yarn run dev`
 5. Change the `PAYPAL_INTEGRATION_DATE` constant to `gmdate( 'Y-m-d' )` to run the latest PayPal JavaScript SDK
@@ -22,7 +22,7 @@ Note: PHPUnit needs at least PHP 7.3.
 
 1. `$ composer install`
 2. `$ ./vendor/bin/phpunit`
-3. `$ ./vendor/bin/phpcs src modules woocommerce-paypal-commerce-gateway.php --extensions=php`
+3. `$ ./vendor/bin/phpcs src modules woocommerce-paypal-payments.php --extensions=php`
 
 ## Preparation for wordpress.org release
 
@@ -71,4 +71,4 @@ Fix the PayPal JavaScript SDK integration date by using the current date for the
 
 ## Contributing
 
-All feedback / bug reports / pull requests are welcome.
\ No newline at end of file
+All feedback / bug reports / pull requests are welcome.
diff --git a/composer.json b/composer.json
index 374752e19..476275b8e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "inpsyde/paypal-payments-for-woocommerce",
+    "name": "woocommerce/woocommerce-paypal-payments",
     "type": "wordpress-plugin",
     "description": "PayPal Commerce Platform for WooCommerce",
     "license": "GPL-2.0",
diff --git a/modules/ppcp-api-client/src/Authentication/class-paypalbearer.php b/modules/ppcp-api-client/src/Authentication/class-paypalbearer.php
index 0b637a8e9..55e06a045 100644
--- a/modules/ppcp-api-client/src/Authentication/class-paypalbearer.php
+++ b/modules/ppcp-api-client/src/Authentication/class-paypalbearer.php
@@ -120,7 +120,7 @@ class PayPalBearer implements Bearer {
 
 		if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) !== 200 ) {
 			$error = new RuntimeException(
-				__( 'Could not create token.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not create token.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-identitytoken.php b/modules/ppcp-api-client/src/Endpoint/class-identitytoken.php
index 8e97af2db..b76a2e8f5 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-identitytoken.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-identitytoken.php
@@ -94,7 +94,7 @@ class IdentityToken {
 			$error = new RuntimeException(
 				__(
 					'Could not create identity token.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				)
 			);
 
diff --git a/modules/ppcp-api-client/src/Endpoint/class-loginseller.php b/modules/ppcp-api-client/src/Endpoint/class-loginseller.php
index d3c08f349..d1ab76d0f 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-loginseller.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-loginseller.php
@@ -89,7 +89,7 @@ class LoginSeller {
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not fetch credentials.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not fetch credentials.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -109,7 +109,7 @@ class LoginSeller {
 					$json,
 					$status_code
 				) : new RuntimeException(
-					__( 'Credentials not found.', 'paypal-payments-for-woocommerce' )
+					__( 'Credentials not found.', 'woocommerce-paypal-payments' )
 				);
 			$this->logger->log(
 				'warning',
@@ -158,7 +158,7 @@ class LoginSeller {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not create token.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not create token.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -179,7 +179,7 @@ class LoginSeller {
 					$json,
 					$status_code
 				) : new RuntimeException(
-					__( 'No token found.', 'paypal-payments-for-woocommerce' )
+					__( 'No token found.', 'woocommerce-paypal-payments' )
 				);
 			$this->logger->log(
 				'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
index a2b1b04bc..ff1b979c8 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-orderendpoint.php
@@ -226,7 +226,7 @@ class OrderEndpoint {
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not create order.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not create order.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -290,7 +290,7 @@ class OrderEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not capture order.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not capture order.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -357,7 +357,7 @@ class OrderEndpoint {
 			$error = new RuntimeException(
 				__(
 					'Could not authorize order.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				)
 			);
 			$this->logger->log(
@@ -418,7 +418,7 @@ class OrderEndpoint {
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not retrieve order.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not retrieve order.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -434,7 +434,7 @@ class OrderEndpoint {
 		$status_code = (int) wp_remote_retrieve_response_code( $response );
 		if ( 404 === $status_code || empty( $response['body'] ) ) {
 			$error = new RuntimeException(
-				__( 'Could not retrieve order.', 'paypal-payments-for-woocommerce' ),
+				__( 'Could not retrieve order.', 'woocommerce-paypal-payments' ),
 				404
 			);
 			$this->logger->log(
@@ -502,7 +502,7 @@ class OrderEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not retrieve order.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not retrieve order.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php b/modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php
index 7c207928b..38526927f 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-partnerreferrals.php
@@ -94,7 +94,7 @@ class PartnerReferrals {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not create referral.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not create referral.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -131,7 +131,7 @@ class PartnerReferrals {
 		}
 
 		$error = new RuntimeException(
-			__( 'Action URL not found.', 'paypal-payments-for-woocommerce' )
+			__( 'Action URL not found.', 'woocommerce-paypal-payments' )
 		);
 		$this->logger->log(
 			'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php
index a2f2cc8fb..275f94c97 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-partnersendpoint.php
@@ -113,7 +113,7 @@ class PartnersEndpoint {
 			$error = new RuntimeException(
 				__(
 					'Could not fetch sellers status.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				)
 			);
 
diff --git a/modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php
index 4011668c1..6e3ec6b6d 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-paymentsendpoint.php
@@ -97,7 +97,7 @@ class PaymentsEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not get authorized payment info.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not get authorized payment info.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -156,7 +156,7 @@ class PaymentsEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not capture authorized payment.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not capture authorized payment.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -216,7 +216,7 @@ class PaymentsEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not refund payment.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not refund payment.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php
index 8d9028d9f..f76f419f5 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-paymenttokenendpoint.php
@@ -105,7 +105,7 @@ class PaymentTokenEndpoint {
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not fetch payment token.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not fetch payment token.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -143,7 +143,7 @@ class PaymentTokenEndpoint {
 			$error = new RuntimeException(
 				sprintf(
 					// translators: %d is the customer id.
-					__( 'No token stored for customer %d.', 'paypal-payments-for-woocommerce' ),
+					__( 'No token stored for customer %d.', 'woocommerce-paypal-payments' ),
 					$id
 				)
 			);
@@ -185,7 +185,7 @@ class PaymentTokenEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Could not delete payment token.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not delete payment token.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
diff --git a/modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php b/modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php
index 1ede006d0..c6e64af5d 100644
--- a/modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php
+++ b/modules/ppcp-api-client/src/Endpoint/class-webhookendpoint.php
@@ -101,7 +101,7 @@ class WebhookEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Not able to create a webhook.', 'paypal-payments-for-woocommerce' )
+				__( 'Not able to create a webhook.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -161,7 +161,7 @@ class WebhookEndpoint {
 
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Not able to delete the webhook.', 'paypal-payments-for-woocommerce' )
+				__( 'Not able to delete the webhook.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -223,7 +223,7 @@ class WebhookEndpoint {
 		$response = $this->request( $url, $args );
 		if ( is_wp_error( $response ) ) {
 			$error = new RuntimeException(
-				__( 'Not able to verify webhook event.', 'paypal-payments-for-woocommerce' )
+				__( 'Not able to verify webhook event.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'warning',
@@ -251,7 +251,7 @@ class WebhookEndpoint {
 
 		if ( ! $webhook->id() ) {
 			$error = new RuntimeException(
-				__( 'Not a valid webhook to verify.', 'paypal-payments-for-woocommerce' )
+				__( 'Not a valid webhook to verify.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log( 'warning', $error->getMessage(), array( 'webhook' => $webhook ) );
 			throw $error;
@@ -282,7 +282,7 @@ class WebhookEndpoint {
 					// translators: %s is the headers key.
 					__(
 						'Not a valid webhook event. Header %s is missing',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					$key
 				)
diff --git a/modules/ppcp-api-client/src/Entity/class-authorizationstatus.php b/modules/ppcp-api-client/src/Entity/class-authorizationstatus.php
index bd988075b..3f9903f1d 100644
--- a/modules/ppcp-api-client/src/Entity/class-authorizationstatus.php
+++ b/modules/ppcp-api-client/src/Entity/class-authorizationstatus.php
@@ -55,7 +55,7 @@ class AuthorizationStatus {
 			throw new RuntimeException(
 				sprintf(
 					// translators: %s is the current status.
-					__( '%s is not a valid status', 'paypal-payments-for-woocommerce' ),
+					__( '%s is not a valid status', 'woocommerce-paypal-payments' ),
 					$status
 				)
 			);
diff --git a/modules/ppcp-api-client/src/Entity/class-orderstatus.php b/modules/ppcp-api-client/src/Entity/class-orderstatus.php
index bee808451..e8e33cba8 100644
--- a/modules/ppcp-api-client/src/Entity/class-orderstatus.php
+++ b/modules/ppcp-api-client/src/Entity/class-orderstatus.php
@@ -50,7 +50,7 @@ class OrderStatus {
 			throw new RuntimeException(
 				sprintf(
 					// translators: %s is the current status.
-					__( '%s is not a valid status', 'paypal-payments-for-woocommerce' ),
+					__( '%s is not a valid status', 'woocommerce-paypal-payments' ),
 					$status
 				)
 			);
diff --git a/modules/ppcp-api-client/src/Entity/class-payertaxinfo.php b/modules/ppcp-api-client/src/Entity/class-payertaxinfo.php
index 2097e156a..cb3bff074 100644
--- a/modules/ppcp-api-client/src/Entity/class-payertaxinfo.php
+++ b/modules/ppcp-api-client/src/Entity/class-payertaxinfo.php
@@ -52,7 +52,7 @@ class PayerTaxInfo {
 			throw new RuntimeException(
 				sprintf(
 				// translators: %s is the current type.
-					__( '%s is not a valid tax type.', 'paypal-payments-for-woocommerce' ),
+					__( '%s is not a valid tax type.', 'woocommerce-paypal-payments' ),
 					$type
 				)
 			);
diff --git a/modules/ppcp-api-client/src/Entity/class-paymenttoken.php b/modules/ppcp-api-client/src/Entity/class-paymenttoken.php
index 2c222d592..555dde2d9 100644
--- a/modules/ppcp-api-client/src/Entity/class-paymenttoken.php
+++ b/modules/ppcp-api-client/src/Entity/class-paymenttoken.php
@@ -46,7 +46,7 @@ class PaymentToken {
 	public function __construct( string $id, string $type = self::TYPE_PAYMENT_METHOD_TOKEN ) {
 		if ( ! in_array( $type, self::VALID_TYPES, true ) ) {
 			throw new RuntimeException(
-				__( 'Not a valid payment source type.', 'paypal-payments-for-woocommerce' )
+				__( 'Not a valid payment source type.', 'woocommerce-paypal-payments' )
 			);
 		}
 		$this->id   = $id;
diff --git a/modules/ppcp-api-client/src/Exception/class-paypalapiexception.php b/modules/ppcp-api-client/src/Exception/class-paypalapiexception.php
index 398a09f88..d5da7357e 100644
--- a/modules/ppcp-api-client/src/Exception/class-paypalapiexception.php
+++ b/modules/ppcp-api-client/src/Exception/class-paypalapiexception.php
@@ -41,11 +41,11 @@ class PayPalApiException extends RuntimeException {
 		if ( ! isset( $response->message ) ) {
 			$response->message = __(
 				'Unknown error while connecting to PayPal.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			);
 		}
 		if ( ! isset( $response->name ) ) {
-			$response->name = __( 'Error', 'paypal-payments-for-woocommerce' );
+			$response->name = __( 'Error', 'woocommerce-paypal-payments' );
 		}
 		if ( ! isset( $response->details ) ) {
 			$response->details = array();
diff --git a/modules/ppcp-api-client/src/Factory/class-addressfactory.php b/modules/ppcp-api-client/src/Factory/class-addressfactory.php
index 2c8d59503..a996b9ce7 100644
--- a/modules/ppcp-api-client/src/Factory/class-addressfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-addressfactory.php
@@ -71,7 +71,7 @@ class AddressFactory {
 	public function from_paypal_response( \stdClass $data ): Address {
 		if ( ! isset( $data->country_code ) ) {
 			throw new RuntimeException(
-				__( 'No country given for address.', 'paypal-payments-for-woocommerce' )
+				__( 'No country given for address.', 'woocommerce-paypal-payments' )
 			);
 		}
 		return new Address(
diff --git a/modules/ppcp-api-client/src/Factory/class-amountfactory.php b/modules/ppcp-api-client/src/Factory/class-amountfactory.php
index 17e3f3b4c..f002a4a4b 100644
--- a/modules/ppcp-api-client/src/Factory/class-amountfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-amountfactory.php
@@ -153,11 +153,11 @@ class AmountFactory {
 	 */
 	public function from_paypal_response( \stdClass $data ): Amount {
 		if ( ! isset( $data->value ) || ! is_numeric( $data->value ) ) {
-			throw new RuntimeException( __( 'No value given', 'paypal-payments-for-woocommerce' ) );
+			throw new RuntimeException( __( 'No value given', 'woocommerce-paypal-payments' ) );
 		}
 		if ( ! isset( $data->currency_code ) ) {
 			throw new RuntimeException(
-				__( 'No currency given', 'paypal-payments-for-woocommerce' )
+				__( 'No currency given', 'woocommerce-paypal-payments' )
 			);
 		}
 
@@ -200,7 +200,7 @@ class AmountFactory {
 				throw new RuntimeException(
 					sprintf(
 					// translators: %s is the current breakdown key.
-						__( 'No value given for breakdown %s', 'paypal-payments-for-woocommerce' ),
+						__( 'No value given for breakdown %s', 'woocommerce-paypal-payments' ),
 						$key
 					)
 				);
@@ -209,7 +209,7 @@ class AmountFactory {
 				throw new RuntimeException(
 					sprintf(
 					// translators: %s is the current breakdown key.
-						__( 'No currency given for breakdown %s', 'paypal-payments-for-woocommerce' ),
+						__( 'No currency given for breakdown %s', 'woocommerce-paypal-payments' ),
 						$key
 					)
 				);
diff --git a/modules/ppcp-api-client/src/Factory/class-authorizationfactory.php b/modules/ppcp-api-client/src/Factory/class-authorizationfactory.php
index bd85c4ed3..6cc999d10 100644
--- a/modules/ppcp-api-client/src/Factory/class-authorizationfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-authorizationfactory.php
@@ -29,13 +29,13 @@ class AuthorizationFactory {
 	public function from_paypal_response( \stdClass $data ): Authorization {
 		if ( ! isset( $data->id ) ) {
 			throw new RuntimeException(
-				__( 'Does not contain an id.', 'paypal-payments-for-woocommerce' )
+				__( 'Does not contain an id.', 'woocommerce-paypal-payments' )
 			);
 		}
 
 		if ( ! isset( $data->status ) ) {
 			throw new RuntimeException(
-				__( 'Does not contain status.', 'paypal-payments-for-woocommerce' )
+				__( 'Does not contain status.', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Factory/class-itemfactory.php b/modules/ppcp-api-client/src/Factory/class-itemfactory.php
index 2271900eb..78dbd4656 100644
--- a/modules/ppcp-api-client/src/Factory/class-itemfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-itemfactory.php
@@ -120,17 +120,17 @@ class ItemFactory {
 	public function from_paypal_response( \stdClass $data ): Item {
 		if ( ! isset( $data->name ) ) {
 			throw new RuntimeException(
-				__( 'No name for item given', 'paypal-payments-for-woocommerce' )
+				__( 'No name for item given', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $data->quantity ) || ! is_numeric( $data->quantity ) ) {
 			throw new RuntimeException(
-				__( 'No quantity for item given', 'paypal-payments-for-woocommerce' )
+				__( 'No quantity for item given', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $data->unit_amount->value ) || ! isset( $data->unit_amount->currency_code ) ) {
 			throw new RuntimeException(
-				__( 'No money values for item given', 'paypal-payments-for-woocommerce' )
+				__( 'No money values for item given', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Factory/class-orderfactory.php b/modules/ppcp-api-client/src/Factory/class-orderfactory.php
index 95cf4231f..7a7f057db 100644
--- a/modules/ppcp-api-client/src/Factory/class-orderfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-orderfactory.php
@@ -114,22 +114,22 @@ class OrderFactory {
 	public function from_paypal_response( \stdClass $order_data ): Order {
 		if ( ! isset( $order_data->id ) ) {
 			throw new RuntimeException(
-				__( 'Order does not contain an id.', 'paypal-payments-for-woocommerce' )
+				__( 'Order does not contain an id.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $order_data->purchase_units ) || ! is_array( $order_data->purchase_units ) ) {
 			throw new RuntimeException(
-				__( 'Order does not contain items.', 'paypal-payments-for-woocommerce' )
+				__( 'Order does not contain items.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $order_data->status ) ) {
 			throw new RuntimeException(
-				__( 'Order does not contain status.', 'paypal-payments-for-woocommerce' )
+				__( 'Order does not contain status.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $order_data->intent ) ) {
 			throw new RuntimeException(
-				__( 'Order does not contain intent.', 'paypal-payments-for-woocommerce' )
+				__( 'Order does not contain intent.', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Factory/class-payeefactory.php b/modules/ppcp-api-client/src/Factory/class-payeefactory.php
index 1b52cd625..ddd489e1d 100644
--- a/modules/ppcp-api-client/src/Factory/class-payeefactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-payeefactory.php
@@ -28,7 +28,7 @@ class PayeeFactory {
 	public function from_paypal_response( \stdClass $data ) {
 		if ( ! isset( $data->email_address ) ) {
 			throw new RuntimeException(
-				__( 'No email for payee given.', 'paypal-payments-for-woocommerce' )
+				__( 'No email for payee given.', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php b/modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php
index 3896cb32a..eac127695 100644
--- a/modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-paymenttokenfactory.php
@@ -28,7 +28,7 @@ class PaymentTokenFactory {
 	public function from_paypal_response( \stdClass $data ): PaymentToken {
 		if ( ! isset( $data->id ) ) {
 			throw new RuntimeException(
-				__( 'No id for payment token given', 'paypal-payments-for-woocommerce' )
+				__( 'No id for payment token given', 'woocommerce-paypal-payments' )
 			);
 		}
 		return new PaymentToken(
diff --git a/modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php b/modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php
index d579503e8..5931ba49d 100644
--- a/modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-purchaseunitfactory.php
@@ -194,7 +194,7 @@ class PurchaseUnitFactory {
 	public function from_paypal_response( \stdClass $data ): PurchaseUnit {
 		if ( ! isset( $data->reference_id ) || ! is_string( $data->reference_id ) ) {
 			throw new RuntimeException(
-				__( 'No reference ID given.', 'paypal-payments-for-woocommerce' )
+				__( 'No reference ID given.', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Factory/class-shippingfactory.php b/modules/ppcp-api-client/src/Factory/class-shippingfactory.php
index 8aaf98f74..dcebb9b9f 100644
--- a/modules/ppcp-api-client/src/Factory/class-shippingfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-shippingfactory.php
@@ -44,7 +44,7 @@ class ShippingFactory {
 		// Replicates the Behavior of \WC_Order::get_formatted_shipping_full_name().
 		$full_name = sprintf(
 			// translators: %1$s is the first name and %2$s is the second name. wc translation.
-			_x( '%1$s %2$s', 'full name', 'paypal-payments-for-woocommerce' ),
+			_x( '%1$s %2$s', 'full name', 'woocommerce-paypal-payments' ),
 			$customer->get_shipping_first_name(),
 			$customer->get_shipping_last_name()
 		);
@@ -82,12 +82,12 @@ class ShippingFactory {
 	public function from_paypal_response( \stdClass $data ): Shipping {
 		if ( ! isset( $data->name->full_name ) ) {
 			throw new RuntimeException(
-				__( 'No name was given for shipping.', 'paypal-payments-for-woocommerce' )
+				__( 'No name was given for shipping.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $data->address ) ) {
 			throw new RuntimeException(
-				__( 'No address was given for shipping.', 'paypal-payments-for-woocommerce' )
+				__( 'No address was given for shipping.', 'woocommerce-paypal-payments' )
 			);
 		}
 		$address = $this->address_factory->from_paypal_response( $data->address );
diff --git a/modules/ppcp-api-client/src/Factory/class-webhookfactory.php b/modules/ppcp-api-client/src/Factory/class-webhookfactory.php
index 8f68d4b3f..91a7da4a3 100644
--- a/modules/ppcp-api-client/src/Factory/class-webhookfactory.php
+++ b/modules/ppcp-api-client/src/Factory/class-webhookfactory.php
@@ -60,17 +60,17 @@ class WebhookFactory {
 	public function from_paypal_response( \stdClass $data ): Webhook {
 		if ( ! isset( $data->id ) ) {
 			throw new RuntimeException(
-				__( 'No id for webhook given.', 'paypal-payments-for-woocommerce' )
+				__( 'No id for webhook given.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $data->url ) ) {
 			throw new RuntimeException(
-				__( 'No URL for webhook given.', 'paypal-payments-for-woocommerce' )
+				__( 'No URL for webhook given.', 'woocommerce-paypal-payments' )
 			);
 		}
 		if ( ! isset( $data->event_types ) ) {
 			throw new RuntimeException(
-				__( 'No event types for webhook given.', 'paypal-payments-for-woocommerce' )
+				__( 'No event types for webhook given.', 'woocommerce-paypal-payments' )
 			);
 		}
 
diff --git a/modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php b/modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php
index 2b1fb0a97..3f1a5a718 100644
--- a/modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php
+++ b/modules/ppcp-api-client/src/Repository/class-partnerreferralsdata.php
@@ -79,7 +79,7 @@ class PartnerReferralsData {
 				),
 				'return_url_description' => __(
 					'Return to your shop.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'show_add_credit_card'   => true,
 			),
diff --git a/modules/ppcp-button/services.php b/modules/ppcp-button/services.php
index 40e9954d9..673108e57 100644
--- a/modules/ppcp-button/services.php
+++ b/modules/ppcp-button/services.php
@@ -88,7 +88,7 @@ return array(
 	'button.url'                        => static function ( $container ): string {
 		return plugins_url(
 			'/modules/ppcp-button/',
-			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
+			dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'
 		);
 	},
 	'button.request-data'               => static function ( $container ): RequestData {
diff --git a/modules/ppcp-button/src/Assets/class-smartbutton.php b/modules/ppcp-button/src/Assets/class-smartbutton.php
index 330f949e7..f686cb636 100644
--- a/modules/ppcp-button/src/Assets/class-smartbutton.php
+++ b/modules/ppcp-button/src/Assets/class-smartbutton.php
@@ -518,19 +518,19 @@ class SmartButton implements SmartButtonInterface {
                 >
             </div>',
 			esc_attr( $id ),
-			esc_html__( 'Save your card', 'paypal-payments-for-woocommerce' )
+			esc_html__( 'Save your card', 'woocommerce-paypal-payments' )
 		) : '';
 
-		$label = 'checkout' === $this->context() ? __( 'Place order', 'paypal-payments-for-woocommerce' ) : __( 'Pay for order', 'paypal-payments-for-woocommerce' );
+		$label = 'checkout' === $this->context() ? __( 'Place order', 'woocommerce-paypal-payments' ) : __( 'Pay for order', 'woocommerce-paypal-payments' );
 
 		printf(
 			'<div id="%1$s" style="display:none;">
                         <button class="button alt">%6$s</button>
                     </div><div id="payments-sdk__contingency-lightbox"></div><style id="ppcp-hide-dcc">.payment_method_ppcp-credit-card-gateway {display:none;}</style>',
 			esc_attr( $id ),
-			esc_html__( 'Credit Card number', 'paypal-payments-for-woocommerce' ),
-			esc_html__( 'Expiration', 'paypal-payments-for-woocommerce' ),
-			esc_html__( 'CVV', 'paypal-payments-for-woocommerce' ),
+			esc_html__( 'Credit Card number', 'woocommerce-paypal-payments' ),
+			esc_html__( 'Expiration', 'woocommerce-paypal-payments' ),
+			esc_html__( 'CVV', 'woocommerce-paypal-payments' ),
             //phpcs:ignore
             $save_card,
 			esc_html( $label )
@@ -633,14 +633,14 @@ class SmartButton implements SmartButtonInterface {
 				'labels'            => array(
 					'credit_card_number' => '',
 					'cvv'                => '',
-					'mm_yyyy'            => __( 'MM/YYYY', 'paypal-payments-for-woocommerce' ),
+					'mm_yyyy'            => __( 'MM/YYYY', 'woocommerce-paypal-payments' ),
 					'fields_not_valid'   => __(
 						'Unfortunatly, your credit card details are not valid.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					'card_not_supported' => __(
 						'Unfortunatly, we do not support your credit card.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 				),
 				'valid_cards'       => $this->dcc_applies->valid_cards(),
@@ -650,7 +650,7 @@ class SmartButton implements SmartButtonInterface {
 				'error' => array(
 					'generic' => __(
 						'Something went wrong. Please try again or choose another payment source.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 				),
 			),
diff --git a/modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php b/modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php
index 783618c43..616dc6442 100644
--- a/modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php
+++ b/modules/ppcp-button/src/Endpoint/class-approveorderendpoint.php
@@ -116,7 +116,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 			$data = $this->request_data->read_request( $this->nonce() );
 			if ( ! isset( $data['order_id'] ) ) {
 				throw new RuntimeException(
-					__( 'No order id given', 'paypal-payments-for-woocommerce' )
+					__( 'No order id given', 'woocommerce-paypal-payments' )
 				);
 			}
 
@@ -125,7 +125,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 				throw new RuntimeException(
 					sprintf(
 						// translators: %s is the id of the order.
-						__( 'Order %s not found.', 'paypal-payments-for-woocommerce' ),
+						__( 'Order %s not found.', 'woocommerce-paypal-payments' ),
 						$data['order_id']
 					)
 				);
@@ -143,7 +143,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 						throw new RuntimeException(
 							__(
 								'Unfortunately, we do not accept this card.',
-								'paypal-payments-for-woocommerce'
+								'woocommerce-paypal-payments'
 							),
 							100
 						);
@@ -154,7 +154,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 					throw new RuntimeException(
 						__(
 							'Something went wrong. Please try again.',
-							'paypal-payments-for-woocommerce'
+							'woocommerce-paypal-payments'
 						)
 					);
 				}
@@ -162,7 +162,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 					throw new RuntimeException(
 						__(
 							'Unfortunatly, we can\'t accept your card. Please choose a different payment method.',
-							'paypal-payments-for-woocommerce'
+							'woocommerce-paypal-payments'
 						)
 					);
 				}
@@ -174,7 +174,7 @@ class ApproveOrderEndpoint implements EndpointInterface {
 				throw new RuntimeException(
 					sprintf(
 					// translators: %s is the id of the order.
-						__( 'Order %s is not approved yet.', 'paypal-payments-for-woocommerce' ),
+						__( 'Order %s is not approved yet.', 'woocommerce-paypal-payments' ),
 						$data['order_id']
 					)
 				);
diff --git a/modules/ppcp-button/src/Endpoint/class-changecartendpoint.php b/modules/ppcp-button/src/Endpoint/class-changecartendpoint.php
index 7643e28b7..1422ce940 100644
--- a/modules/ppcp-button/src/Endpoint/class-changecartendpoint.php
+++ b/modules/ppcp-button/src/Endpoint/class-changecartendpoint.php
@@ -127,7 +127,7 @@ class ChangeCartEndpoint implements EndpointInterface {
 					'name'    => '',
 					'message' => __(
 						'Necessary fields not defined. Action aborted.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					'code'    => 0,
 					'details' => array(),
@@ -166,7 +166,7 @@ class ChangeCartEndpoint implements EndpointInterface {
 
 		$message = __(
 			'Something went wrong. Action aborted',
-			'paypal-payments-for-woocommerce'
+			'woocommerce-paypal-payments'
 		);
 		$errors  = wc_get_notices( 'error' );
 		if ( count( $errors ) ) {
diff --git a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php b/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php
index cc3483395..b18f351f4 100644
--- a/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php
+++ b/modules/ppcp-button/src/Endpoint/class-createorderendpoint.php
@@ -150,7 +150,7 @@ class CreateOrderEndpoint implements EndpointInterface {
 					wp_send_json_error(
 						array(
 							'name'    => 'order-not-found',
-							'message' => __( 'Order not found', 'paypal-payments-for-woocommerce' ),
+							'message' => __( 'Order not found', 'woocommerce-paypal-payments' ),
 							'code'    => 0,
 							'details' => array(),
 						)
@@ -284,7 +284,7 @@ class CreateOrderEndpoint implements EndpointInterface {
 		$parsed_values = wp_parse_args( $form_values );
 		if ( ! isset( $parsed_values['terms'] ) ) {
 			throw new \RuntimeException(
-				__( 'Please read and accept the terms and conditions to proceed with your order.', 'paypal-payments-for-woocommerce' )
+				__( 'Please read and accept the terms and conditions to proceed with your order.', 'woocommerce-paypal-payments' )
 			);
 		}
 	}
diff --git a/modules/ppcp-button/src/Endpoint/class-requestdata.php b/modules/ppcp-button/src/Endpoint/class-requestdata.php
index b3928be2b..58d520308 100644
--- a/modules/ppcp-button/src/Endpoint/class-requestdata.php
+++ b/modules/ppcp-button/src/Endpoint/class-requestdata.php
@@ -48,7 +48,7 @@ class RequestData {
 		) {
 			remove_filter( 'nonce_user_logged_out', array( $this, 'nonce_fix' ), 100 );
 			throw new RuntimeException(
-				__( 'Could not validate nonce.', 'paypal-payments-for-woocommerce' )
+				__( 'Could not validate nonce.', 'woocommerce-paypal-payments' )
 			);
 		}
 		$this->dequeue_nonce_fix();
diff --git a/modules/ppcp-onboarding/services.php b/modules/ppcp-onboarding/services.php
index b4087503c..1435faa21 100644
--- a/modules/ppcp-onboarding/services.php
+++ b/modules/ppcp-onboarding/services.php
@@ -131,7 +131,7 @@ return array(
 	'onboarding.url'                            => static function ( $container ): string {
 		return plugins_url(
 			'/modules/ppcp-onboarding/',
-			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
+			dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'
 		);
 	},
 
diff --git a/modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php b/modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php
index 2fe2e14d2..da35d2b8a 100644
--- a/modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php
+++ b/modules/ppcp-onboarding/src/Render/class-onboardingrenderer.php
@@ -66,7 +66,7 @@ class OnboardingRenderer {
 			$url   = $is_production ? $this->production_partner_referrals->signup_link() : $this->sandbox_partner_referrals->signup_link();
 			$url   = add_query_arg( $args, $url );
 			$id    = $is_production ? 'connect-to-production' : 'connect-to-sandbox';
-			$label = $is_production ? __( 'Connect to PayPal', 'paypal-payments-for-woocommerce' ) : __( 'Connect to PayPal Sandbox', 'paypal-payments-for-woocommerce' );
+			$label = $is_production ? __( 'Connect to PayPal', 'woocommerce-paypal-payments' ) : __( 'Connect to PayPal Sandbox', 'woocommerce-paypal-payments' );
 				$this->render_button(
 					$url,
 					$id,
@@ -83,7 +83,7 @@ class OnboardingRenderer {
 		} catch ( RuntimeException $exception ) {
 			esc_html_e(
 				'We could not properly connect to PayPal. Please reload the page to continue',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			);
 		}
 	}
diff --git a/modules/ppcp-session/src/Cancellation/class-cancelview.php b/modules/ppcp-session/src/Cancellation/class-cancelview.php
index 64e176465..2c4e1356b 100644
--- a/modules/ppcp-session/src/Cancellation/class-cancelview.php
+++ b/modules/ppcp-session/src/Cancellation/class-cancelview.php
@@ -30,7 +30,7 @@ class CancelView {
 				esc_html__(
 					'You are currently paying with PayPal. If you want to cancel
                             this process, please click %1$shere%2$s.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'<a href="' . esc_url( $url ) . '">',
 				'</a>'
diff --git a/modules/ppcp-subscription/src/class-renewalhandler.php b/modules/ppcp-subscription/src/class-renewalhandler.php
index 28b86b53a..e0824e3a4 100644
--- a/modules/ppcp-subscription/src/class-renewalhandler.php
+++ b/modules/ppcp-subscription/src/class-renewalhandler.php
@@ -94,7 +94,7 @@ class RenewalHandler {
 			'info',
 			sprintf(
 				// translators: %d is the id of the order.
-				__( 'Start moneytransfer for order %d', 'paypal-payments-for-woocommerce' ),
+				__( 'Start moneytransfer for order %d', 'woocommerce-paypal-payments' ),
 				(int) $wc_order->get_id()
 			),
 			array(
@@ -111,7 +111,7 @@ class RenewalHandler {
 					// translators: %1$d is the order number, %2$s the error message.
 					__(
 						'An error occured while trying to renew the subscription for order %1$d: %2$s',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					(int) $wc_order->get_id(),
 					$error->getMessage()
@@ -129,7 +129,7 @@ class RenewalHandler {
 				// translators: %d is the order number.
 				__(
 					'Moneytransfer for order %d is completed.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				(int) $wc_order->get_id()
 			),
@@ -183,7 +183,7 @@ class RenewalHandler {
 					// translators: %d is the customer id.
 					__(
 						'No payment token found for customer %d',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					(int) $customer->get_id()
 				),
@@ -208,7 +208,7 @@ class RenewalHandler {
 		if ( $order->intent() === 'CAPTURE' && $order->status()->is( OrderStatus::COMPLETED ) ) {
 			$wc_order->update_status(
 				'processing',
-				__( 'Payment received.', 'paypal-payments-for-woocommerce' )
+				__( 'Payment received.', 'woocommerce-paypal-payments' )
 			);
 			\WC_Subscriptions_Manager::process_subscription_payments_on_order( $wc_order );
 		}
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 79d7ebca5..e32cb5e6b 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -178,9 +178,9 @@ return array(
 
 		$fields              = array(
 			'sandbox_on'                     => array(
-				'title'        => __( 'Sandbox', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Sandbox', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'To test your WooCommerce installation, you can use the sandbox mode.', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'To test your WooCommerce installation, you can use the sandbox mode.', 'woocommerce-paypal-payments' ),
 				'default'      => 0,
 				'screens'      => array(
 					State::STATE_START,
@@ -193,7 +193,7 @@ return array(
 
 			// Production credentials.
 			'credentials_production_heading' => array(
-				'heading'      => __( 'API', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'API', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -203,7 +203,7 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'ppcp_onboarding_production'     => array(
-				'title'        => __( 'Connect to PayPal', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Connect to PayPal', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp_onboarding',
 				'screens'      => array(
 					State::STATE_START,
@@ -215,10 +215,10 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'ppcp_disconnect_production'     => array(
-				'title'        => __( 'Disconnect from PayPal', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Disconnect from PayPal', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-text',
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
-				'text'         => '<button type="button" class="button ppcp-disconnect production">' . esc_html__( 'Disconnect', 'paypal-payments-for-woocommerce' ) . '</button>',
+				'text'         => '<button type="button" class="button ppcp-disconnect production">' . esc_html__( 'Disconnect', 'woocommerce-paypal-payments' ) . '</button>',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,
@@ -230,9 +230,9 @@ return array(
 			),
 			'production_toggle_manual_input' => array(
 				'type'         => 'ppcp-text',
-				'title'        => __( 'Manual mode', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Manual mode', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
-				'text'         => '<button type="button" id="ppcp[production_toggle_manual_input]" class="production-toggle">' . __( 'Toggle to manual credential input', 'paypal-payments-for-woocommerce' ) . '</button>',
+				'text'         => '<button type="button" id="ppcp[production_toggle_manual_input]" class="production-toggle">' . __( 'Toggle to manual credential input', 'woocommerce-paypal-payments' ) . '</button>',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,
@@ -242,12 +242,12 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'merchant_email_production'      => array(
-				'title'        => __( 'Live Email address', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Live Email address', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
 				'type'         => 'text',
 				'required'     => true,
 				'desc_tip'     => true,
-				'description'  => __( 'The email address of your PayPal account.', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The email address of your PayPal account.', 'woocommerce-paypal-payments' ),
 				'default'      => '',
 				'screens'      => array(
 					State::STATE_START,
@@ -258,11 +258,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'merchant_id_production'         => array(
-				'title'        => __( 'Live Merchant Id', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Live Merchant Id', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-text-input',
 				'desc_tip'     => true,
-				'description'  => __( 'The merchant id of your account ', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The merchant id of your account ', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -273,11 +273,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'client_id_production'           => array(
-				'title'        => __( 'Live Client Id', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Live Client Id', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-text-input',
 				'desc_tip'     => true,
-				'description'  => __( 'The client id of your api ', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The client id of your api ', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -288,11 +288,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'client_secret_production'       => array(
-				'title'        => __( 'Live Secret Key', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Live Secret Key', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->production_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-password',
 				'desc_tip'     => true,
-				'description'  => __( 'The secret key of your api', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The secret key of your api', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -305,7 +305,7 @@ return array(
 
 			// Sandbox credentials.
 			'credentials_sandbox_heading'    => array(
-				'heading'      => __( 'Sandbox API', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Sandbox API', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -315,7 +315,7 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'ppcp_onboarding_sandbox'        => array(
-				'title'        => __( 'Connect to PayPal', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Connect to PayPal', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp_onboarding',
 				'screens'      => array(
 					State::STATE_START,
@@ -327,10 +327,10 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'ppcp_disconnect_sandbox'        => array(
-				'title'        => __( 'Disconnect from PayPal Sandbox', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Disconnect from PayPal Sandbox', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-text',
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
-				'text'         => '<button type="button" class="button ppcp-disconnect sandbox">' . esc_html__( 'Disconnect', 'paypal-payments-for-woocommerce' ) . '</button>',
+				'text'         => '<button type="button" class="button ppcp-disconnect sandbox">' . esc_html__( 'Disconnect', 'woocommerce-paypal-payments' ) . '</button>',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,
@@ -342,9 +342,9 @@ return array(
 			),
 			'sandbox_toggle_manual_input'    => array(
 				'type'         => 'ppcp-text',
-				'title'        => __( 'Manual mode', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Manual mode', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
-				'text'         => '<button type="button" id="ppcp[sandbox_toggle_manual_input]" class="sandbox-toggle">' . __( 'Toggle to manual credential input', 'paypal-payments-for-woocommerce' ) . '</button>',
+				'text'         => '<button type="button" id="ppcp[sandbox_toggle_manual_input]" class="sandbox-toggle">' . __( 'Toggle to manual credential input', 'woocommerce-paypal-payments' ) . '</button>',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,
@@ -354,12 +354,12 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'merchant_email_sandbox'         => array(
-				'title'        => __( 'Sandbox Email address', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Sandbox Email address', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
 				'type'         => 'text',
 				'required'     => true,
 				'desc_tip'     => true,
-				'description'  => __( 'The email address of your PayPal account.', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The email address of your PayPal account.', 'woocommerce-paypal-payments' ),
 				'default'      => '',
 				'screens'      => array(
 					State::STATE_START,
@@ -370,11 +370,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'merchant_id_sandbox'            => array(
-				'title'        => __( 'Sandbox Merchant Id', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Sandbox Merchant Id', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-text-input',
 				'desc_tip'     => true,
-				'description'  => __( 'The merchant id of your account ', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The merchant id of your account ', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -385,11 +385,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'client_id_sandbox'              => array(
-				'title'        => __( 'Sandbox Client Id', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Sandbox Client Id', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-text-input',
 				'desc_tip'     => true,
-				'description'  => __( 'The client id of your api ', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The client id of your api ', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -400,11 +400,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'client_secret_sandbox'          => array(
-				'title'        => __( 'Sandbox Secret Key', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Sandbox Secret Key', 'woocommerce-paypal-payments' ),
 				'classes'      => array( State::STATE_ONBOARDED === $state->sandbox_state() ? 'onboarded' : '' ),
 				'type'         => 'ppcp-password',
 				'desc_tip'     => true,
-				'description'  => __( 'The secret key of your api', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'The secret key of your api', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_START,
@@ -416,7 +416,7 @@ return array(
 			),
 
 			'checkout_settings_heading'      => array(
-				'heading'      => __( 'PayPal Checkout Plugin Settings', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'PayPal Checkout Plugin Settings', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -426,13 +426,13 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'title'                          => array(
-				'title'        => __( 'Title', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Title', 'woocommerce-paypal-payments' ),
 				'type'         => 'text',
 				'description'  => __(
 					'This controls the title which the user sees during checkout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
-				'default'      => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
+				'default'      => __( 'PayPal', 'woocommerce-paypal-payments' ),
 				'desc_tip'     => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -442,10 +442,10 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'dcc_enabled'                    => array(
-				'title'        => __( 'Enable/Disable', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable/Disable', 'woocommerce-paypal-payments' ),
 				'desc_tip'     => true,
-				'description'  => __( 'Once enabled, the Credit Card option will show up in the checkout.', 'paypal-payments-for-woocommerce' ),
-				'label'        => __( 'Enable PayPal Card Processing', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'Once enabled, the Credit Card option will show up in the checkout.', 'woocommerce-paypal-payments' ),
+				'label'        => __( 'Enable PayPal Card Processing', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'default'      => false,
 				'gateway'      => 'dcc',
@@ -457,13 +457,13 @@ return array(
 				),
 			),
 			'dcc_gateway_title'              => array(
-				'title'        => __( 'Title', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Title', 'woocommerce-paypal-payments' ),
 				'type'         => 'text',
 				'description'  => __(
 					'This controls the title which the user sees during checkout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
-				'default'      => __( 'Credit Cards', 'paypal-payments-for-woocommerce' ),
+				'default'      => __( 'Credit Cards', 'woocommerce-paypal-payments' ),
 				'desc_tip'     => true,
 				'screens'      => array(
 					State::STATE_ONBOARDED,
@@ -474,16 +474,16 @@ return array(
 				'gateway'      => 'dcc',
 			),
 			'description'                    => array(
-				'title'        => __( 'Description', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Description', 'woocommerce-paypal-payments' ),
 				'type'         => 'text',
 				'desc_tip'     => true,
 				'description'  => __(
 					'This controls the description which the user sees during checkout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'default'      => __(
 					'Pay via PayPal; you can pay with your credit card if you don\'t have a PayPal account.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -493,18 +493,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'intent'                         => array(
-				'title'        => __( 'Intent', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Intent', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'capture',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The intent to either capture payment immediately or authorize a payment for an order after order creation.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'capture'   => __( 'Capture', 'paypal-payments-for-woocommerce' ),
-					'authorize' => __( 'Authorize', 'paypal-payments-for-woocommerce' ),
+					'capture'   => __( 'Capture', 'woocommerce-paypal-payments' ),
+					'authorize' => __( 'Authorize', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_ONBOARDED,
@@ -513,15 +513,15 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'capture_for_virtual_only'       => array(
-				'title'        => __( 'Capture Virtual-Only Orders ', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Capture Virtual-Only Orders ', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'default'      => false,
 				'desc_tip'     => true,
 				'description'  => __(
 					'If the order contains exclusively virtual items, enable this to immediately capture, rather than authorize, the transaction.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
-				'label'        => __( 'Capture Virtual-Only Orders', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Capture Virtual-Only Orders', 'woocommerce-paypal-payments' ),
 				'screens'      => array(
 					State::STATE_ONBOARDED,
 				),
@@ -529,15 +529,15 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'payee_preferred'                => array(
-				'title'        => __( 'Instant Payments ', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Instant Payments ', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'default'      => false,
 				'desc_tip'     => true,
 				'description'  => __(
 					'If you enable this setting, PayPal will be instructed not to allow the buyer to use funding sources that take additional time to complete (for example, eChecks). Instead, the buyer will be required to use an instant funding source, such as an instant transfer, a credit/debit card, or PayPal Credit.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
-				'label'        => __( 'Require Instant Payment', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Require Instant Payment', 'woocommerce-paypal-payments' ),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
 					State::STATE_ONBOARDED,
@@ -546,13 +546,13 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'brand_name'                     => array(
-				'title'        => __( 'Brand Name', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Brand Name', 'woocommerce-paypal-payments' ),
 				'type'         => 'text',
 				'default'      => get_bloginfo( 'name' ),
 				'desc_tip'     => true,
 				'description'  => __(
 					'Control the name of your shop, customers will see in the PayPal process.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -562,18 +562,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'landing_page'                   => array(
-				'title'        => __( 'Landing Page', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Landing Page', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'gold',
 				'desc_tip'     => true,
 				'description'  => __(
 					'Type of PayPal page to display.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					ApplicationContext::LANDING_PAGE_LOGIN => __( 'Login (PayPal account login)', 'paypal-payments-for-woocommerce' ),
-					ApplicationContext::LANDING_PAGE_BILLING => __( 'Billing (Non-PayPal account)', 'paypal-payments-for-woocommerce' ),
+					ApplicationContext::LANDING_PAGE_LOGIN => __( 'Login (PayPal account login)', 'woocommerce-paypal-payments' ),
+					ApplicationContext::LANDING_PAGE_BILLING => __( 'Billing (Non-PayPal account)', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -583,26 +583,26 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'disable_funding'                => array(
-				'title'        => __( 'Disable funding sources', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Disable funding sources', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-multiselect',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => array(),
 				'desc_tip'     => true,
 				'description'  => __(
 					'By default all possible funding sources will be shown. You can disable some sources, if you wish.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'card'       => _x( 'Credit or debit cards', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'credit'     => _x( 'PayPal Credit', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'sepa'       => _x( 'SEPA-Lastschrift', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'bancontact' => _x( 'Bancontact', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'eps'        => _x( 'eps', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'giropay'    => _x( 'giropay', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'ideal'      => _x( 'iDEAL', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'mybank'     => _x( 'MyBank', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'p24'        => _x( 'Przelewy24', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
-					'sofort'     => _x( 'Sofort', 'Name of payment method', 'paypal-payments-for-woocommerce' ),
+					'card'       => _x( 'Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'credit'     => _x( 'PayPal Credit', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'sepa'       => _x( 'SEPA-Lastschrift', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'bancontact' => _x( 'Bancontact', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'eps'        => _x( 'eps', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'giropay'    => _x( 'giropay', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'ideal'      => _x( 'iDEAL', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'mybank'     => _x( 'MyBank', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'p24'        => _x( 'Przelewy24', 'Name of payment method', 'woocommerce-paypal-payments' ),
+					'sofort'     => _x( 'Sofort', 'Name of payment method', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -612,11 +612,11 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'vault_enabled'                  => array(
-				'title'        => __( 'Vaulting', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Vaulting', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'desc_tip'     => true,
-				'label'        => __( 'Enable vaulting', 'paypal-payments-for-woocommerce' ),
-				'description'  => __( 'Enables you to store payment tokens for subscriptions.', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable vaulting', 'woocommerce-paypal-payments' ),
+				'description'  => __( 'Enables you to store payment tokens for subscriptions.', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_ONBOARDED,
@@ -626,11 +626,11 @@ return array(
 			),
 
 			'logging_enabled'                => array(
-				'title'        => __( 'Logging', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Logging', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'desc_tip'     => true,
-				'label'        => __( 'Enable logging', 'paypal-payments-for-woocommerce' ),
-				'description'  => __( 'Enable logging of unexpected behavior. This can also log private data and should only be enabled in a development or stage environment.', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable logging', 'woocommerce-paypal-payments' ),
+				'description'  => __( 'Enable logging of unexpected behavior. This can also log private data and should only be enabled in a development or stage environment.', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -640,10 +640,10 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'prefix'                         => array(
-				'title'        => __( 'Invoice prefix', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Invoice prefix', 'woocommerce-paypal-payments' ),
 				'type'         => 'text',
 				'desc_tip'     => true,
-				'description'  => __( 'If you use your PayPal account with more than one installation, please use a distinct prefix to seperate those installations. Please do not use numbers in your prefix.', 'paypal-payments-for-woocommerce' ),
+				'description'  => __( 'If you use your PayPal account with more than one installation, please use a distinct prefix to seperate those installations. Please do not use numbers in your prefix.', 'woocommerce-paypal-payments' ),
 				'default'      => 'WC-',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -655,7 +655,7 @@ return array(
 
 			// General button styles.
 			'button_style_heading'           => array(
-				'heading'      => __( 'Checkout', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Checkout', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -665,9 +665,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_enabled'                 => array(
-				'title'        => __( 'Enable buttons on Checkout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable buttons on Checkout', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Checkout', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Checkout', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -677,18 +677,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_layout'                  => array(
-				'title'        => __( 'Button Layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'vertical',
 				'desc_tip'     => true,
 				'description'  => __(
 					'If additional funding sources are available to the buyer through PayPal, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'vertical'   => __( 'Vertical', 'paypal-payments-for-woocommerce' ),
-					'horizontal' => __( 'Horizontal', 'paypal-payments-for-woocommerce' ),
+					'vertical'   => __( 'Vertical', 'woocommerce-paypal-payments' ),
+					'horizontal' => __( 'Horizontal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -698,14 +698,14 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_tagline'                 => array(
-				'title'        => __( 'Tagline', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Tagline', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
 				'default'      => true,
-				'label'        => __( 'Enable tagline', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable tagline', 'woocommerce-paypal-payments' ),
 				'desc_tip'     => true,
 				'description'  => __(
 					'Add the tagline. This line will only show up, if you select a horizontal layout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -715,20 +715,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_label'                   => array(
-				'title'        => __( 'Button Label', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Label', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'paypal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'This controls the label on the primary button.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'paypal'   => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
-					'checkout' => __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' ),
-					'buynow'   => __( 'PayPal Buy Now', 'paypal-payments-for-woocommerce' ),
-					'pay'      => __( 'Pay with PayPal', 'paypal-payments-for-woocommerce' ),
+					'paypal'   => __( 'PayPal', 'woocommerce-paypal-payments' ),
+					'checkout' => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+					'buynow'   => __( 'PayPal Buy Now', 'woocommerce-paypal-payments' ),
+					'pay'      => __( 'Pay with PayPal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -738,20 +738,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_color'                   => array(
-				'title'        => __( 'Color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'gold',
 				'desc_tip'     => true,
 				'description'  => __(
 					'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'gold'   => __( 'Gold (Recommended)', 'paypal-payments-for-woocommerce' ),
-					'blue'   => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'silver' => __( 'Silver', 'paypal-payments-for-woocommerce' ),
-					'black'  => __( 'Black', 'paypal-payments-for-woocommerce' ),
+					'gold'   => __( 'Gold (Recommended)', 'woocommerce-paypal-payments' ),
+					'blue'   => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'silver' => __( 'Silver', 'woocommerce-paypal-payments' ),
+					'black'  => __( 'Black', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -761,18 +761,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_shape'                   => array(
-				'title'        => __( 'Shape', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Shape', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'rect',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'pill' => __( 'Pill', 'paypal-payments-for-woocommerce' ),
-					'rect' => __( 'Rectangle', 'paypal-payments-for-woocommerce' ),
+					'pill' => __( 'Pill', 'woocommerce-paypal-payments' ),
+					'rect' => __( 'Rectangle', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -782,7 +782,7 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_heading'                => array(
-				'heading'      => __( 'Credit Messaging on Checkout', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Credit Messaging on Checkout', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -792,9 +792,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_enabled'                => array(
-				'title'        => __( 'Enable message on Checkout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable message on Checkout', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Checkout', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Checkout', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -804,18 +804,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_layout'                 => array(
-				'title'        => __( 'Credit Messaging layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'text',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The layout of the message.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'text' => __( 'Text', 'paypal-payments-for-woocommerce' ),
-					'flex' => __( 'Flex', 'paypal-payments-for-woocommerce' ),
+					'text' => __( 'Text', 'woocommerce-paypal-payments' ),
+					'flex' => __( 'Flex', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -825,20 +825,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_logo'                   => array(
-				'title'        => __( 'Credit Messaging logo', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'primary',
 				'desc_tip'     => true,
 				'description'  => __(
 					'What logo the text message contains. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'primary'     => __( 'Primary', 'paypal-payments-for-woocommerce' ),
-					'alternative' => __( 'Alternative', 'paypal-payments-for-woocommerce' ),
-					'inline'      => __( 'Inline', 'paypal-payments-for-woocommerce' ),
-					'none'        => __( 'None', 'paypal-payments-for-woocommerce' ),
+					'primary'     => __( 'Primary', 'woocommerce-paypal-payments' ),
+					'alternative' => __( 'Alternative', 'woocommerce-paypal-payments' ),
+					'inline'      => __( 'Inline', 'woocommerce-paypal-payments' ),
+					'none'        => __( 'None', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -848,19 +848,19 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_position'               => array(
-				'title'        => __( 'Credit Messaging logo position', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo position', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'left',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The position of the logo. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'left'  => __( 'Left', 'paypal-payments-for-woocommerce' ),
-					'right' => __( 'Right', 'paypal-payments-for-woocommerce' ),
-					'top'   => __( 'Top', 'paypal-payments-for-woocommerce' ),
+					'left'  => __( 'Left', 'woocommerce-paypal-payments' ),
+					'right' => __( 'Right', 'woocommerce-paypal-payments' ),
+					'top'   => __( 'Top', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -870,20 +870,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_color'                  => array(
-				'title'        => __( 'Credit Messaging text color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging text color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'black',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'black'      => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'      => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'monochrome' => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'  => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'black'      => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'      => __( 'White', 'woocommerce-paypal-payments' ),
+					'monochrome' => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'  => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -893,23 +893,23 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_flex_color'             => array(
-				'title'        => __( 'Credit Messaging color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'blue',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'blue'            => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'black'           => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'           => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'white-no-border' => __( 'White no border', 'paypal-payments-for-woocommerce' ),
-					'gray'            => __( 'Gray', 'paypal-payments-for-woocommerce' ),
-					'monochrome'      => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'       => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'blue'            => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'black'           => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'           => __( 'White', 'woocommerce-paypal-payments' ),
+					'white-no-border' => __( 'White no border', 'woocommerce-paypal-payments' ),
+					'gray'            => __( 'Gray', 'woocommerce-paypal-payments' ),
+					'monochrome'      => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'       => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -919,20 +919,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_flex_ratio'             => array(
-				'title'        => __( 'Credit Messaging ratio', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging ratio', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => '1x1',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The width/height ratio of the banner. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'1x1'  => __( '1x1', 'paypal-payments-for-woocommerce' ),
-					'1x4'  => __( '1x4', 'paypal-payments-for-woocommerce' ),
-					'8x1'  => __( '8x1', 'paypal-payments-for-woocommerce' ),
-					'20x1' => __( '20x1', 'paypal-payments-for-woocommerce' ),
+					'1x1'  => __( '1x1', 'woocommerce-paypal-payments' ),
+					'1x4'  => __( '1x4', 'woocommerce-paypal-payments' ),
+					'8x1'  => __( '8x1', 'woocommerce-paypal-payments' ),
+					'20x1' => __( '20x1', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -944,7 +944,7 @@ return array(
 
 			// Single product page.
 			'button_product_heading'         => array(
-				'heading'      => __( 'Button on Single product', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Button on Single product', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -954,9 +954,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_enabled'         => array(
-				'title'        => __( 'Enable buttons on Single Product', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable buttons on Single Product', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Single Product', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Single Product', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -966,18 +966,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_layout'          => array(
-				'title'        => __( 'Button Layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'horizontal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'vertical'   => __( 'Vertical', 'paypal-payments-for-woocommerce' ),
-					'horizontal' => __( 'Horizontal', 'paypal-payments-for-woocommerce' ),
+					'vertical'   => __( 'Vertical', 'woocommerce-paypal-payments' ),
+					'horizontal' => __( 'Horizontal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -987,14 +987,14 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_tagline'         => array(
-				'title'        => __( 'Tagline', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Tagline', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable tagline', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable tagline', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'desc_tip'     => true,
 				'description'  => __(
 					'Add the tagline. This line will only show up, if you select a horizontal layout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1004,20 +1004,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_label'           => array(
-				'title'        => __( 'Button Label', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Label', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'paypal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'This controls the label on the primary button.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'paypal'   => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
-					'checkout' => __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' ),
-					'buynow'   => __( 'PayPal Buy Now', 'paypal-payments-for-woocommerce' ),
-					'pay'      => __( 'Pay with PayPal', 'paypal-payments-for-woocommerce' ),
+					'paypal'   => __( 'PayPal', 'woocommerce-paypal-payments' ),
+					'checkout' => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+					'buynow'   => __( 'PayPal Buy Now', 'woocommerce-paypal-payments' ),
+					'pay'      => __( 'Pay with PayPal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1027,20 +1027,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_color'           => array(
-				'title'        => __( 'Color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'gold',
 				'desc_tip'     => true,
 				'description'  => __(
 					'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'gold'   => __( 'Gold (Recommended)', 'paypal-payments-for-woocommerce' ),
-					'blue'   => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'silver' => __( 'Silver', 'paypal-payments-for-woocommerce' ),
-					'black'  => __( 'Black', 'paypal-payments-for-woocommerce' ),
+					'gold'   => __( 'Gold (Recommended)', 'woocommerce-paypal-payments' ),
+					'blue'   => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'silver' => __( 'Silver', 'woocommerce-paypal-payments' ),
+					'black'  => __( 'Black', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1050,18 +1050,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_product_shape'           => array(
-				'title'        => __( 'Shape', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Shape', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'rect',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'pill' => __( 'Pill', 'paypal-payments-for-woocommerce' ),
-					'rect' => __( 'Rectangle', 'paypal-payments-for-woocommerce' ),
+					'pill' => __( 'Pill', 'woocommerce-paypal-payments' ),
+					'rect' => __( 'Rectangle', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1072,7 +1072,7 @@ return array(
 			),
 
 			'message_product_heading'        => array(
-				'heading'      => __( 'Credit Messaging on Single product', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Credit Messaging on Single product', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1082,9 +1082,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_enabled'        => array(
-				'title'        => __( 'Enable message on Single Product', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable message on Single Product', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Single Product', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Single Product', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1094,18 +1094,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_layout'         => array(
-				'title'        => __( 'Credit Messaging layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'text',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The layout of the message.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'text' => __( 'Text', 'paypal-payments-for-woocommerce' ),
-					'flex' => __( 'Flex', 'paypal-payments-for-woocommerce' ),
+					'text' => __( 'Text', 'woocommerce-paypal-payments' ),
+					'flex' => __( 'Flex', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1115,20 +1115,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_logo'           => array(
-				'title'        => __( 'Credit Messaging logo', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'primary',
 				'desc_tip'     => true,
 				'description'  => __(
 					'What logo the text message contains. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'primary'     => __( 'Primary', 'paypal-payments-for-woocommerce' ),
-					'alternative' => __( 'Alternative', 'paypal-payments-for-woocommerce' ),
-					'inline'      => __( 'Inline', 'paypal-payments-for-woocommerce' ),
-					'none'        => __( 'None', 'paypal-payments-for-woocommerce' ),
+					'primary'     => __( 'Primary', 'woocommerce-paypal-payments' ),
+					'alternative' => __( 'Alternative', 'woocommerce-paypal-payments' ),
+					'inline'      => __( 'Inline', 'woocommerce-paypal-payments' ),
+					'none'        => __( 'None', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1138,19 +1138,19 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_position'       => array(
-				'title'        => __( 'Credit Messaging logo position', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo position', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'left',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The position of the logo. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'left'  => __( 'Left', 'paypal-payments-for-woocommerce' ),
-					'right' => __( 'Right', 'paypal-payments-for-woocommerce' ),
-					'top'   => __( 'Top', 'paypal-payments-for-woocommerce' ),
+					'left'  => __( 'Left', 'woocommerce-paypal-payments' ),
+					'right' => __( 'Right', 'woocommerce-paypal-payments' ),
+					'top'   => __( 'Top', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1160,20 +1160,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_color'          => array(
-				'title'        => __( 'Credit Messaging text color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging text color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'black',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'black'      => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'      => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'monochrome' => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'  => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'black'      => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'      => __( 'White', 'woocommerce-paypal-payments' ),
+					'monochrome' => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'  => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1183,23 +1183,23 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_flex_color'     => array(
-				'title'        => __( 'Credit Messaging color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'blue',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'blue'            => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'black'           => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'           => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'white-no-border' => __( 'White no border', 'paypal-payments-for-woocommerce' ),
-					'gray'            => __( 'Gray', 'paypal-payments-for-woocommerce' ),
-					'monochrome'      => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'       => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'blue'            => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'black'           => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'           => __( 'White', 'woocommerce-paypal-payments' ),
+					'white-no-border' => __( 'White no border', 'woocommerce-paypal-payments' ),
+					'gray'            => __( 'Gray', 'woocommerce-paypal-payments' ),
+					'monochrome'      => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'       => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1209,20 +1209,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_product_flex_ratio'     => array(
-				'title'        => __( 'Credit Messaging ratio', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging ratio', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => '1x1',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The width/height ratio of the banner. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'1x1'  => __( '1x1', 'paypal-payments-for-woocommerce' ),
-					'1x4'  => __( '1x4', 'paypal-payments-for-woocommerce' ),
-					'8x1'  => __( '8x1', 'paypal-payments-for-woocommerce' ),
-					'20x1' => __( '20x1', 'paypal-payments-for-woocommerce' ),
+					'1x1'  => __( '1x1', 'woocommerce-paypal-payments' ),
+					'1x4'  => __( '1x4', 'woocommerce-paypal-payments' ),
+					'8x1'  => __( '8x1', 'woocommerce-paypal-payments' ),
+					'20x1' => __( '20x1', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1234,7 +1234,7 @@ return array(
 
 			// Mini cart settings.
 			'button_mini-cart_heading'       => array(
-				'heading'      => __( 'Mini Cart', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Mini Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1244,9 +1244,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_enabled'       => array(
-				'title'        => __( 'Buttons on Mini Cart', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Buttons on Mini Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Mini Cart', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Mini Cart', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1256,18 +1256,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_layout'        => array(
-				'title'        => __( 'Button Layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'horizontal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'vertical'   => __( 'Vertical', 'paypal-payments-for-woocommerce' ),
-					'horizontal' => __( 'Horizontal', 'paypal-payments-for-woocommerce' ),
+					'vertical'   => __( 'Vertical', 'woocommerce-paypal-payments' ),
+					'horizontal' => __( 'Horizontal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1277,14 +1277,14 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_tagline'       => array(
-				'title'        => __( 'Tagline', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Tagline', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable tagline', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable tagline', 'woocommerce-paypal-payments' ),
 				'default'      => false,
 				'desc_tip'     => true,
 				'description'  => __(
 					'Add the tagline. This line will only show up, if you select a horizontal layout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1294,20 +1294,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_label'         => array(
-				'title'        => __( 'Button Label', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Label', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'paypal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'This controls the label on the primary button.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'paypal'   => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
-					'checkout' => __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' ),
-					'buynow'   => __( 'PayPal Buy Now', 'paypal-payments-for-woocommerce' ),
-					'pay'      => __( 'Pay with PayPal', 'paypal-payments-for-woocommerce' ),
+					'paypal'   => __( 'PayPal', 'woocommerce-paypal-payments' ),
+					'checkout' => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+					'buynow'   => __( 'PayPal Buy Now', 'woocommerce-paypal-payments' ),
+					'pay'      => __( 'Pay with PayPal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1317,20 +1317,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_color'         => array(
-				'title'        => __( 'Color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'gold',
 				'desc_tip'     => true,
 				'description'  => __(
 					'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'gold'   => __( 'Gold (Recommended)', 'paypal-payments-for-woocommerce' ),
-					'blue'   => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'silver' => __( 'Silver', 'paypal-payments-for-woocommerce' ),
-					'black'  => __( 'Black', 'paypal-payments-for-woocommerce' ),
+					'gold'   => __( 'Gold (Recommended)', 'woocommerce-paypal-payments' ),
+					'blue'   => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'silver' => __( 'Silver', 'woocommerce-paypal-payments' ),
+					'black'  => __( 'Black', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1340,18 +1340,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_mini-cart_shape'         => array(
-				'title'        => __( 'Shape', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Shape', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'rect',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'pill' => __( 'Pill', 'paypal-payments-for-woocommerce' ),
-					'rect' => __( 'Rectangle', 'paypal-payments-for-woocommerce' ),
+					'pill' => __( 'Pill', 'woocommerce-paypal-payments' ),
+					'rect' => __( 'Rectangle', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1363,7 +1363,7 @@ return array(
 
 			// Cart settings.
 			'button_cart_heading'            => array(
-				'heading'      => __( 'Cart', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1373,9 +1373,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_enabled'            => array(
-				'title'        => __( 'Buttons on Cart', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Buttons on Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Cart', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Cart', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1385,18 +1385,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_layout'             => array(
-				'title'        => __( 'Button Layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'horizontal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'If additional funding sources are available to the buyer through PayPal, such as Venmo, then multiple buttons are displayed in the space provided. Choose "vertical" for a dynamic list of alternative and local payment options, or "horizontal" when space is limited.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'vertical'   => __( 'Vertical', 'paypal-payments-for-woocommerce' ),
-					'horizontal' => __( 'Horizontal', 'paypal-payments-for-woocommerce' ),
+					'vertical'   => __( 'Vertical', 'woocommerce-paypal-payments' ),
+					'horizontal' => __( 'Horizontal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1406,14 +1406,14 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_tagline'            => array(
-				'title'        => __( 'Tagline', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Tagline', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable tagline', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable tagline', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'desc_tip'     => true,
 				'description'  => __(
 					'Add the tagline. This line will only show up, if you select a horizontal layout.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1423,20 +1423,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_label'              => array(
-				'title'        => __( 'Button Label', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Button Label', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'paypal',
 				'desc_tip'     => true,
 				'description'  => __(
 					'This controls the label on the primary button.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'paypal'   => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
-					'checkout' => __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' ),
-					'buynow'   => __( 'PayPal Buy Now', 'paypal-payments-for-woocommerce' ),
-					'pay'      => __( 'Pay with PayPal', 'paypal-payments-for-woocommerce' ),
+					'paypal'   => __( 'PayPal', 'woocommerce-paypal-payments' ),
+					'checkout' => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+					'buynow'   => __( 'PayPal Buy Now', 'woocommerce-paypal-payments' ),
+					'pay'      => __( 'Pay with PayPal', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1446,20 +1446,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_color'              => array(
-				'title'        => __( 'Color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'gold',
 				'desc_tip'     => true,
 				'description'  => __(
 					'Controls the background color of the primary button. Use "Gold" to leverage PayPal\'s recognition and preference, or change it to match your site design or aesthetic.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'gold'   => __( 'Gold (Recommended)', 'paypal-payments-for-woocommerce' ),
-					'blue'   => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'silver' => __( 'Silver', 'paypal-payments-for-woocommerce' ),
-					'black'  => __( 'Black', 'paypal-payments-for-woocommerce' ),
+					'gold'   => __( 'Gold (Recommended)', 'woocommerce-paypal-payments' ),
+					'blue'   => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'silver' => __( 'Silver', 'woocommerce-paypal-payments' ),
+					'black'  => __( 'Black', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1469,18 +1469,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'button_cart_shape'              => array(
-				'title'        => __( 'Shape', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Shape', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'rect',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The pill-shaped button\'s unique and powerful shape signifies PayPal in people\'s minds. Use the rectangular button as an alternative when pill-shaped buttons might pose design challenges.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'pill' => __( 'Pill', 'paypal-payments-for-woocommerce' ),
-					'rect' => __( 'Rectangle', 'paypal-payments-for-woocommerce' ),
+					'pill' => __( 'Pill', 'woocommerce-paypal-payments' ),
+					'rect' => __( 'Rectangle', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1491,7 +1491,7 @@ return array(
 			),
 
 			'message_cart_heading'           => array(
-				'heading'      => __( 'Credit Messaging on Cart', 'paypal-payments-for-woocommerce' ),
+				'heading'      => __( 'Credit Messaging on Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-heading',
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1501,9 +1501,9 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_enabled'           => array(
-				'title'        => __( 'Enable message on Cart', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Enable message on Cart', 'woocommerce-paypal-payments' ),
 				'type'         => 'checkbox',
-				'label'        => __( 'Enable on Cart', 'paypal-payments-for-woocommerce' ),
+				'label'        => __( 'Enable on Cart', 'woocommerce-paypal-payments' ),
 				'default'      => true,
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1513,18 +1513,18 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_layout'            => array(
-				'title'        => __( 'Credit Messaging layout', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging layout', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'text',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The layout of the message.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'text' => __( 'Text', 'paypal-payments-for-woocommerce' ),
-					'flex' => __( 'Flex', 'paypal-payments-for-woocommerce' ),
+					'text' => __( 'Text', 'woocommerce-paypal-payments' ),
+					'flex' => __( 'Flex', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1534,20 +1534,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_logo'              => array(
-				'title'        => __( 'Credit Messaging logo', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'primary',
 				'desc_tip'     => true,
 				'description'  => __(
 					'What logo the text message contains. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'primary'     => __( 'Primary', 'paypal-payments-for-woocommerce' ),
-					'alternative' => __( 'Alternative', 'paypal-payments-for-woocommerce' ),
-					'inline'      => __( 'Inline', 'paypal-payments-for-woocommerce' ),
-					'none'        => __( 'None', 'paypal-payments-for-woocommerce' ),
+					'primary'     => __( 'Primary', 'woocommerce-paypal-payments' ),
+					'alternative' => __( 'Alternative', 'woocommerce-paypal-payments' ),
+					'inline'      => __( 'Inline', 'woocommerce-paypal-payments' ),
+					'none'        => __( 'None', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1557,19 +1557,19 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_position'          => array(
-				'title'        => __( 'Credit Messaging logo position', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging logo position', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'left',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The position of the logo. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'left'  => __( 'Left', 'paypal-payments-for-woocommerce' ),
-					'right' => __( 'Right', 'paypal-payments-for-woocommerce' ),
-					'top'   => __( 'Top', 'paypal-payments-for-woocommerce' ),
+					'left'  => __( 'Left', 'woocommerce-paypal-payments' ),
+					'right' => __( 'Right', 'woocommerce-paypal-payments' ),
+					'top'   => __( 'Top', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1579,20 +1579,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_color'             => array(
-				'title'        => __( 'Credit Messaging text color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging text color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'black',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Text is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'black'      => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'      => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'monochrome' => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'  => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'black'      => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'      => __( 'White', 'woocommerce-paypal-payments' ),
+					'monochrome' => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'  => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1602,23 +1602,23 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_flex_color'        => array(
-				'title'        => __( 'Credit Messaging color', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging color', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => 'blue',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The color of the text. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'blue'            => __( 'Blue', 'paypal-payments-for-woocommerce' ),
-					'black'           => __( 'Black', 'paypal-payments-for-woocommerce' ),
-					'white'           => __( 'White', 'paypal-payments-for-woocommerce' ),
-					'white-no-border' => __( 'White no border', 'paypal-payments-for-woocommerce' ),
-					'gray'            => __( 'Gray', 'paypal-payments-for-woocommerce' ),
-					'monochrome'      => __( 'Monochrome', 'paypal-payments-for-woocommerce' ),
-					'grayscale'       => __( 'Grayscale', 'paypal-payments-for-woocommerce' ),
+					'blue'            => __( 'Blue', 'woocommerce-paypal-payments' ),
+					'black'           => __( 'Black', 'woocommerce-paypal-payments' ),
+					'white'           => __( 'White', 'woocommerce-paypal-payments' ),
+					'white-no-border' => __( 'White no border', 'woocommerce-paypal-payments' ),
+					'gray'            => __( 'Gray', 'woocommerce-paypal-payments' ),
+					'monochrome'      => __( 'Monochrome', 'woocommerce-paypal-payments' ),
+					'grayscale'       => __( 'Grayscale', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1628,20 +1628,20 @@ return array(
 				'gateway'      => 'paypal',
 			),
 			'message_cart_flex_ratio'        => array(
-				'title'        => __( 'Credit Messaging ratio', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Credit Messaging ratio', 'woocommerce-paypal-payments' ),
 				'type'         => 'select',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => '1x1',
 				'desc_tip'     => true,
 				'description'  => __(
 					'The width/height ratio of the banner. Only applicable, when the layout style Flex is used.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'1x1'  => __( '1x1', 'paypal-payments-for-woocommerce' ),
-					'1x4'  => __( '1x4', 'paypal-payments-for-woocommerce' ),
-					'8x1'  => __( '8x1', 'paypal-payments-for-woocommerce' ),
-					'20x1' => __( '20x1', 'paypal-payments-for-woocommerce' ),
+					'1x1'  => __( '1x1', 'woocommerce-paypal-payments' ),
+					'1x4'  => __( '1x4', 'woocommerce-paypal-payments' ),
+					'8x1'  => __( '8x1', 'woocommerce-paypal-payments' ),
+					'20x1' => __( '20x1', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_PROGRESSIVE,
@@ -1652,23 +1652,23 @@ return array(
 			),
 
 			'disable_cards'                  => array(
-				'title'        => __( 'Disable specific credit cards', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Disable specific credit cards', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-multiselect',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => array(),
 				'desc_tip'     => true,
 				'description'  => __(
 					'By default all possible credit cards will be accepted. You can disable some cards, if you wish.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'visa'       => _x( 'Visa', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'mastercard' => _x( 'Mastercard', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'amex'       => _x( 'American Express', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'discover'   => _x( 'Discover', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'jcb'        => _x( 'JCB', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'elo'        => _x( 'Elo', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'hiper'      => _x( 'Hiper', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
+					'visa'       => _x( 'Visa', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'mastercard' => _x( 'Mastercard', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'amex'       => _x( 'American Express', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'discover'   => _x( 'Discover', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'jcb'        => _x( 'JCB', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'elo'        => _x( 'Elo', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'hiper'      => _x( 'Hiper', 'Name of credit card', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_ONBOARDED,
@@ -1679,23 +1679,23 @@ return array(
 				'gateway'      => 'dcc',
 			),
 			'card_icons'                     => array(
-				'title'        => __( 'Show logo of the following credit cards', 'paypal-payments-for-woocommerce' ),
+				'title'        => __( 'Show logo of the following credit cards', 'woocommerce-paypal-payments' ),
 				'type'         => 'ppcp-multiselect',
 				'class'        => array( 'wc-enhanced-select' ),
 				'default'      => array(),
 				'desc_tip'     => true,
 				'description'  => __(
 					'Define, which cards you want to display in your checkout..',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'options'      => array(
-					'visa'       => _x( 'Visa', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'mastercard' => _x( 'Mastercard', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'amex'       => _x( 'American Express', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'discover'   => _x( 'Discover', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'jcb'        => _x( 'JCB', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'elo'        => _x( 'Elo', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
-					'hiper'      => _x( 'Hiper', 'Name of credit card', 'paypal-payments-for-woocommerce' ),
+					'visa'       => _x( 'Visa', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'mastercard' => _x( 'Mastercard', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'amex'       => _x( 'American Express', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'discover'   => _x( 'Discover', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'jcb'        => _x( 'JCB', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'elo'        => _x( 'Elo', 'Name of credit card', 'woocommerce-paypal-payments' ),
+					'hiper'      => _x( 'Hiper', 'Name of credit card', 'woocommerce-paypal-payments' ),
 				),
 				'screens'      => array(
 					State::STATE_ONBOARDED,
@@ -1760,7 +1760,7 @@ return array(
 	'wcgateway.url'                                => static function ( $container ): string {
 		return plugins_url(
 			'/modules/ppcp-wc-gateway/',
-			dirname( __FILE__, 3 ) . '/woocommerce-paypal-commerce-gateway.php'
+			dirname( __FILE__, 3 ) . '/woocommerce-paypal-payments.php'
 		);
 	},
 	'wcgateway.endpoint.return-url'                => static function ( $container ) : ReturnUrlEndpoint {
diff --git a/modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php b/modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php
index fc2a3b5cf..8bce07661 100644
--- a/modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php
+++ b/modules/ppcp-wc-gateway/src/Admin/class-ordertablepaymentstatuscolumn.php
@@ -56,7 +56,7 @@ class OrderTablePaymentStatusColumn {
 		$columns = array_merge(
 			array_slice( $columns, 0, $to_insert_position ),
 			array(
-				self::COLUMN_KEY => __( 'Payment Captured', 'paypal-payments-for-woocommerce' ),
+				self::COLUMN_KEY => __( 'Payment Captured', 'woocommerce-paypal-payments' ),
 			),
 			array_slice( $columns, $to_insert_position )
 		);
@@ -124,7 +124,7 @@ class OrderTablePaymentStatusColumn {
 			'<span class="dashicons dashicons-yes">
                         <span class="screen-reader-text">%s</span>
                     </span>',
-			esc_html__( 'Payment captured', 'paypal-payments-for-woocommerce' )
+			esc_html__( 'Payment captured', 'woocommerce-paypal-payments' )
 		);
 	}
 
@@ -134,7 +134,7 @@ class OrderTablePaymentStatusColumn {
 	private function render_incomplete_status() {
 		printf(
 			'<mark class="onbackorder">%s</mark>',
-			esc_html__( 'Not captured', 'paypal-payments-for-woocommerce' )
+			esc_html__( 'Not captured', 'woocommerce-paypal-payments' )
 		);
 	}
 }
diff --git a/modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php b/modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php
index e164bcc16..619f53eff 100644
--- a/modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php
+++ b/modules/ppcp-wc-gateway/src/Admin/class-paymentstatusorderdetail.php
@@ -39,11 +39,11 @@ class PaymentStatusOrderDetail {
 			'<li class="wide"><p><mark class="order-status status-on-hold"><span>%1$s</span></mark></p><p>%2$s</p></li>',
 			esc_html__(
 				'Not captured',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			esc_html__(
 				'To capture the payment select capture action from the list below.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			)
 		);
 	}
diff --git a/modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php b/modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php
index ccafac8e4..ad6640efe 100644
--- a/modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php
+++ b/modules/ppcp-wc-gateway/src/Admin/class-renderauthorizeaction.php
@@ -32,7 +32,7 @@ class RenderAuthorizeAction {
 
 		$order_actions['ppcp_authorize_order'] = esc_html__(
 			'Capture authorized PayPal payment',
-			'paypal-payments-for-woocommerce'
+			'woocommerce-paypal-payments'
 		);
 		return $order_actions;
 	}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
index 31430435c..52dbd4349 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
@@ -103,11 +103,11 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 
 		$this->method_title       = __(
 			'PayPal Card Processing',
-			'paypal-payments-for-woocommerce'
+			'woocommerce-paypal-payments'
 		);
 		$this->method_description = __(
 			'Accept debit and credit cards, and local payment methods with PayPal’s latest solution.',
-			'paypal-payments-for-woocommerce'
+			'woocommerce-paypal-payments'
 		);
 		$this->title              = $this->config->has( 'dcc_gateway_title' ) ?
 			$this->config->get( 'dcc_gateway_title' ) : $this->method_title;
@@ -134,9 +134,9 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 	public function init_form_fields() {
 		$this->form_fields = array(
 			'enabled' => array(
-				'title'   => __( 'Enable/Disable', 'paypal-payments-for-woocommerce' ),
+				'title'   => __( 'Enable/Disable', 'woocommerce-paypal-payments' ),
 				'type'    => 'checkbox',
-				'label'   => __( 'Enable Credit Card Payments', 'paypal-payments-for-woocommerce' ),
+				'label'   => __( 'Enable Credit Card Payments', 'woocommerce-paypal-payments' ),
 				'default' => 'no',
 			),
 			'ppcp'    => array(
@@ -187,37 +187,37 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 			'visa'       => _x(
 				'Visa',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'mastercard' => _x(
 				'Mastercard',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'amex'       => _x(
 				'American Express',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'discover'   => _x(
 				'Discover',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'jcb'        => _x(
 				'JCB',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'elo'        => _x(
 				'Elo',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'hiper'      => _x(
 				'Hiper',
 				'Name of credit card',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 		);
 	}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php b/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
index da99591e6..28db14bfb 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
@@ -173,11 +173,11 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	public function init_form_fields() {
 		$this->form_fields = array(
 			'enabled' => array(
-				'title'       => __( 'Enable/Disable', 'paypal-payments-for-woocommerce' ),
+				'title'       => __( 'Enable/Disable', 'woocommerce-paypal-payments' ),
 				'type'        => 'checkbox',
 				'desc_tip'    => true,
-				'description' => __( 'In order to use PayPal or PayPal Card Processing, you need to enable the Gateway.', 'paypal-payments-for-woocommerce' ),
-				'label'       => __( 'Enable the PayPal Gateway', 'paypal-payments-for-woocommerce' ),
+				'description' => __( 'In order to use PayPal or PayPal Card Processing, you need to enable the Gateway.', 'woocommerce-paypal-payments' ),
+				'label'       => __( 'Enable the PayPal Gateway', 'woocommerce-paypal-payments' ),
 				'default'     => 'no',
 			),
 			'ppcp'    => array(
@@ -204,7 +204,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 
 		if ( $is_processed ) {
 			$wc_order->add_order_note(
-				__( 'Payment successfully captured.', 'paypal-payments-for-woocommerce' )
+				__( 'Payment successfully captured.', 'woocommerce-paypal-payments' )
 			);
 
 			$wc_order->set_status( 'processing' );
@@ -216,7 +216,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		if ( $this->authorized_payments->last_status() === AuthorizedPaymentsProcessor::ALREADY_CAPTURED ) {
 			if ( $wc_order->get_status() === 'on-hold' ) {
 				$wc_order->add_order_note(
-					__( 'Payment successfully captured.', 'paypal-payments-for-woocommerce' )
+					__( 'Payment successfully captured.', 'woocommerce-paypal-payments' )
 				);
 				$wc_order->set_status( 'processing' );
 			}
@@ -268,12 +268,12 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	private function define_method_title(): string {
 		if ( $this->is_credit_card_tab() ) {
-			return __( 'PayPal Card Processing', 'paypal-payments-for-woocommerce' );
+			return __( 'PayPal Card Processing', 'woocommerce-paypal-payments' );
 		}
 		if ( $this->is_paypal_tab() ) {
-			return __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' );
+			return __( 'PayPal Checkout', 'woocommerce-paypal-payments' );
 		}
-		return __( 'PayPal', 'paypal-payments-for-woocommerce' );
+		return __( 'PayPal', 'woocommerce-paypal-payments' );
 	}
 
 	/**
@@ -285,13 +285,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
 		if ( $this->is_credit_card_tab() ) {
 			return __(
 				'Accept debit and credit cards, and local payment methods with PayPal’s latest solution.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			);
 		}
 
 		return __(
 			'Accept PayPal, PayPal Credit and alternative payment types with PayPal’s latest solution.',
-			'paypal-payments-for-woocommerce'
+			'woocommerce-paypal-payments'
 		);
 	}
 
diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php b/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php
index 5835840ec..8f8006b29 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-processpaymenttrait.php
@@ -59,7 +59,7 @@ trait ProcessPaymentTrait {
 				if ( $this->session_handler->insufficient_funding_tries() >= 3 ) {
 					$this->session_handler->destroy_session_data();
 					wc_add_notice(
-						__( 'Please use a different payment method.', 'paypal-payments-for-woocommerce' ),
+						__( 'Please use a different payment method.', 'woocommerce-paypal-payments' ),
 						'error'
 					);
 					return null;
diff --git a/modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php b/modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php
index 62aac3244..663273217 100644
--- a/modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php
+++ b/modules/ppcp-wc-gateway/src/Notice/class-authorizeorderactionnotice.php
@@ -48,35 +48,35 @@ class AuthorizeOrderActionNotice {
 		$messages[ self::NO_INFO ]          = array(
 			'message' => __(
 				'Could not retrieve information. Try again later.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'type'    => 'error',
 		);
 		$messages[ self::ALREADY_CAPTURED ] = array(
 			'message' => __(
 				'Payment already captured.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'type'    => 'error',
 		);
 		$messages[ self::FAILED ]           = array(
 			'message' => __(
 				'Failed to capture. Try again later.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'type'    => 'error',
 		);
 		$messages[ self::NOT_FOUND ]        = array(
 			'message' => __(
 				'Could not find payment to process.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'type'    => 'error',
 		);
 		$messages[ self::SUCCESS ]          = array(
 			'message' => __(
 				'Payment successfully captured.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'type'    => 'success',
 		);
diff --git a/modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php b/modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php
index da4f2b969..0f0ee59eb 100644
--- a/modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php
+++ b/modules/ppcp-wc-gateway/src/Notice/class-connectadminnotice.php
@@ -58,7 +58,7 @@ class ConnectAdminNotice {
 			/* translators: %1$s the gateway name. */
 			__(
 				'PayPal Checkout is almost ready. To get started, <a href="%1$s">connect your account</a>.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway' )
 		);
diff --git a/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php b/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php
index 1035776e7..14cec7266 100644
--- a/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php
+++ b/modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php
@@ -141,13 +141,13 @@ class OrderProcessor {
 		if ( ! $order || ! $this->order_is_approved( $order ) ) {
 			$error_message = __(
 				'The payment has not been approved yet.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			);
 		}
 		if ( $error_message ) {
 			$this->last_error = sprintf(
 				// translators: %s is the message of the error.
-				__( 'Payment error: %s', 'paypal-payments-for-woocommerce' ),
+				__( 'Payment error: %s', 'woocommerce-paypal-payments' ),
 				$error_message
 			);
 			return false;
@@ -165,18 +165,18 @@ class OrderProcessor {
 
 		$wc_order->update_status(
 			'on-hold',
-			__( 'Awaiting payment.', 'paypal-payments-for-woocommerce' )
+			__( 'Awaiting payment.', 'woocommerce-paypal-payments' )
 		);
 		if ( $order->status()->is( OrderStatus::COMPLETED ) && $order->intent() === 'CAPTURE' ) {
 			$wc_order->update_status(
 				'processing',
-				__( 'Payment received.', 'paypal-payments-for-woocommerce' )
+				__( 'Payment received.', 'woocommerce-paypal-payments' )
 			);
 		}
 
 		if ( $this->capture_authorized_downloads( $order ) && $this->authorized_payments_processor->process( $wc_order ) ) {
 			$wc_order->add_order_note(
-				__( 'Payment successfully captured.', 'paypal-payments-for-woocommerce' )
+				__( 'Payment successfully captured.', 'woocommerce-paypal-payments' )
 			);
 			$wc_order->update_meta_data( PayPalGateway::CAPTURED_META_KEY, 'true' );
 			$wc_order->update_status( 'processing' );
diff --git a/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php
index e67fc389a..ee000f03d 100644
--- a/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/class-sectionsrenderer.php
@@ -41,8 +41,8 @@ class SectionsRenderer {
 		//phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		$current  = ! isset( $_GET[ self::KEY ] ) ? PayPalGateway::ID : sanitize_text_field( wp_unslash( $_GET[ self::KEY ] ) );
 		$sections = array(
-			PayPalGateway::ID     => __( 'PayPal Checkout', 'paypal-payments-for-woocommerce' ),
-			CreditCardGateway::ID => __( 'PayPal Card Processing', 'paypal-payments-for-woocommerce' ),
+			PayPalGateway::ID     => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+			CreditCardGateway::ID => __( 'PayPal Card Processing', 'woocommerce-paypal-payments' ),
 		);
 
 		echo '<ul class="subsubsub">';
diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settings.php b/modules/ppcp-wc-gateway/src/Settings/class-settings.php
index e4c154fa4..91696354b 100644
--- a/modules/ppcp-wc-gateway/src/Settings/class-settings.php
+++ b/modules/ppcp-wc-gateway/src/Settings/class-settings.php
@@ -86,19 +86,19 @@ class Settings implements ContainerInterface {
 		$this->settings = get_option( self::KEY, array() );
 
 		$defaults = array(
-			'title'                         => __( 'PayPal', 'paypal-payments-for-woocommerce' ),
+			'title'                         => __( 'PayPal', 'woocommerce-paypal-payments' ),
 			'description'                   => __(
 				'Pay via PayPal.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			'button_single_product_enabled' => true,
 			'button_mini-cart_enabled'      => true,
 			'button_cart_enabled'           => true,
 			'brand_name'                    => get_bloginfo( 'name' ),
-			'dcc_gateway_title'             => __( 'Credit Cards', 'paypal-payments-for-woocommerce' ),
+			'dcc_gateway_title'             => __( 'Credit Cards', 'woocommerce-paypal-payments' ),
 			'dcc_gateway_description'       => __(
 				'Pay with your credit card.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 		);
 		foreach ( $defaults as $key => $value ) {
diff --git a/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php b/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
index c680e1375..49769d4f7 100644
--- a/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
@@ -111,7 +111,7 @@ class SettingsRenderer {
 			new Message(
 				__(
 					'We could not complete the onboarding process. Some features, such as card processing, will not be available. To fix this, please try again.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				'error',
 				false
@@ -367,13 +367,13 @@ class SettingsRenderer {
 	private function render_dcc_not_active_yet() {
 		?>
 		<tr>
-			<th><?php esc_html_e( 'Onboarding', 'paypal-payments-for-woocommerce' ); ?></th>
+			<th><?php esc_html_e( 'Onboarding', 'woocommerce-paypal-payments' ); ?></th>
 			<td class="notice notice-error">
 				<p>
 					<?php
 					esc_html_e(
 						'Credit Card processing for your account has not yet been activated by PayPal. If your account is new, this can take some days. Otherwise, please get in contact with PayPal.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					);
 					?>
 				</p>
@@ -388,7 +388,7 @@ class SettingsRenderer {
 	private function render_3d_secure_info() {
 		?>
 <tr>
-	<th><?php esc_html_e( '3D Secure', 'paypal-payments-for-woocommerce' ); ?></th>
+	<th><?php esc_html_e( '3D Secure', 'woocommerce-paypal-payments' ); ?></th>
 	<td>
 		<p>
 			<?php
@@ -405,7 +405,7 @@ class SettingsRenderer {
                                   an additional layer of verification using Verified by Visa,
                                   MasterCard SecureCode and American Express SafeKey.
                                   %1$sLearn more about 3D Secure.%2$s',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					'<a href = "#">',
 					'</a>'
@@ -424,20 +424,20 @@ class SettingsRenderer {
 	private function render_dcc_onboarding_info() {
 		?>
 <tr>
-	<th><?php esc_html_e( 'Onboarding', 'paypal-payments-for-woocommerce' ); ?></th>
+	<th><?php esc_html_e( 'Onboarding', 'woocommerce-paypal-payments' ); ?></th>
 <td class="notice notice-error">
 	<p>
 		<?php
 			esc_html_e(
 				'You need to complete your onboarding, before you can use the PayPal Card Processing option.',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			);
 		?>
 
 		<a
 			href="<?php echo esc_url( admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway' ) ); ?>"
 			>
-			<?php esc_html_e( 'Click here to complete your onboarding.', 'paypal-payments-for-woocommerce' ); ?>
+			<?php esc_html_e( 'Click here to complete your onboarding.', 'woocommerce-paypal-payments' ); ?>
 		</a>
 	</p>
 </td>
@@ -451,13 +451,13 @@ class SettingsRenderer {
 	private function render_dcc_does_not_apply_info() {
 		?>
 		<tr>
-			<th><?php esc_html_e( 'Card Processing not available', 'paypal-payments-for-woocommerce' ); ?></th>
+			<th><?php esc_html_e( 'Card Processing not available', 'woocommerce-paypal-payments' ); ?></th>
 			<td class="notice notice-error">
 				<p>
 					<?php
 					esc_html_e(
 						'Unfortunatly, the card processing option is not yet available in your country.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					);
 					?>
 				</p>
diff --git a/modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php b/modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php
index b03adf4ea..3ef0a0e67 100644
--- a/modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php
+++ b/modules/ppcp-webhooks/src/Handler/class-checkoutorderapproved.php
@@ -97,7 +97,7 @@ class CheckoutOrderApproved implements RequestHandler {
 			// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -120,7 +120,7 @@ class CheckoutOrderApproved implements RequestHandler {
 				// translators: %s is the PayPal webhook Id.
 					__(
 						'No paypal payment for webhook event %s was found.',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					isset( $request['id'] ) ? $request['id'] : ''
 				);
@@ -143,7 +143,7 @@ class CheckoutOrderApproved implements RequestHandler {
 			// translators: %s is the PayPal webhook Id.
 				__(
 					'Could not capture payment for webhook event %s.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -173,7 +173,7 @@ class CheckoutOrderApproved implements RequestHandler {
 		if ( ! $wc_orders ) {
 			$message = sprintf(
 			// translators: %s is the PayPal order Id.
-				__( 'Order for PayPal order %s not found.', 'paypal-payments-for-woocommerce' ),
+				__( 'Order for PayPal order %s not found.', 'woocommerce-paypal-payments' ),
 				isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
 			);
 			$this->logger->log(
@@ -189,8 +189,8 @@ class CheckoutOrderApproved implements RequestHandler {
 
 		$new_status     = $order->intent() === 'CAPTURE' ? 'processing' : 'on-hold';
 		$status_message = $order->intent() === 'CAPTURE' ?
-			__( 'Payment received.', 'paypal-payments-for-woocommerce' )
-			: __( 'Payment can be captured.', 'paypal-payments-for-woocommerce' );
+			__( 'Payment received.', 'woocommerce-paypal-payments' )
+			: __( 'Payment can be captured.', 'woocommerce-paypal-payments' );
 		foreach ( $wc_orders as $wc_order ) {
 			if ( ! in_array( $wc_order->get_status(), array( 'pending', 'on-hold' ), true ) ) {
 				continue;
@@ -210,7 +210,7 @@ class CheckoutOrderApproved implements RequestHandler {
 				// translators: %s is the order ID.
 					__(
 						'Order %s has been updated through PayPal',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					(string) $wc_order->get_id()
 				),
diff --git a/modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php b/modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php
index b7ded101f..aebb03627 100644
--- a/modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php
+++ b/modules/ppcp-webhooks/src/Handler/class-checkoutordercompleted.php
@@ -86,7 +86,7 @@ class CheckoutOrderCompleted implements RequestHandler {
 				// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -116,7 +116,7 @@ class CheckoutOrderCompleted implements RequestHandler {
 		if ( ! $wc_orders ) {
 			$message = sprintf(
 			// translators: %s is the PayPal order Id.
-				__( 'Order for PayPal order %s not found.', 'paypal-payments-for-woocommerce' ),
+				__( 'Order for PayPal order %s not found.', 'woocommerce-paypal-payments' ),
 				isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
 			);
 			$this->logger->log(
@@ -141,7 +141,7 @@ class CheckoutOrderCompleted implements RequestHandler {
 			 */
 			$wc_order->update_status(
 				'processing',
-				__( 'Payment received.', 'paypal-payments-for-woocommerce' )
+				__( 'Payment received.', 'woocommerce-paypal-payments' )
 			);
 			$this->logger->log(
 				'info',
@@ -149,7 +149,7 @@ class CheckoutOrderCompleted implements RequestHandler {
 					// translators: %s is the order ID.
 					__(
 						'Order %s has been updated through PayPal',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					(string) $wc_order->get_id()
 				),
diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php b/modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php
index 33e76881e..7c21588ba 100644
--- a/modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php
+++ b/modules/ppcp-webhooks/src/Handler/class-paymentcapturecompleted.php
@@ -73,7 +73,7 @@ class PaymentCaptureCompleted implements RequestHandler {
 				// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -94,7 +94,7 @@ class PaymentCaptureCompleted implements RequestHandler {
 			// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -114,7 +114,7 @@ class PaymentCaptureCompleted implements RequestHandler {
 			return rest_ensure_response( $response );
 		}
 		$wc_order->add_order_note(
-			__( 'Payment successfully captured.', 'paypal-payments-for-woocommerce' )
+			__( 'Payment successfully captured.', 'woocommerce-paypal-payments' )
 		);
 
 		$wc_order->set_status( 'processing' );
@@ -126,7 +126,7 @@ class PaymentCaptureCompleted implements RequestHandler {
 			// translators: %s is the order ID.
 				__(
 					'Order %s has been updated through PayPal',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				(string) $wc_order->get_id()
 			),
diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php b/modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php
index 35bb8e835..a9c2ee8d2 100644
--- a/modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php
+++ b/modules/ppcp-webhooks/src/Handler/class-paymentcapturerefunded.php
@@ -72,7 +72,7 @@ class PaymentCaptureRefunded implements RequestHandler {
 				// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -91,7 +91,7 @@ class PaymentCaptureRefunded implements RequestHandler {
 		if ( ! is_a( $wc_order, \WC_Order::class ) ) {
 			$message = sprintf(
 			// translators: %s is the PayPal refund Id.
-				__( 'Order for PayPal refund %s not found.', 'paypal-payments-for-woocommerce' ),
+				__( 'Order for PayPal refund %s not found.', 'woocommerce-paypal-payments' ),
 				isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
 			);
 			$this->logger->log(
@@ -121,7 +121,7 @@ class PaymentCaptureRefunded implements RequestHandler {
 				'warning',
 				sprintf(
 					// translators: %s is the order id.
-					__( 'Order %s could not be refunded', 'paypal-payments-for-woocommerce' ),
+					__( 'Order %s could not be refunded', 'woocommerce-paypal-payments' ),
 					(string) $wc_order->get_id()
 				),
 				array(
@@ -140,7 +140,7 @@ class PaymentCaptureRefunded implements RequestHandler {
 				// translators: %1$s is the order id %2$s is the amount which has been refunded.
 				__(
 					'Order %1$s has been refunded with %2$s through PayPal',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				(string) $wc_order->get_id(),
 				(string) $refund->get_amount()
diff --git a/modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php b/modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php
index 88f5f48ac..f04b91b2f 100644
--- a/modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php
+++ b/modules/ppcp-webhooks/src/Handler/class-paymentcapturereversed.php
@@ -79,7 +79,7 @@ class PaymentCaptureReversed implements RequestHandler {
 				// translators: %s is the PayPal webhook Id.
 				__(
 					'No order for webhook event %s was found.',
-					'paypal-payments-for-woocommerce'
+					'woocommerce-paypal-payments'
 				),
 				isset( $request['id'] ) ? $request['id'] : ''
 			);
@@ -98,7 +98,7 @@ class PaymentCaptureReversed implements RequestHandler {
 		if ( ! is_a( $wc_order, \WC_Order::class ) ) {
 			$message = sprintf(
 			// translators: %s is the PayPal refund Id.
-				__( 'Order for PayPal refund %s not found.', 'paypal-payments-for-woocommerce' ),
+				__( 'Order for PayPal refund %s not found.', 'woocommerce-paypal-payments' ),
 				isset( $request['resource']['id'] ) ? $request['resource']['id'] : ''
 			);
 			$this->logger->log(
@@ -123,12 +123,12 @@ class PaymentCaptureReversed implements RequestHandler {
 			// translators: %1$s is the order id.
 			__(
 				'Order %1$s has been cancelled through PayPal',
-				'paypal-payments-for-woocommerce'
+				'woocommerce-paypal-payments'
 			),
 			(string) $wc_order->get_id()
 		) : sprintf(
 			// translators: %1$s is the order id.
-			__( 'Failed to cancel order %1$s through PayPal', 'paypal-payments-for-woocommerce' ),
+			__( 'Failed to cancel order %1$s through PayPal', 'woocommerce-paypal-payments' ),
 			(string) $wc_order->get_id()
 		);
 		$this->logger->log(
diff --git a/modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php b/modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php
index 59367bdfd..33ec043cf 100644
--- a/modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php
+++ b/modules/ppcp-webhooks/src/class-incomingwebhookendpoint.php
@@ -123,7 +123,7 @@ class IncomingWebhookEndpoint {
 			if ( ! $result ) {
 				$this->logger->log(
 					'error',
-					__( 'Illegit Webhook request detected.', 'paypal-payments-for-woocommerce' )
+					__( 'Illegit Webhook request detected.', 'woocommerce-paypal-payments' )
 				);
 			}
 			return $result;
@@ -134,7 +134,7 @@ class IncomingWebhookEndpoint {
 					// translators: %s is the error message.
 					__(
 						'Illegit Webhook request detected: %s',
-						'paypal-payments-for-woocommerce'
+						'woocommerce-paypal-payments'
 					),
 					$exception->getMessage()
 				)
@@ -159,7 +159,7 @@ class IncomingWebhookEndpoint {
 					'info',
 					sprintf(
 						// translators: %s is the event type.
-						__( 'Webhook has been handled by %s', 'paypal-payments-for-woocommerce' ),
+						__( 'Webhook has been handled by %s', 'woocommerce-paypal-payments' ),
 						( $handler->event_types() ) ? current( $handler->event_types() ) : ''
 					),
 					array(
@@ -173,7 +173,7 @@ class IncomingWebhookEndpoint {
 
 		$message = sprintf(
 			// translators: %s is the request type.
-			__( 'Could not find handler for request type %s', 'paypal-payments-for-woocommerce' ),
+			__( 'Could not find handler for request type %s', 'woocommerce-paypal-payments' ),
 			$request['event_type']
 		);
 		$this->logger->log(
diff --git a/modules/woocommerce-logging/services.php b/modules/woocommerce-logging/services.php
index 5857c0e9a..9c8dfb2de 100644
--- a/modules/woocommerce-logging/services.php
+++ b/modules/woocommerce-logging/services.php
@@ -16,7 +16,7 @@ use Psr\Log\LoggerInterface;
 
 return array(
 	'woocommerce.logger.source'      => function(): string {
-		return 'paypal-payments-for-woocommerce';
+		return 'woocommerce-paypal-payments';
 	},
 	'woocommerce.logger.woocommerce' => function ( ContainerInterface $container ): LoggerInterface {
 		if ( ! class_exists( \WC_Logger::class ) ) {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index c028d19f9..e33a90b71 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -11,7 +11,7 @@
 
 	<rule ref="WordPress.WP.I18n">
 		<properties>
-			<property name="text_domain" type="array" value="paypal-payments-for-woocommerce" />
+			<property name="text_domain" type="array" value="woocommerce-paypal-payments" />
 		</properties>
 	</rule>
 
diff --git a/woocommerce-paypal-commerce-gateway.php b/woocommerce-paypal-payments.php
similarity index 96%
rename from woocommerce-paypal-commerce-gateway.php
rename to woocommerce-paypal-payments.php
index af0d9ed2a..95ea1c20c 100644
--- a/woocommerce-paypal-commerce-gateway.php
+++ b/woocommerce-paypal-payments.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Plugin Name: PayPal Payments for WooCommerce
+ * Plugin Name: WooCommerce PayPal Payments
  * Plugin URI:  TODO
  * Description: PayPal's latest complete payments processing solution. Accept PayPal, PayPal Credit, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
  * Version:     dev-master
  * Author:      WooCommerce
  * Author URI:  https://inpsyde.com/
  * License:     GPL-2.0
- * Text Domain: paypal-payments-for-woocommerce
+ * Text Domain: woocommerce-paypal-payments
  *
  * @package WooCommerce\PayPalCommerce
  */