diff --git a/src/components/Button.vue b/src/components/ActionButton.vue
similarity index 95%
rename from src/components/Button.vue
rename to src/components/ActionButton.vue
index 54eb445..bb8f50f 100644
--- a/src/components/Button.vue
+++ b/src/components/ActionButton.vue
@@ -14,7 +14,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "ActionButtonComponent" });
 // The Lucia project.
 // Copyright 2024-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Search.vue b/src/components/ActivitySearch.vue
similarity index 96%
rename from src/components/Search.vue
rename to src/components/ActivitySearch.vue
index 8802da4..8410234 100644
--- a/src/components/Search.vue
+++ b/src/components/ActivitySearch.vue
@@ -24,7 +24,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "ActivitySearchComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Header.vue b/src/components/AppHeader.vue
similarity index 98%
rename from src/components/Header.vue
rename to src/components/AppHeader.vue
index bc797d1..fbd947c 100644
--- a/src/components/Header.vue
+++ b/src/components/AppHeader.vue
@@ -36,7 +36,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "AppHeaderComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Navbar.vue b/src/components/AppNavbar.vue
similarity index 99%
rename from src/components/Navbar.vue
rename to src/components/AppNavbar.vue
index c5dd00a..2cc6ae0 100644
--- a/src/components/Navbar.vue
+++ b/src/components/AppNavbar.vue
@@ -79,7 +79,6 @@
   </nav>
 </template>
 <script setup>
