diff --git a/src/common-components/question-chain/question-chain.vue b/src/common-components/question-chain/question-chain.vue
index bc707f239..a5e2e8bbf 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/common-components/question-chain/question-chain.vue
@@ -7,7 +7,7 @@
                 :class="q.questionSequence === currentQuestionNum && 'current-question'"
                 :questionText="q.questionText"
                 :answers="q.answers"
-                :groupName="`question-${glassIndex}-${q.questionSequence}`"
+                :groupName="`question-${glassPieceIndex}-${q.questionSequence}`"
                 :modelValue="q.answerSelected"
                 @update:modelValue="handleAnswer(q, $event)"
                 isRequired
@@ -32,7 +32,7 @@ export default {
         questionData: Object,
         validationRules: String,
         modelValue: Object,
-        glassIndex: Number,
+        glassPieceIndex: Number,
         answerKey: String,
     },
     async created() {
@@ -155,7 +155,7 @@ export default {
                 return {
                     answerResult: questionAnswer,
                     answeredQuestions: answeredQuestions,
-                    glassIndex: this.glassIndex,
+                    glassPieceIndex: this.glassPieceIndex,
                 };
             }
         },
diff --git a/src/common-components/questions-page/questions-page.vue b/src/common-components/questions-page/questions-page.vue
index 3d04f804d..42e1930b6 100644
--- a/src/common-components/questions-page/questions-page.vue
+++ b/src/common-components/questions-page/questions-page.vue
@@ -13,14 +13,14 @@
                 :manualHeadline="alertFewMoreQuestionsHeader"
                 :manualCopy="alertFewMoreQuestionsCopy"
                 v-bind:isDismissible="false" />
-            <div v-for="(glass, i) in questionsData" :key="glass.key">
+            <div v-for="(questionDatum, i) in questionsData" :key="questionDatum.key">
                 <questionChain
                     ref="questionChain"
-                    v-model="qPselectedAnswers2[glass.answerKey]"
-                    :questionData="glass.questions"
-                    :glassIndex="i"
-                    v-if="showThisQuestionChain(glass, i)"
-                    :answerKey="glass.answerKey"
+                    v-model="selectedAnswers[questionDatum.answerKey]"
+                    :questionData="questionDatum.questions"
+                    :glassPieceIndex="i"
+                    v-if="showThisQuestionChain(questionDatum, i)"
+                    :answerKey="questionDatum.answerKey"
                     :validationRules="validationRules" />
             </div>
             <funnel-footer
