diff --git a/modules/ppcp-blocks/extensions.php b/modules/ppcp-blocks/extensions.php
index 31f90576d..a75957eec 100644
--- a/modules/ppcp-blocks/extensions.php
+++ b/modules/ppcp-blocks/extensions.php
@@ -17,8 +17,8 @@ return array(
 		return array_merge(
 			$locations,
 			array(
-				'checkout-block-express' => _x( 'Block Express Checkout', 'Name of Buttons Location', 'woocommerce-paypal-payments' ),
-				'cart-block'             => _x( 'Block Cart', 'Name of Buttons Location', 'woocommerce-paypal-payments' ),
+				'checkout-block-express' => _x( 'Express Checkout', 'Name of Buttons Location', 'woocommerce-paypal-payments' ),
+				'cart-block'             => _x( 'Cart', 'Name of Buttons Location', 'woocommerce-paypal-payments' ),
 			)
 		);
 	},
@@ -45,7 +45,7 @@ return array(
 					'title'        => __( 'Require final confirmation on checkout', 'woocommerce-paypal-payments' ),
 					'type'         => 'checkbox',
 					'label'        => __(
-						'Require customers to confirm express payments from the Block Cart and Block Express Checkout on the checkout page.
+						'Require customers to confirm express payments from the Cart and Express Checkout on the checkout page.
 <p class="description">If this setting is not enabled, <a href="https://woocommerce.com/document/woocommerce-paypal-payments/#blocks-faq" target="_blank">payment confirmation on the checkout will be skipped</a>.
 Skipping the final confirmation on the checkout page may impact the buyer experience during the PayPal payment process.</p>',
 						'woocommerce-paypal-payments'
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index 0edfeb699..8d87fd525 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -1400,8 +1400,8 @@ return array(
 	'wcgateway.button.locations'                           => static function( ContainerInterface $container ): array {
 		return array(
 			'product'   => 'Single Product',
-			'cart'      => 'Cart',
-			'checkout'  => 'Checkout',
+			'cart'      => 'Classic Cart',
+			'checkout'  => 'Classic Checkout',
 			'mini-cart' => 'Mini Cart',
 		);
 	},
diff --git a/modules/ppcp-wc-gateway/src/Settings/Fields/pay-later-tab-fields.php b/modules/ppcp-wc-gateway/src/Settings/Fields/pay-later-tab-fields.php
index 4fc6635f7..094e12026 100644
--- a/modules/ppcp-wc-gateway/src/Settings/Fields/pay-later-tab-fields.php
+++ b/modules/ppcp-wc-gateway/src/Settings/Fields/pay-later-tab-fields.php
@@ -378,7 +378,7 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Cart.
 		'pay_later_cart_messaging_heading'                => array(
-			'heading'      => __( 'Pay Later Messaging on Cart', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Pay Later Messaging on Classic Cart', 'woocommerce-paypal-payments' ),
 			'type'         => 'ppcp-heading',
 			'screens'      => array( State::STATE_ONBOARDED ),
 			'requirements' => array(),
@@ -502,7 +502,7 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Checkout.
 		'pay_later_checkout_messaging_heading'            => array(
-			'heading'      => __( 'Pay Later Messaging on Checkout', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Pay Later Messaging on Classic Checkout', 'woocommerce-paypal-payments' ),
 			'type'         => 'ppcp-heading',
 			'screens'      => array( State::STATE_ONBOARDED ),
 			'requirements' => array(),
diff --git a/modules/ppcp-wc-gateway/src/Settings/Fields/paypal-smart-button-fields.php b/modules/ppcp-wc-gateway/src/Settings/Fields/paypal-smart-button-fields.php
index aad87730f..93c0ac8e7 100644
--- a/modules/ppcp-wc-gateway/src/Settings/Fields/paypal-smart-button-fields.php
+++ b/modules/ppcp-wc-gateway/src/Settings/Fields/paypal-smart-button-fields.php
@@ -222,11 +222,11 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Checkout page.
 		'button_checkout_heading'                  => array(
-			'heading'      => __( 'Checkout Buttons', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Classic Checkout Buttons', 'woocommerce-paypal-payments' ),
 			'description'  => sprintf(
 			// translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
 				__(
-					'Customize the appearance of the PayPal smart buttons on the %1$sCheckout page%2$s.
+					'Customize the appearance of the PayPal smart buttons on the %1$sClassic Checkout page%2$s.
 					%3$sCheckout Buttons must be enabled to display the PayPal gateway on the Checkout page.
 					',
 					'woocommerce-paypal-payments'
@@ -508,11 +508,11 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Cart settings.
 		'button_cart_heading'                      => array(
-			'heading'      => __( 'Cart Buttons', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Classic Cart Buttons', 'woocommerce-paypal-payments' ),
 			'description'  => sprintf(
 			// translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
 				__(
-					'Customize the appearance of the PayPal smart buttons on the %1$sCart page%2$s.',
+					'Customize the appearance of the PayPal smart buttons on the %1$sClassic Cart page%2$s.',
 					'woocommerce-paypal-payments'
 				),
 				'<a href="https://woocommerce.com/document/woocommerce-paypal-payments/#button-on-cart" target="_blank">',
@@ -805,11 +805,11 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Block express checkout settings.
 		'button_checkout-block-express_heading'    => array(
-			'heading'      => __( 'Block Express Checkout Buttons', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Express Checkout Buttons', 'woocommerce-paypal-payments' ),
 			'description'  => sprintf(
 			// translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
 				__(
-					'Customize the appearance of the PayPal smart buttons on the %1$sBlock Express Checkout%2$s.',
+					'Customize the appearance of the PayPal smart buttons on the %1$sExpress Checkout%2$s.',
 					'woocommerce-paypal-payments'
 				),
 				'<a href="https://woocommerce.com/document/woocommerce-paypal-payments/#button-on-block-express-checkout" target="_blank">',
@@ -923,11 +923,11 @@ return function ( ContainerInterface $container, array $fields ): array {
 
 		// Block cart settings.
 		'button_cart-block_heading'                => array(
-			'heading'      => __( 'Block Cart Buttons', 'woocommerce-paypal-payments' ),
+			'heading'      => __( 'Cart Buttons', 'woocommerce-paypal-payments' ),
 			'description'  => sprintf(
 			// translators: %1$s and %2$s are the opening and closing of HTML <a> tag.
 				__(
-					'Customize the appearance of the PayPal smart buttons on the %1$sBlock Cart%2$s.',
+					'Customize the appearance of the PayPal smart buttons on the %1$sCart%2$s.',
 					'woocommerce-paypal-payments'
 				),
 				'<a href="https://woocommerce.com/document/woocommerce-paypal-payments/#button-on-cart-block" target="_blank">',
diff --git a/tests/PHPUnit/WcGateway/Settings/LocationsTest.php b/tests/PHPUnit/WcGateway/Settings/LocationsTest.php
index 45cb63ffa..23bd375be 100644
--- a/tests/PHPUnit/WcGateway/Settings/LocationsTest.php
+++ b/tests/PHPUnit/WcGateway/Settings/LocationsTest.php
@@ -40,16 +40,16 @@ class LocationsTest extends ModularTestCase
 			['product', 'cart', 'checkout', 'mini-cart'],
 			[
 				'product' => 'Single Product',
-				'cart' => 'Cart',
-				'checkout' => 'Checkout',
+				'cart' => 'Classic Cart',
+				'checkout' => 'Classic Checkout',
 				'mini-cart' => 'Mini Cart',
 			],
 		];
 		yield [
 			['cart', 'checkout'],
 			[
-				'cart' => 'Cart',
-				'checkout' => 'Checkout',
+				'cart' => 'Classic Cart',
+				'checkout' => 'Classic Checkout',
 			],
 		];
 		yield [