diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 0be25396..1e6ec309 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -53,7 +53,7 @@ export default {
             });
             return reducedGlassParts;
         },
-        comparePageIndices(currentPage, fmgPage) {
+        comparePageIndices(currentPage, issPage) {
             const orderedVehicleQuestionPages = [
                 issPageValues.PART_QUESTIONS,
                 issPageValues.VEHICLE_PARTS,
@@ -64,14 +64,14 @@ export default {
 
             return (
                 orderedVehicleQuestionPages.indexOf(currentPage) -
-                orderedVehicleQuestionPages.indexOf(fmgPage)
+                orderedVehicleQuestionPages.indexOf(issPage)
             );
         },
-        currentPageComesBeforePage(currentPage = this.$route.query.fmgPage, fmgPage) {
-            return this.comparePageIndices(currentPage, fmgPage) < 0;
+        currentPageComesBeforePage(currentPage = this.$route.query.issPage, issPage) {
+            return this.comparePageIndices(currentPage, issPage) < 0;
         },
-        currentPageComesAfterPage(currentPage = this.$route.query.fmgPage, fmgPage) {
-            return this.comparePageIndices(currentPage, fmgPage) > 0;
+        currentPageComesAfterPage(currentPage = this.$route.query.issPage, issPage) {
+            return this.comparePageIndices(currentPage, issPage) > 0;
         },
         setupInitialData(glass, index, alreadyAnsweredQuestions, vm) {
             const self = vm ?? this;
@@ -366,7 +366,7 @@ export default {
         // Can't use `this` because navigateForward is also called from vin-pages-mixin
         async navigateForward(partsOrQuestions, vm, shouldGoToHeritageQuote) {
             const self = vm ?? this;
-            const currentPage = self.$route.query.fmgPage;
+            const currentPage = self.$route.query.issPage;
 
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions);
             const hasGlassLocationWithMultipleParts =