-defineOptions({ name: "AppNavbarComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue b/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
index 6b29c28..8f12a2a 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/TimeRangeDuration.vue
@@ -35,7 +35,7 @@
  */
 
 import { ref, watch } from "vue";
-import Durationjs from "@/components/durationjs.vue";
+import Durationjs from "@/components/DurationInput.vue";
 
 const props = defineProps(["time", "select"]);
 const emit = defineEmits(["min-total-seconds", "max-total-seconds"]);
diff --git a/src/components/Discover/Map/Filter/Attributes.vue b/src/components/Discover/Map/Filter/AttributesFilter.vue
similarity index 99%
rename from src/components/Discover/Map/Filter/Attributes.vue
rename to src/components/Discover/Map/Filter/AttributesFilter.vue
index 51557f5..f47ae26 100644
--- a/src/components/Discover/Map/Filter/Attributes.vue
+++ b/src/components/Discover/Map/Filter/AttributesFilter.vue
@@ -307,7 +307,6 @@
   </section>
 </template>
 <script setup>
-defineOptions({ name: "AttributesFilterComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Discover/Map/Filter/Funnel.vue b/src/components/Discover/Map/Filter/FunnelFilter.vue
similarity index 99%
rename from src/components/Discover/Map/Filter/Funnel.vue
rename to src/components/Discover/Map/Filter/FunnelFilter.vue
index 88feb15..5a03d65 100644
--- a/src/components/Discover/Map/Filter/Funnel.vue
+++ b/src/components/Discover/Map/Filter/FunnelFilter.vue
@@ -73,7 +73,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "FunnelFilterComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Discover/Map/Filter/Timeframes.vue b/src/components/Discover/Map/Filter/TimeframesFilter.vue
similarity index 99%
rename from src/components/Discover/Map/Filter/Timeframes.vue
rename to src/components/Discover/Map/Filter/TimeframesFilter.vue
index 73c4287..54fdf6f 100644
--- a/src/components/Discover/Map/Filter/Timeframes.vue
+++ b/src/components/Discover/Map/Filter/TimeframesFilter.vue
@@ -63,7 +63,6 @@
   </div>
 </template>
 <script setup>
-defineOptions({ name: "TimeframesFilterComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Discover/Map/Filter/Trace.vue b/src/components/Discover/Map/Filter/TraceFilter.vue
similarity index 99%
rename from src/components/Discover/Map/Filter/Trace.vue
rename to src/components/Discover/Map/Filter/TraceFilter.vue
index 907abf0..3aacaff 100644
--- a/src/components/Discover/Map/Filter/Trace.vue
+++ b/src/components/Discover/Map/Filter/TraceFilter.vue
@@ -121,7 +121,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "TraceFilterComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue
index 27ff4f1..c7a47cc 100644
--- a/src/components/Discover/Map/SidebarFilter.vue
+++ b/src/components/Discover/Map/SidebarFilter.vue
@@ -292,10 +292,10 @@ import { useAllMapDataStore } from "@/stores/allMapData";
 import ActOccCase from "@/components/Discover/Map/Filter/ActOccCase.vue";
 import ActOcc from "@/components/Discover/Map/Filter/ActOcc.vue";
 import ActAndSeq from "@/components/Discover/Map/Filter/ActAndSeq.vue";
-import Attributes from "@/components/Discover/Map/Filter/Attributes.vue";
-import Funnel from "@/components/Discover/Map/Filter/Funnel.vue";
-import Trace from "@/components/Discover/Map/Filter/Trace.vue";
-import Timeframes from "@/components/Discover/Map/Filter/Timeframes.vue";
+import Attributes from "@/components/Discover/Map/Filter/AttributesFilter.vue";
+import Funnel from "@/components/Discover/Map/Filter/FunnelFilter.vue";
+import Trace from "@/components/Discover/Map/Filter/TraceFilter.vue";
+import Timeframes from "@/components/Discover/Map/Filter/TimeframesFilter.vue";
 import emitter from "@/utils/emitter";
 import getMoment from "moment";
 
diff --git a/src/components/durationjs.vue b/src/components/DurationInput.vue
similarity index 99%
rename from src/components/durationjs.vue
rename to src/components/DurationInput.vue
index 188d88d..a246be9 100644
--- a/src/components/durationjs.vue
+++ b/src/components/DurationInput.vue
@@ -50,7 +50,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "DurationInputComponent" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/components/Loading.vue b/src/components/LoadingOverlay.vue
similarity index 82%
rename from src/components/Loading.vue
rename to src/components/LoadingOverlay.vue
index cad0f5e..aac611f 100644
--- a/src/components/Loading.vue
+++ b/src/components/LoadingOverlay.vue
@@ -9,7 +9,3 @@
     <span class="loader block"></span>
   </div>
 </template>
-
-<script setup>
-defineOptions({ name: "LoadingOverlayComponent" });
-</script>
diff --git a/src/components/Badge.vue b/src/components/StatusBadge.vue
similarity index 94%
rename from src/components/Badge.vue
rename to src/components/StatusBadge.vue
index 3e4a62d..7fa25dd 100644
--- a/src/components/Badge.vue
+++ b/src/components/StatusBadge.vue
@@ -13,7 +13,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "StatusBadgeComponent" });
 // The Lucia project.
 // Copyright 2024-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/router/index.ts b/src/router/index.ts
index c159bb1..d20ce00 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -12,17 +12,17 @@
 import { createRouter, createWebHistory } from "vue-router";
 import AuthContainer from "@/views/AuthContainer.vue";
 import MainContainer from "@/views/MainContainer.vue";
-import Login from "@/views/Login/Login.vue";
-import Files from "@/views/Files/Files.vue";
-import Upload from "@/views/Upload/index.vue";
-import Map from "@/views/Discover/Map/Map.vue";
-import Conformance from "@/views/Discover/Conformance/index.vue";
-import Performance from "@/views/Discover/Performance/index.vue";
-import CompareDashboard from "@/views/Compare/Dashboard/Compare.vue";
+import Login from "@/views/Login/LoginPage.vue";
+import Files from "@/views/Files/FilesPage.vue";
+import Upload from "@/views/Upload/UploadPage.vue";
+import Map from "@/views/Discover/Map/MapPage.vue";
+import Conformance from "@/views/Discover/Conformance/ConformancePage.vue";
+import Performance from "@/views/Discover/Performance/PerformancePage.vue";
+import CompareDashboard from "@/views/Compare/Dashboard/CompareDashboard.vue";
 import MapCompare from "@/views/Compare/MapCompare.vue";
 import AccountAdmin from "@/views/AccountManagement/AccountAdmin/AccountAdmin.vue";
 import MyAccount from "@/views/AccountManagement/MyAccount.vue";
-import MemberArea from "@/views/MemberArea/index.vue";
+import MemberArea from "@/views/MemberArea/MemberAreaPage.vue";
 import NotFound404 from "@/views/NotFound404.vue";
 
 const routes = [
diff --git a/src/views/AccountManagement/ModalAccountInfo.vue b/src/views/AccountManagement/ModalAccountInfo.vue
index a5c6025..7151a48 100644
--- a/src/views/AccountManagement/ModalAccountInfo.vue
+++ b/src/views/AccountManagement/ModalAccountInfo.vue
@@ -51,7 +51,7 @@ import { onBeforeMount, computed, ref } from "vue";
 import i18next from "@/i18n/i18n.js";
 import { useAcctMgmtStore } from "@/stores/acctMgmt";
 import ModalHeader from "./ModalHeader.vue";
-import Badge from "../../components/Badge.vue";
+import Badge from "../../components/StatusBadge.vue";
 
 const acctMgmtStore = useAcctMgmtStore();
 const visitTime = ref(0);
diff --git a/src/views/AccountManagement/MyAccount.vue b/src/views/AccountManagement/MyAccount.vue
index 78f6114..9019746 100644
--- a/src/views/AccountManagement/MyAccount.vue
+++ b/src/views/AccountManagement/MyAccount.vue
@@ -199,9 +199,9 @@ import { onMounted, computed, ref } from "vue";
 import i18next from "@/i18n/i18n.js";
 import { useLoginStore } from "@/stores/login";
 import { useAcctMgmtStore } from "@/stores/acctMgmt";
-import Badge from "../../components/Badge.vue";
+import Badge from "../../components/StatusBadge.vue";
 import { useLoadingStore } from "@/stores/loading";
-import Button from "@/components/Button.vue";
+import Button from "@/components/ActionButton.vue";
 import ButtonFilled from "@/components/ButtonFilled.vue";
 import { useToast } from "vue-toast-notification";
 import { PWD_VALID_LENGTH } from "@/constants/constants.js";
diff --git a/src/views/AuthContainer.vue b/src/views/AuthContainer.vue
index eaf3f62..fe679b2 100644
--- a/src/views/AuthContainer.vue
+++ b/src/views/AuthContainer.vue
@@ -20,6 +20,6 @@
  *   authentication-related pages with header and navbar.
  */
 
-import Header from "@/components/Header.vue";
-import Navbar from "@/components/Navbar.vue";
+import Header from "@/components/AppHeader.vue";
+import Navbar from "@/components/AppNavbar.vue";
 </script>
diff --git a/src/views/Compare/Dashboard/Compare.vue b/src/views/Compare/Dashboard/CompareDashboard.vue
similarity index 99%
rename from src/views/Compare/Dashboard/Compare.vue
rename to src/views/Compare/Dashboard/CompareDashboard.vue
index 75757ea..0d87a9a 100644
--- a/src/views/Compare/Dashboard/Compare.vue
+++ b/src/views/Compare/Dashboard/CompareDashboard.vue
@@ -262,7 +262,6 @@
   </main>
 </template>
 <script setup>
-defineOptions({ name: "CompareDashboardPage" });
 // The Lucia project.
 // Copyright 2024-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/views/Discover/Conformance/index.vue b/src/views/Discover/Conformance/ConformancePage.vue
similarity index 99%
rename from src/views/Discover/Conformance/index.vue
rename to src/views/Discover/Conformance/ConformancePage.vue
index ff1af59..413426c 100644
--- a/src/views/Discover/Conformance/index.vue
+++ b/src/views/Discover/Conformance/ConformancePage.vue
@@ -22,7 +22,6 @@
 import { useConformanceStore as useConformanceStoreInGuard } from "@/stores/conformance";
 
 export default {
-  name: "DiscoverConformancePage",
   async beforeRouteEnter(to, from, next) {
     const isCheckPage = to.name.includes("Check");
     if (isCheckPage) {
diff --git a/src/views/Discover/Map/Map.vue b/src/views/Discover/Map/MapPage.vue
similarity index 99%
rename from src/views/Discover/Map/Map.vue
rename to src/views/Discover/Map/MapPage.vue
index 4a57ef1..88da852 100644
--- a/src/views/Discover/Map/Map.vue
+++ b/src/views/Discover/Map/MapPage.vue
@@ -123,7 +123,6 @@
 import { useConformanceStore } from "@/stores/conformance";
 
 export default {
-  name: "DiscoverMapPage",
   async beforeRouteEnter(to, from, next) {
     const isCheckPage = to.name.includes("Check");
 
diff --git a/src/views/Discover/Performance/index.vue b/src/views/Discover/Performance/PerformancePage.vue
similarity index 99%
rename from src/views/Discover/Performance/index.vue
rename to src/views/Discover/Performance/PerformancePage.vue
index 12e4c76..9216dda 100644
--- a/src/views/Discover/Performance/index.vue
+++ b/src/views/Discover/Performance/PerformancePage.vue
@@ -249,7 +249,6 @@
 import { useConformanceStore } from "@/stores/conformance";
 
 export default {
-  name: "DiscoverPerformancePage",
   async beforeRouteEnter(to, from, next) {
     const isCheckPage = to.name.includes("Check");
 
diff --git a/src/views/Files/Files.vue b/src/views/Files/FilesPage.vue
similarity index 99%
rename from src/views/Files/Files.vue
rename to src/views/Files/FilesPage.vue
index d6e72a9..8b4a52b 100644
--- a/src/views/Files/Files.vue
+++ b/src/views/Files/FilesPage.vue
@@ -455,7 +455,6 @@
   </div>
 </template>
 <script setup>
-defineOptions({ name: "FilesPage" });
 // The Lucia project.
 // Copyright 2024-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/views/Login/Login.vue b/src/views/Login/LoginPage.vue
similarity index 99%
rename from src/views/Login/Login.vue
rename to src/views/Login/LoginPage.vue
index 1d01a76..9399fc6 100644
--- a/src/views/Login/Login.vue
+++ b/src/views/Login/LoginPage.vue
@@ -79,7 +79,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "LoginPage" });
 // The Lucia project.
 // Copyright 2024-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/views/MainContainer.vue b/src/views/MainContainer.vue
index a05b1e9..cd096e4 100644
--- a/src/views/MainContainer.vue
+++ b/src/views/MainContainer.vue
@@ -127,9 +127,9 @@ import { storeToRefs } from "pinia";
 import { useLoadingStore } from "@/stores/loading";
 import { useAllMapDataStore } from "@/stores/allMapData";
 import { useConformanceStore } from "@/stores/conformance";
-import Header from "@/components/Header.vue";
-import Navbar from "@/components/Navbar.vue";
-import Loading from "@/components/Loading.vue";
+import Header from "@/components/AppHeader.vue";
+import Navbar from "@/components/AppNavbar.vue";
+import Loading from "@/components/LoadingOverlay.vue";
 import { leaveFilter, leaveConformance } from "@/module/alertModal.js";
 import { usePageAdminStore } from "@/stores/pageAdmin";
 import { useLoginStore } from "@/stores/login";
diff --git a/src/views/MemberArea/index.vue b/src/views/MemberArea/MemberAreaPage.vue
similarity index 95%
rename from src/views/MemberArea/index.vue
rename to src/views/MemberArea/MemberAreaPage.vue
index b3a0395..3961a5c 100644
--- a/src/views/MemberArea/index.vue
+++ b/src/views/MemberArea/MemberAreaPage.vue
@@ -11,7 +11,6 @@
 </template>
 
 <script setup>
-defineOptions({ name: "MemberAreaPage" });
 // The Lucia project.
 // Copyright 2023-2026 DSP, inc.  All rights reserved.
 // Authors:
diff --git a/src/views/NotFound404.vue b/src/views/NotFound404.vue
index aef0142..d2eb84b 100644
--- a/src/views/NotFound404.vue
+++ b/src/views/NotFound404.vue
@@ -27,6 +27,6 @@
  *   found, with a link back to the Files page.
  */
 
-import Header from "@/components/Header.vue";
-import Navbar from "@/components/Navbar.vue";
+import Header from "@/components/AppHeader.vue";
+import Navbar from "@/components/AppNavbar.vue";
 </script>
diff --git a/src/views/Upload/index.vue b/src/views/Upload/UploadPage.vue
similarity index 99%
rename from src/views/Upload/index.vue
rename to src/views/Upload/UploadPage.vue
index b7a239c..6a41c33 100644
--- a/src/views/Upload/index.vue
+++ b/src/views/Upload/UploadPage.vue
@@ -155,7 +155,6 @@
 import { useFilesStore } from "@/stores/files";
 
 export default {
-  name: "UploadPage",
   beforeRouteEnter(to, from, next) {
     // An uploadID is required to enter this page
     next((vm) => {
diff --git a/tests/components/Badge.test.js b/tests/components/Badge.test.js
index 17cabf4..11dbcf8 100644
--- a/tests/components/Badge.test.js
+++ b/tests/components/Badge.test.js
@@ -5,7 +5,7 @@
 
 import { describe, it, expect } from "vitest";
 import { mount } from "@vue/test-utils";
-import Badge from "@/components/Badge.vue";
+import Badge from "@/components/StatusBadge.vue";
 
 describe("Badge", () => {
   it("renders display text", () => {
diff --git a/tests/components/Button.test.js b/tests/components/Button.test.js
index 6802717..2611c6a 100644
--- a/tests/components/Button.test.js
+++ b/tests/components/Button.test.js
@@ -5,7 +5,7 @@
 
 import { describe, it, expect } from "vitest";
 import { mount } from "@vue/test-utils";
-import Button from "@/components/Button.vue";
+import Button from "@/components/ActionButton.vue";
 
 describe("Button", () => {
   it("renders button text", () => {
diff --git a/tests/components/Loading.test.js b/tests/components/Loading.test.js
index cf376e3..23eba8e 100644
--- a/tests/components/Loading.test.js
+++ b/tests/components/Loading.test.js
@@ -5,7 +5,7 @@
 
 import { describe, it, expect } from "vitest";
 import { mount } from "@vue/test-utils";
-import Loading from "@/components/Loading.vue";
+import Loading from "@/components/LoadingOverlay.vue";
 
 describe("Loading", () => {
   it("renders a loader element", () => {
diff --git a/tests/components/Login.test.js b/tests/components/Login.test.js
index c0d0d44..101a246 100644
--- a/tests/components/Login.test.js
+++ b/tests/components/Login.test.js
@@ -19,7 +19,7 @@ vi.mock("vue-router", () => ({
   useRoute: () => mockRoute,
 }));
 
-import Login from "@/views/Login/Login.vue";
+import Login from "@/views/Login/LoginPage.vue";
 import { useLoginStore } from "@/stores/login";
 
 describe("Login", () => {
diff --git a/tests/components/Search.test.js b/tests/components/Search.test.js
index 4ed743e..58d805e 100644
--- a/tests/components/Search.test.js
+++ b/tests/components/Search.test.js
@@ -5,7 +5,7 @@
 
 import { describe, it, expect } from "vitest";
 import { mount } from "@vue/test-utils";
-import Search from "@/components/Search.vue";
+import Search from "@/components/ActivitySearch.vue";
 
 describe("Search", () => {
   it("renders search form", () => {