diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js
index 3ae87ce9..4876b999 100644
--- a/src/constants/part-type-strings.js
+++ b/src/constants/part-type-strings.js
@@ -3,7 +3,7 @@
     WINDSHIELD: 'WINDSHIELD',
     FRONT_WIPER: 'FRONT WIPER',
     REAR_WIPER: 'REAR WIPER',
-    RAIN_DEFENSE: 'RAIN DEFENSE',
+    RAIN_DEFENSE: 'RAIN REPEL',
     RECALIBRATION: 'RECALIBRATION',
     REPLACE_FEE: 'REPLACE FEE',
     MOBILE_FEE: 'MOBILE FEE',
diff --git a/src/helpers/service-package-helper.spec.js b/src/helpers/service-package-helper.spec.js
index 878132dc..3b9c40f4 100644
--- a/src/helpers/service-package-helper.spec.js
+++ b/src/helpers/service-package-helper.spec.js
@@ -33,9 +33,9 @@ const rearWiperLineItem = {
 };
 
 const rainDefenseLineItem = {
-    partNumber: 'RAIN DEFENSE',
+    partNumber: 'RAIN REPEL',
     description: null,
-    partType: 'RAIN DEFENSE',
+    partType: 'RAIN REPEL',
     price: 35.5
 };
 
@@ -115,7 +115,7 @@ describe('service-package-helper.js', () => {
                 passengerFrontWiperLineItem,
                 rainDefenseLineItem
             ];
-            const partType = 'rAin DEfenSe';
+            const partType = 'rAin rEpeL';
 
             // Act
             const result = servicePackageHelper.findLineItemsWithPartType(partType, lineItems);
diff --git a/src/iss-components/cart-dropdown/cart-dropdown.spec.js b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
index dcf6ddc7..bab952b4 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.spec.js
+++ b/src/iss-components/cart-dropdown/cart-dropdown.spec.js
@@ -688,7 +688,7 @@ describe('cart-dropdown component', () => {
                 });
                 const expectedFrontWiperName = 'front wiper';
                 const expectedRearWiperName = 'rear wiper';
-                const expectedRainDefenseName = 'rain defense';
+                const expectedRainDefenseName = 'rain repel';
                 const vapsItemDescriptions = [
                     {
                         Name: frontWiperPartType,
diff --git a/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.spec.js b/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.spec.js
index 322e019a..ccb603f2 100644
--- a/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.spec.js
+++ b/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.spec.js
@@ -31,7 +31,7 @@ const testConstants = {
     vapsCopy: {
         frontWiperCopy: 'Front Wiper copy',
         rearWiperCopy: 'Rear Wiper copy',
-        rainDefenseCopy: 'Rain defense copy'
+        rainDefenseCopy: 'Rain repel copy'
     },
     parts: {
         frontWiperPart: {
@@ -47,9 +47,9 @@ const testConstants = {
             price: 24.48
         },
         rainDefensePart: {
-            partNumber: 'RAIN DEFENSE',
+            partNumber: 'RAIN REPEL',
             description: null,
-            partType: 'RAIN DEFENSE',
+            partType: 'RAIN REPEL',
             price: 35.5
         },
         recalPart: {
diff --git a/src/layouts/payment-page/payment-page.spec.js b/src/layouts/payment-page/payment-page.spec.js
index 13830ddc..257a6367 100644
--- a/src/layouts/payment-page/payment-page.spec.js
+++ b/src/layouts/payment-page/payment-page.spec.js
@@ -45,10 +45,10 @@ const parts = {
         price: 24.48
     },
     rainDefense: {
-        name: 'rain defense',
-        partNumber: 'RAIN DEFENSE',
+        name: 'rain repel',
+        partNumber: 'RAIN REPEL',
         description: null,
-        partType: 'RAIN DEFENSE',
+        partType: 'RAIN REPEL',
         price: 35.5
     }
 };
diff --git a/src/layouts/service-packages/service-package-question/service-package-question.vue b/src/layouts/service-packages/service-package-question/service-package-question.vue
index 87fa7bbd..9c0ee168 100644
--- a/src/layouts/service-packages/service-package-question/service-package-question.vue
+++ b/src/layouts/service-packages/service-package-question/service-package-question.vue
@@ -143,9 +143,7 @@ export default {
     },
     watch: {
         availableLineItems() {
-            if (allGlassPartsAndItemsHavePrices(store.order.lineItems)) {
-                this.selectDefaultPackage();
-            }
+            this.selectDefaultPackage();
         },
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue
index e399e14f..692546ce 100644
--- a/src/layouts/service-packages/service-packages.vue
+++ b/src/layouts/service-packages/service-packages.vue
@@ -114,7 +114,7 @@ export default {
 
         const availableLineItems = [];
 
-        if (resultMap?.rainDefense?.length > 0) {
+        if (resultMap?.rainDefense) {
             availableLineItems.push(resultMap.rainDefense);
         }
 
@@ -127,7 +127,7 @@ export default {
         }
 
         let hasBailedOut = false;
-        await store.getCombinedQuote(availableLineItems)
+        const pricedItems = await store.getCombinedQuote(availableLineItems)
             .catch((err) => {
                 useMainStore().setBailout(bailoutMessage.pricingResponseError(
                     availableLineItems.map((li) => li.partNumber),
@@ -141,7 +141,7 @@ export default {
         if (!hasBailedOut) {
             next((vm) => {
                 vm.setCmsContent(resultMap.cmsContent);
-                vm.setData([resultMap.rainDefense, ...resultMap.wipers]);
+                vm.setData(pricedItems);
             });
         }
     },