@@ -55,7 +55,7 @@ export default {
         currentGlassPieceIndex: Number,
     },
     computed: {
-        qPselectedAnswers2: {
+        selectedAnswers: {
             get() {
                 return this.modelValue;
             },
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 98ecc31f6..173608815 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -7,7 +7,7 @@
             :alertFewMoreQuestionsCopy="AlertFewMoreQuestionsCopy"
             :questionsData="questionsData"
             :validationRules="questions - required"
-            v-model="selectedAnswers2"
+            v-model="selectedAnswers"
             @forwardButtonAction="forwardButtonAction"
             @backButtonAction="backButtonAction"
             :currentGlassPieceIndex="currentGlassPieceIndex" />
@@ -56,7 +56,7 @@ export default {
     data() {
         return {
             questionsData: [],
-            selectedAnswers2: {},
+            selectedAnswers: {},
             currentGlassPieceIndex: 0,
         };
     },
@@ -82,13 +82,13 @@ export default {
                 glass.questions = glass.capabilityQuestions;
                 glass.answerKey = glass.glassLocation + "-" + glass.glassName;
                 // reset selectedAnswers for this glass
-                this.selectedAnswers2[glass.answerKey] = [];
+                this.selectedAnswers[glass.answerKey] = [];
 
                 const updatedGlass = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
 
                 // Set up watch for each set of glass questions
                 this.$watch(
-                    "selectedAnswers2." + glass.answerKey,
+                    "selectedAnswers." + glass.answerKey,
                     (newValue) => {
                         if (newValue && Object.keys(newValue).length > 0) {
                             this.handleAnswerUpdates(newValue, glass.answerKey);
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index 3670f9cc1..72e3f62ad 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -7,7 +7,7 @@
             :alertFewMoreQuestionsCopy="AlertFewMoreQuestionsCopy"
             :questionsData="questionsData"
             :validationRules="questions - required"
-            v-model="selectedAnswers2"
+            v-model="selectedAnswers"
             @forwardButtonAction="forwardButtonAction"
             @backButtonAction="backButtonAction"
             :currentGlassPieceIndex="currentGlassPieceIndex" />
@@ -56,7 +56,7 @@ export default {
     data() {
         return {
             questionsData: [],
-            selectedAnswers2: {},
+            selectedAnswers: {},
             currentGlassPieceIndex: 0,
         };
     },
@@ -82,12 +82,12 @@ export default {
                 glass.questions = glass.parts[0].childPartQuestions;
                 glass.answerKey = glass.glassLocation + "-" + glass.glassName;
                 // reset selectedAnswers for this glass
-                this.selectedAnswers2[glass.answerKey] = [];
+                this.selectedAnswers[glass.answerKey] = [];
 
                 const updatedGlass = this.setupInitialData(glass, i, alreadyAnsweredQuestions);
 
                 this.$watch(
-                    "selectedAnswers2." + glass.answerKey,
+                    "selectedAnswers." + glass.answerKey,
                     (newValue) => {
                         if (newValue && Object.keys(newValue).length > 0) {
                             this.handleAnswerUpdates(newValue, glass.answerKey);
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 2d16dd2e4..2a8a1f891 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -158,7 +158,7 @@ export default {
                             "questionNum": 1,
                         }
                     ],
-                    "glassIndex": 0
+                    "glassPieceIndex": 0
                 }
                 */
 
@@ -213,7 +213,7 @@ export default {
                     */
 
                     // limit duplicate search to glass pieces that follow after the currently being answered glass piece
-                    if (pieceIndex > answer.glassIndex) {
+                    if (pieceIndex > answer.glassPieceIndex) {
                         let indexToSuppressTo;
                         // reset this glass piece, in case user is changing their previous answers
                         glassPiece.answerData = null;
@@ -341,13 +341,13 @@ export default {
             });
 
             // set final answer data for the current answered glass part
-            self.questionsData[answer.glassIndex].answerData = {
+            self.questionsData[answer.glassPieceIndex].answerData = {
                 answerResult: answer.answerResult,
                 answeredQuestions: answer.answeredQuestions,
             };
 
             // this part has been fully answered, so advance to next part's question chain
-            for (let i = answer.glassIndex + 1; i < this.questionsData.length; i++) {
+            for (let i = answer.glassPieceIndex + 1; i < this.questionsData.length; i++) {
                 // if this part has not yet been fully answered, then make it the current part
                 if (!this.questionsData[i].answerData?.answerResult) {
                     this.currentGlassPieceIndex = i;
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index 4be7dec0f..dbbe3c64f 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -425,7 +425,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -459,7 +459,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -495,7 +495,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -532,7 +532,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -609,7 +609,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -681,7 +681,7 @@ describe("vehicle-questions-mixin", () => {
                             questionNum: 1,
                         },
                     ],
-                    glassIndex: 0,
+                    glassPieceIndex: 0,
                 };
                 const { wrapper } = setupMocks({});
 
@@ -752,7 +752,7 @@ describe("vehicle-questions-mixin", () => {
                                 questionNum: 1,
                             },
                         ],
-                        glassIndex: 0,
+                        glassPieceIndex: 0,
                     };
                     const { wrapper } = setupMocks({});
 
@@ -855,7 +855,7 @@ describe("vehicle-questions-mixin", () => {
                                 questionNum: 1,
                             },
                         ],
-                        glassIndex: 0,
+                        glassPieceIndex: 0,
                     };
                     const { wrapper } = setupMocks({});
 
@@ -1003,7 +1003,7 @@ describe("vehicle-questions-mixin", () => {
                                     questionNum: 1,
                                 },
                             ],
-                            glassIndex: 0,
+                            glassPieceIndex: 0,
                         };
                         const { wrapper } = setupMocks({});
 
@@ -1115,7 +1115,7 @@ describe("vehicle-questions-mixin", () => {
                                 questionNum: 1,
                             },
                         ],
-                        glassIndex: 0,
+                        glassPieceIndex: 0,
                     };
                     const { wrapper } = setupMocks({});