diff --git a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/license-plate-lookup-alerts.vue b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/license-plate-lookup-alerts.vue
index a03c32d0..57e2e5f1 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/license-plate-lookup-alerts.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/license-plate-lookup-alerts.vue
@@ -3,24 +3,24 @@
       id="vin-lookup-alerts-wrapper"
       :class="wrapperCssClass"
     >
-      <VehicleNotFoundAlert
+      <vehicleNotFoundAlert
         v-if="isVehicleNotFoundVisible"
       />
-      <VehicleNotMatchedAlert
+      <vehicleNotMatchedAlert
         v-else-if="isVehicleNotMatchedVisible"
       />
     </div>
   </template>
   <script>
   import vehicleLookupAlertTypes from '@/constants/vehicle-lookup-alert-types';
-  import VehicleNotFoundAlert from './vehicle-not-found-alert/vehicle-not-found-alert.vue';
-  import VehicleNotMatchedAlert from './vehicle-not-matched-alert/vehicle-not-matched-alert.vue';
+  import vehicleNotFoundAlert from './vehicle-not-found-alert/vehicle-not-found-alert.vue';
+  import vehicleNotMatchedAlert from './vehicle-not-matched-alert/vehicle-not-matched-alert.vue';
   
   export default {
     name: 'license-plate-lookup-alerts',
     components: {
-      VehicleNotFoundAlert,
-      VehicleNotMatchedAlert,
+      vehicleNotFoundAlert,
+      vehicleNotMatchedAlert,
     },
     props: {
       activeAlertType: {
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-found-alert/vehicle-not-found-alert.vue b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-found-alert/vehicle-not-found-alert.vue
index 3e9c5aaa..95721f30 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-found-alert/vehicle-not-found-alert.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-found-alert/vehicle-not-found-alert.vue
@@ -1,17 +1,17 @@
 <template>
-    <Alert
+    <alert
       alert-class="alert-danger"
       cms-widget-name="AlertVinNotFoundWidget"
       id="vehicle-not-found-alert"
     />
   </template>
   <script>
-  import Alert from '@/ux-components/alert/alert.vue';
+  import alert from '@/ux-components/alert/alert.vue';
   
   export default {
     name: 'vehicle-not-found-alert',
     components: {
-      Alert,
+      alert,
     },
   };
   </script>
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-matched-alert/vehicle-not-matched-alert.vue b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-matched-alert/vehicle-not-matched-alert.vue
index 5d135367..21d3d4ff 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-matched-alert/vehicle-not-matched-alert.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup-alerts/vehicle-not-matched-alert/vehicle-not-matched-alert.vue
@@ -1,5 +1,5 @@
 <template>
-    <Alert
+    <alert
       alert-class="alert-warning"
       cms-widget-name="AlertMatchedDifferentVehicleWidget"
       :manual-copy="body"
@@ -9,12 +9,12 @@
   <script>
   import { getDamageString } from '@/helpers/damage-helper';
   
-  import Alert from '@/ux-components/alert/alert.vue';
+  import alert from '@/ux-components/alert/alert.vue';
   
   export default {
     name: 'vehicle-not-matched-alert',
     components: {
-      Alert,
+      alert,
     },
     inject: ['vehicleFromLookup'],
     computed: {
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index be2a0e70..cec166a1 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -10,12 +10,12 @@
         :display-generic-vehicle-image="false" />
       <siteSubHeader cms-widget-name="SiteSubHeaderWidget" />
       <div class="fade-on-route-transition sub-container make-tall mt-5">
-        <license-plate-lookup-alerts
+        <licensePlateLookupAlerts
           :activeAlertType="activeVehicleLookupAlertType"
         />
-        <license-plate-question
+        <licensePlateQuestion
           v-model="licensePlate"/>
-        <zip-question
+        <zipQuestion
           v-model="registrationZipCode"
           class="mt-4" />
         <siteFooter
@@ -39,20 +39,20 @@ import { settleAllPromises } from '@/helpers/layout-helper';
 import { useMainStore } from '@/store';
 
 // Import Component
-import BaseFormMixin from '@/mixins/base-form-mixin';
+import baseFormMixin from '@/mixins/base-form-mixin';
 import { Form } from 'vee-validate';
 import siteFooter from '@/common-components/site-footer/site-footer.vue';
 import siteHeader from '@/common-components/site-header/site-header.vue';
 import siteSubHeader from '@/common-components/site-sub-header/site-sub-header.vue';
 import vehicleBanner from '@/common-components/vehicle-banner/vehicle-banner.vue';
 import textboxQuestion from '../../common-components/textbox-question/textbox-question.vue';
-import LicensePlateQuestion from './license-plate-question/license-plate-question.vue';
-import ZipQuestion from './zip-question/zip-question.vue';
-import LicensePlateLookupAlerts from './license-plate-lookup-alerts/license-plate-lookup-alerts.vue';
+import licensePlateQuestion from './license-plate-question/license-plate-question.vue';
+import zipQuestion from './zip-question/zip-question.vue';
+import licensePlateLookupAlerts from './license-plate-lookup-alerts/license-plate-lookup-alerts.vue';
 
 export default {
   name: 'license-plate-lookup',
-  mixins: [BaseFormMixin],
+  mixins: [baseFormMixin],
   components: {
     Form,
     siteFooter,
@@ -60,8 +60,14 @@ export default {
     siteSubHeader,
     vehicleBanner,
     textboxQuestion,
-    LicensePlateQuestion,
-    ZipQuestion,   
+    licensePlateQuestion,
+    zipQuestion,
+    licensePlateLookupAlerts
+  },
+  setup() {
+    const mainStore = useMainStore();
+
+    return { mainStore };
   },
   data() {
     return {
diff --git a/src/layouts/license-plate-lookup/license-plate-question/license-plate-question.vue b/src/layouts/license-plate-lookup/license-plate-question/license-plate-question.vue
index 44a6087a..3757518d 100644
--- a/src/layouts/license-plate-lookup/license-plate-question/license-plate-question.vue
+++ b/src/layouts/license-plate-lookup/license-plate-question/license-plate-question.vue
@@ -1,5 +1,5 @@
 <template>
-    <TextboxQuestion
+    <textboxQuestion
         inputId="license-plate-question"
         cmsWidgetName="LicensePlateNumberQuestionWidget"
         v-model="licensePlate"
@@ -15,7 +15,7 @@
   import { errorMessages } from '@/constants/error-messages';
   
   // Import Component(s)
-  import TextboxQuestion from '@/common-components/textbox-question/textbox-question.vue';
+  import textboxQuestion from '@/common-components/textbox-question/textbox-question.vue';
   
 defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
   
@@ -26,7 +26,7 @@ export default {
     },
     emits: ['update:modelValue'],
     components: {
-      TextboxQuestion,
+      textboxQuestion,
     },
     computed: {
       licensePlate: {
diff --git a/src/layouts/license-plate-lookup/zip-question/zip-question.vue b/src/layouts/license-plate-lookup/zip-question/zip-question.vue
index dd1cbfbd..4af9a5b2 100644
--- a/src/layouts/license-plate-lookup/zip-question/zip-question.vue
+++ b/src/layouts/license-plate-lookup/zip-question/zip-question.vue
@@ -1,5 +1,5 @@
 <template>
-    <TextboxQuestion
+    <textboxQuestion
         inputId="zip"
         cmsWidgetName="RegistrationZipQuestionWidget"
         v-model="registrationZipCode"
@@ -15,7 +15,7 @@ import { regex, required } from '@/helpers/validation-rules';
 import { errorMessages } from '@/constants/error-messages';
   
 // Import Component(s)
-import TextboxQuestion from '@/common-components/textbox-question/textbox-question.vue';
+import textboxQuestion from '@/common-components/textbox-question/textbox-question.vue';
   
 defineRule("zip-required", required(errorMessages.REGISTRATION_ZIP_REQUIRED));
 defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.ZIP_FORMAT));
@@ -27,7 +27,7 @@ export default {
     },
     emits: ['update:modelValue'],
     components: {
-      TextboxQuestion,
+      textboxQuestion,
     },
     computed: {
       registrationZipCode: {