diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartItem.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartItem.js
index 2c7f95c71bdb7a..c91dffa7d3a368 100644
--- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartItem.js
+++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartItem.js
@@ -292,7 +292,7 @@ function CartItem({
 									name
 								)}
 								className="d-inline-flex"
-								data-qa-id="cart-item-actions"
+								data-qa-id="cartItemActions"
 								displayType="unstyled"
 								symbol="ellipsis-v"
 								title={sub(
diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartQuickAdd.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartQuickAdd.js
index 32677c8b656e99..b69adce16f65e5 100644
--- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartQuickAdd.js
+++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/CartQuickAdd.js
@@ -369,7 +369,7 @@ export default function CartQuickAdd() {
 
 				<ClayInput.GroupItem shrink>
 					<ClayButtonWithIcon
-						data-qa-id="quick-add-to-cart-button"
+						data-qa-id="quickAddToCartButton"
 						disabled={!selectedSKUs.length || quickAddToCartError}
 						onClick={handleAddToCartClick}
 						symbol="shopping-cart"
diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/Opener.js b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/Opener.js
index eaf2916978fa03..57cc3e0c5c3702 100644
--- a/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/Opener.js
+++ b/modules/apps/commerce/commerce-frontend-js/src/main/resources/META-INF/resources/components/mini_cart/Opener.js
@@ -75,7 +75,7 @@ function Opener() {
 				'mini-cart-opener': true,
 			})}
 			data-badge-count={numberOfItems}
-			data-qa-id="mini-cart-button"
+			data-qa-id="miniCartButton"
 			onClick={openCart}
 		>
 			<ClayIcon symbol="shopping-cart" />
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/page.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/page.jsp
index d5d1086f75a592..9310b314f0f4c1 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/page.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/page.jsp
@@ -34,7 +34,7 @@ String myWorkflowTasksPortletNamespace = PortalUtil.getPortletNamespace(PortletK
 				</c:if>
 
 				<div class="border-right c-ml-sm-2 c-mr-3 c-pr-3 header-details">
-					<h3 class="c-mb-0 commerce-header-title text-truncate" data-qa-id="header-details-title">
+					<h3 class="c-mb-0 commerce-header-title text-truncate" data-qa-id="headerDetailsTitle">
 						<%= HtmlUtil.escape(title) %>
 					</h3>
 
diff --git a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_order/general.jsp b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_order/general.jsp
index dec852bf3a7f36..bb38ce6c9b0425 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_order/general.jsp
+++ b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_order/general.jsp
@@ -143,7 +143,7 @@ CommerceOrder commerceOrder = commerceOrderEditDisplayContext.getCommerceOrder()
 								</span>
 							</c:when>
 							<c:otherwise>
-								<p class="mb-0" data-qa-id="commerce-order-account-entry-name"><%= HtmlUtil.escape(accountEntry.getName()) %></p>
+								<p class="mb-0" data-qa-id="commerceOrderAccountEntryName"><%= HtmlUtil.escape(accountEntry.getName()) %></p>
 								<p class="mb-0">#<%= accountEntry.getAccountEntryId() %></p>
 							</c:otherwise>
 						</c:choose>
diff --git a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_return/general.jsp b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_return/general.jsp
index 5e3ae8332e864c..40c4907d7599cb 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_return/general.jsp
+++ b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/commerce_return/general.jsp
@@ -39,7 +39,7 @@ CommerceOrder commerceOrder = commerceReturnEditDisplayContext.getCommerceReturn
 								</span>
 							</c:when>
 							<c:otherwise>
-								<p class="mb-0" data-qa-id="commerce-return-account-entry-name"><%= HtmlUtil.escape(accountEntry.getName()) %></p>
+								<p class="mb-0" data-qa-id="commerceReturnAccountEntryName"><%= HtmlUtil.escape(accountEntry.getName()) %></p>
 								<p class="mb-0">#<%= accountEntry.getAccountEntryId() %></p>
 							</c:otherwise>
 						</c:choose>
@@ -81,14 +81,14 @@ CommerceOrder commerceOrder = commerceReturnEditDisplayContext.getCommerceReturn
 						elementClasses="py-3"
 						title='<%= LanguageUtil.get(request, "order-id") %>'
 					>
-						<p class="mb-0" data-qa-id="commerce-return-order-id">#<%= commerceOrder.getCommerceOrderId() %></p>
+						<p class="mb-0" data-qa-id="commerceReturnOrderId">#<%= commerceOrder.getCommerceOrderId() %></p>
 					</commerce-ui:info-box>
 
 					<commerce-ui:info-box
 						elementClasses="py-3"
 						title='<%= LanguageUtil.get(request, "order-date") %>'
 					>
-						<p class="mb-0" data-qa-id="commerce-return-order-date">
+						<p class="mb-0" data-qa-id="commerceReturnOrderDate">
 							<%= commerceReturnEditDisplayContext.getDateTimeFormatted(commerceOrder.getOrderDate()) %>
 						</p>
 					</commerce-ui:info-box>
@@ -97,7 +97,7 @@ CommerceOrder commerceOrder = commerceReturnEditDisplayContext.getCommerceReturn
 						elementClasses="py-3"
 						title='<%= LanguageUtil.get(request, "channel") %>'
 					>
-						<p class="mb-0" data-qa-id="commerce-return-channel-name"><%= HtmlUtil.escape(commerceReturn.getChannelName()) %></p>
+						<p class="mb-0" data-qa-id="commerceReturnChannelName"><%= HtmlUtil.escape(commerceReturn.getChannelName()) %></p>
 					</commerce-ui:info-box>
 				</div>
 
@@ -106,14 +106,14 @@ CommerceOrder commerceOrder = commerceReturnEditDisplayContext.getCommerceReturn
 						elementClasses="py-3"
 						title='<%= LanguageUtil.get(request, "payment-method") %>'
 					>
-						<p class="mb-0" data-qa-id="commerce-return-payment-method"><%= HtmlUtil.escape(commerceOrder.getCommercePaymentMethodKey()) %></p>
+						<p class="mb-0" data-qa-id="commerceReturnPaymentMethod"><%= HtmlUtil.escape(commerceOrder.getCommercePaymentMethodKey()) %></p>
 					</commerce-ui:info-box>
 
 					<commerce-ui:info-box
 						elementClasses="py-3"
 						title='<%= LanguageUtil.get(request, "return-date") %>'
 					>
-						<p class="mb-0" data-qa-id="commerce-return-date">
+						<p class="mb-0" data-qa-id="commerceReturnDate">
 							<%= commerceReturnEditDisplayContext.getDateTimeFormatted(commerceReturn.getCreateDate()) %>
 						</p>
 					</commerce-ui:info-box>
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/product_detail/render/view.jsp b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/product_detail/render/view.jsp
index 7202d1ba042a9e..ca9d15a3ae6e2f 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/product_detail/render/view.jsp
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/product_detail/render/view.jsp
@@ -55,7 +55,7 @@ long cpDefinitionId = cpCatalogEntry.getCPDefinitionId();
 							String stockQuantity = cpContentHelper.getStockQuantity(request);
 							%>
 
-							<span data-qa-id="in-stock-quantity"><%= Validator.isNull(stockQuantity) ? StringPool.BLANK : LanguageUtil.format(request, "x-in-stock", stockQuantity) %></span>
+							<span data-qa-id="inStockQuantity"><%= Validator.isNull(stockQuantity) ? StringPool.BLANK : LanguageUtil.format(request, "x-in-stock", stockQuantity) %></span>
 						</span>
 					</div>
 				</div>
diff --git a/modules/apps/commerce/commerce-product-test/src/testFunctional/paths/CommerceFrontStore.path b/modules/apps/commerce/commerce-product-test/src/testFunctional/paths/CommerceFrontStore.path
index 5567c9df8d35fe..19754dd530661b 100644
--- a/modules/apps/commerce/commerce-product-test/src/testFunctional/paths/CommerceFrontStore.path
+++ b/modules/apps/commerce/commerce-product-test/src/testFunctional/paths/CommerceFrontStore.path
@@ -282,7 +282,7 @@
 </tr>
 <tr>
 	<td>PRODUCT_DETAILS_IN_STOCK_QUANTITY</td>
-	<td>//span[(@data-qa-id='in-stock-quantity') and (contains(text(),'${key_inStockQuantity}'))]</td>
+	<td>//span[(@data-qa-id='inStockQuantity') and (contains(text(),'${key_inStockQuantity}'))]</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/modules/test/playwright/pages/commerce/commerceAdminOrderDetailsPage.ts b/modules/test/playwright/pages/commerce/commerceAdminOrderDetailsPage.ts
index 2fe0356fd3cdd9..a2e87ea2d097da 100644
--- a/modules/test/playwright/pages/commerce/commerceAdminOrderDetailsPage.ts
+++ b/modules/test/playwright/pages/commerce/commerceAdminOrderDetailsPage.ts
@@ -12,9 +12,9 @@ export class CommerceAdminOrderDetailsPage {
 
 	constructor(page: Page) {
 		this.commerceOrderAccountEntryName = page.getByTestId(
-			'commerce-order-account-entry-name'
+			'commerceOrderAccountEntryName'
 		);
-		this.headerDetailsTitle = page.getByTestId('header-details-title');
+		this.headerDetailsTitle = page.getByTestId('headerDetailsTitle');
 		this.page = page;
 	}
 }
diff --git a/modules/test/playwright/pages/commerce/commerceMiniCartPage.ts b/modules/test/playwright/pages/commerce/commerceMiniCartPage.ts
index dbf6e610fe7f56..23501e62d91355 100644
--- a/modules/test/playwright/pages/commerce/commerceMiniCartPage.ts
+++ b/modules/test/playwright/pages/commerce/commerceMiniCartPage.ts
@@ -35,8 +35,8 @@ export class CommerceMiniCartPage {
 			exact: true,
 			name: 'Edit',
 		});
-		this.cartItemActionsButton = page.getByTestId('cart-item-actions');
-		this.miniCartButton = page.getByTestId('mini-cart-button');
+		this.cartItemActionsButton = page.getByTestId('cartItemActions');
+		this.miniCartButton = page.getByTestId('miniCartButton');
 		this.miniCartButtonClose = page.locator('.mini-cart-close');
 		this.miniCartSaveButton = page.getByRole('button', {
 			exact: true,
@@ -45,9 +45,7 @@ export class CommerceMiniCartPage {
 		this.miniCartUnitOfMeasureSelector = page.locator(
 			'select[name="minicart-uom-selector"]'
 		);
-		this.quickAddToCartButton = page.getByTestId(
-			'quick-add-to-cart-button'
-		);
+		this.quickAddToCartButton = page.getByTestId('quickAddToCartButton');
 		this.quickAddToCartSku = (sku) =>
 			page.getByRole('menuitem', {name: sku});
 		this.searchProductsInput = page.getByPlaceholder('Search Products');
diff --git a/modules/test/playwright/pages/commerce/commercePaymentsPage.ts b/modules/test/playwright/pages/commerce/commercePaymentsPage.ts
index 34b9c5b6638d48..de6649544a5c98 100644
--- a/modules/test/playwright/pages/commerce/commercePaymentsPage.ts
+++ b/modules/test/playwright/pages/commerce/commercePaymentsPage.ts
@@ -40,7 +40,7 @@ export class CommercePaymentsPage {
 		this.ercSubmitButton = page
 			.frameLocator('iframe[title="Edit External Reference Code"]')
 			.getByRole('button', {exact: true, name: 'Submit'});
-		this.headerDetailsTitle = page.getByTestId('header-details-title');
+		this.headerDetailsTitle = page.getByTestId('headerDetailsTitle');
 		this.makeRefundButton = page.getByLabel('Make a Refund', {exact: true});
 		this.reasonInput = page.getByLabel('Reason');
 		this.saveButton = page.getByRole('link', {exact: true, name: 'Save'});