diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c3f3d0657..1adf90f21 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -106,14 +106,14 @@
                     </div>
                     <shopQuestionPopup
                         v-if="isShopQuestionDisplayed"
-                        :preSelectedProviderNumber="selectedProvider?.providerNumber"
-                        :shopProviderData="shopProviderData"
+                        :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
+                        :shopProviderDataFromParent="shopProviderData"
                         @updated-serviceability="setServiceabilityDetails"
                         @shop-selected="onShopSelected"
                         @updated-zipcode-ctu="setZipcodeCtu"
                         @update-shop-provider-data="shopProviderData = $event"
                         @updated-contains-military-base="setContainsMilitaryBase"
-                        :zipCode="zipCode"
+                        :zipCodeFromParent="zipCode"
                         cmsWidgetName="YourSafeliteShopWidget" />
 
                     <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index 239632e8b..16c555dec 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -17,7 +17,7 @@
         :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"
         :footerButtonDisabled="
-            displayInvalidZipAlert || displayNoShopsAlert || !selectedProviderNumber
+            displayInvalidZipAlert || displayNoShopsAlert || !localSelectedProviderNumber
         "
         @footer-button-event="setZipCodeAndShop">
         <form @submit.prevent>
@@ -25,7 +25,7 @@
                 ref="serviceZipQuestion"
                 class="shop-question-zipcode"
                 customInputId="serviceZipCode"
-                v-model="newZipCode"
+                v-model="localZipCode"
                 cmsWidgetName="ServiceZipQuestionWidget"
                 @search-icon-click="onSearchZip"
                 @keydown.enter="onSearchZip"
@@ -56,9 +56,9 @@
                 :answers="answers"
                 groupName="chooseShop"
                 textPosition="text-start"
-                v-model="selectedProviderNumber"
+                v-model="localSelectedProviderNumber"
                 isRequired
-                :validationRules="this.selectedProviderNumber ? '' : 'option-required'" />
+                :validationRules="this.localSelectedProviderNumber ? '' : 'option-required'" />
             <div class="show-more-shops-link">
                 <textLink
                     v-if="displaySeeMoreLocationsLink"
@@ -108,23 +108,23 @@ export default {
     mixins: [baseMixin],
     data() {
         return {
-            newZipCode: this.zipCode,
+            localZipCode: this.zipCodeFromParent,
             answers: [],
             shopListButton: shopListButton,
             indexOfLastShopDisplayed: 0,
-            localShopProviderData: this.shopProviderData, // Why does parent manage this sometimes, but not all of the time A: to prevent another call to get providers on initial load
-            selectedProviderNumber: null, // Revisit this, maybe not too hard
+            localShopProviderData: this.shopProviderDataFromParent, // Why does parent manage this sometimes, but not all of the time A: to prevent another call to get providers on initial load
+            localSelectedProviderNumber: null, // Revisit this, maybe not too hard
             displayInvalidZipAlert: false, // part of big refactor of asyn calls
             displayNoShopsAlert: false, // part of big refactor of asyn calls
         };
     },
     props: {
-        shopProviderData: Object,
-        zipCode: {
+        shopProviderDataFromParent: Object,
+        zipCodeFromParent: {
             type: String,
             default: "",
         },
-        preSelectedProviderNumber: {
+        selectedProviderNumberFromParent: {
             type: String,
             default: null,
         },
@@ -222,28 +222,28 @@ export default {
             this.pushEventToGA(this.GaCategories.SERVICE_LOCATION, this.GaActions.MORE_LOCATIONS_CLICKED, joinedShops, true);
         },
         onModalOpened() {
-            const preSelectedIndex = this.shopProviders.findIndex(
-                (provider) => provider.providerNumber == this.preSelectedProviderNumber
+            const selectedProviderNumberFromParentIndex = this.shopProviders.findIndex(
+                (provider) => provider.providerNumber == this.selectedProviderNumberFromParent
             );
 
-            if (preSelectedIndex > -1) {
-                this.indexOfLastShopDisplayed = Math.ceil((preSelectedIndex + 1) / 3) * 3;
+            if (selectedProviderNumberFromParentIndex > -1) {
+                this.indexOfLastShopDisplayed = Math.ceil((selectedProviderNumberFromParentIndex + 1) / 3) * 3;
             } else {
                 this.indexOfLastShopDisplayed = 3;
             }
 
-            this.localShopProviderData = this.shopProviderData;
+            this.localShopProviderData = this.shopProviderDataFromParent;
             this.answers = [];
-            this.updateShopsForZip(this.newZipCode);
-            this.selectedProviderNumber = this.preSelectedProviderNumber;
+            this.updateShopsForZip(this.localZipCode);
+            this.localSelectedProviderNumber = this.selectedProviderNumberFromParent;
             if (
-                (!this.selectedProviderNumber ||
+                (!this.localSelectedProviderNumber ||
                     !this.shopProviders.some(
-                        (p) => p.providerNumber == this.selectedProviderNumber
+                        (p) => p.providerNumber == this.localSelectedProviderNumber
                     )) &&
                 this.shopProviders.length > 0
             ) {
-                this.selectedProviderNumber = this.shopProviders[0].providerNumber;
+                this.localSelectedProviderNumber = this.shopProviders[0].providerNumber;
             }
         },
         closeModal() {
@@ -256,7 +256,7 @@ export default {
             event.preventDefault();
             this.resetAlerts();
             const zipCodeData = await this.getZipCodeData(
-                this.newZipCode,
+                this.localZipCode,
                 "service-location"
             );
             if (!zipCodeData.isValid) {
@@ -267,7 +267,7 @@ export default {
                 if (this.isVehicleHeavyTruck) {
                     // check the location endpoint to verify this zip can service a heavy truck
                     const closestShops = await getClosestApplicableShops(
-                        this.newZipCode,
+                        this.localZipCode,
                         this.carId,
                         "service-location"
                     );
@@ -278,10 +278,10 @@ export default {
                         return null;
                     }
                 } else {
-                    getShopProviderData(this.newZipCode).then(async (result) => {
+                    getShopProviderData(this.localZipCode).then(async (result) => {
                         this.displayNoShopsAlert = false;
                         this.localShopProviderData = result.data;
-                        this.updateShopsForZip(this.newZipCode);
+                        this.updateShopsForZip(this.localZipCode);
                     });
                 }
             }
@@ -299,7 +299,7 @@ export default {
             }
 
             const selectedIndex = this.shopProviders.findIndex(
-                (provider) => provider.providerNumber == this.selectedProviderNumber
+                (provider) => provider.providerNumber == this.localSelectedProviderNumber
             );
 
             // If not found, only show the first 3 shops
@@ -333,10 +333,10 @@ export default {
             this.answers = mappedData;
             // I think we should call our new pushGA Event here with new mapped data
             if (
-                this.selectedProviderNumber &&
-                !this.answers.some((a) => String(a.value) === String(this.selectedProviderNumber))
+                this.localSelectedProviderNumber &&
+                !this.answers.some((a) => String(a.value) === String(this.localSelectedProviderNumber))
             ) {
-                this.selectedProviderNumber = null;
+                this.localSelectedProviderNumber = null;
             }
             this.indexOfLastShopDisplayed = mappedData.length;
             this.displayNoShopsAlert = this.answers.length === 0;
@@ -351,11 +351,11 @@ export default {
         },
         async setZipCodeAndShop() {
             const selectedProvider = this.shopProviders.find(
-                (provider) => provider.providerNumber == this.selectedProviderNumber
+                (provider) => provider.providerNumber == this.localSelectedProviderNumber
             );
             this.resetAlerts();
 
-            const zipCodeData = await this.getZipCodeData(this.newZipCode, "service-location");
+            const zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location");
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
@@ -413,7 +413,7 @@ export default {
                 this.$emit("shop-selected", {
                     providerNumber: selectedProvider?.providerNumber,
                     address: selectedProvider?.address,
-                    searchedZip: this.newZipCode,
+                    searchedZip: this.localZipCode,
                     searchedState: zipCodeData.state,
                 });