diff --git a/src/components/Navbar.vue b/src/components/NavBar.vue
similarity index 100%
rename from src/components/Navbar.vue
rename to src/components/NavBar.vue
diff --git a/src/components/Paginate.vue b/src/components/PaginateData.vue
similarity index 100%
rename from src/components/Paginate.vue
rename to src/components/PaginateData.vue
diff --git a/src/components/__tests__/Paginate.spec.js b/src/components/__tests__/Paginate.spec.js
index 729e3041d..5dce8f621 100644
--- a/src/components/__tests__/Paginate.spec.js
+++ b/src/components/__tests__/Paginate.spec.js
@@ -1,6 +1,6 @@
 import { jest, describe, expect, it, beforeAll } from '@jest/globals';
 import { createWrapper, axios } from 'app/tests/jest/jestHelpers';
-import Paginate from '../Paginate.vue';
+import Paginate from '../PaginateData.vue';
 
 const mockPush = jest.fn();
 
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 2b944116e..a28f6e1d7 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useQuasar } from 'quasar';
-import Navbar from 'components/Navbar.vue';
+import Navbar from 'src/components/NavBar.vue';
 
 const quasar = useQuasar();
 </script>
diff --git a/src/pages/Claim/Card/ClaimRma.vue b/src/pages/Claim/Card/ClaimRma.vue
index 12d1d1ae5..8461eb6bd 100644
--- a/src/pages/Claim/Card/ClaimRma.vue
+++ b/src/pages/Claim/Card/ClaimRma.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import Paginate from 'components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 import FetchData from 'components/FetchData.vue';
 import TeleportSlot from 'components/ui/TeleportSlot';
 import { toDate } from 'src/filters';
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 29ec4adb4..9ab22117e 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-import Paginate from 'components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 import { toDate } from 'src/filters/index';
 import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
 import CustomerDescriptorPopover from 'src/pages/Customer/Card/CustomerDescriptorPopover.vue';
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index df1e4cf69..367169dc4 100644
--- a/src/pages/Claim/ClaimRmaList.vue
+++ b/src/pages/Claim/ClaimRmaList.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
-import Paginate from 'components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 6e9054a28..c4d54a355 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-import Paginate from 'components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue';
 
 const router = useRouter();
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/DashboardMain.vue
similarity index 98%
rename from src/pages/Dashboard/Dashboard.vue
rename to src/pages/Dashboard/DashboardMain.vue
index 107e3fd3b..f2aab4398 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -24,6 +24,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
     </q-drawer>
     <q-page-container>
         <q-page class="q-pa-md">
+            {{ $q.version }}
             <div class="row items-start wrap q-col-gutter-md q-mb-lg">
                 <div class="col-12 col-md" v-if="pinnedModules.length">
                     <div class="text-h6 text-grey-8 q-mb-sm">{{ t('globals.pinnedModules') }}</div>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index f5eebd2a3..8421cf915 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-import Paginate from 'src/components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 import InvoiceOutSummaryDialog from './Card/InvoiceOutSummaryDialog.vue';
 import { toDate, toCurrency } from 'src/filters/index';
 
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/LoginMain.vue
similarity index 100%
rename from src/pages/Login/Login.vue
rename to src/pages/Login/LoginMain.vue
diff --git a/src/pages/Login/__tests__/Login.spec.js b/src/pages/Login/__tests__/Login.spec.js
index ee5ef237b..f6a22be8c 100644
--- a/src/pages/Login/__tests__/Login.spec.js
+++ b/src/pages/Login/__tests__/Login.spec.js
@@ -1,6 +1,6 @@
 import { jest, describe, expect, it, beforeAll } from '@jest/globals';
 import { createWrapper, axios } from 'app/tests/jest/jestHelpers';
-import Login from '../Login.vue';
+import Login from '../LoginMain.vue';
 
 const mockPush = jest.fn();
 
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 212a4f359..d93a1bc95 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
-import Paginate from 'components/Paginate.vue';
+import Paginate from 'src/components/PaginateData.vue';
 import { toDate, toCurrency } from 'src/filters/index';
 import TicketSummaryDialog from './Card/TicketSummaryDialog.vue';
 
diff --git a/src/router/routes.js b/src/router/routes.js
index 8fc355e64..a50f3efeb 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,7 +8,7 @@ const routes = [
         path: '/login',
         name: 'Login',
         meta: { title: 'logIn' },
-        component: () => import('../pages/Login/Login.vue')
+        component: () => import('../pages/Login/LoginMain.vue')
     },
     {
         path: '/',
@@ -20,7 +20,7 @@ const routes = [
                 path: '/dashboard',
                 name: 'Dashboard',
                 meta: { title: 'dashboard', icon: 'dashboard' },
-                component: () => import('../pages/Dashboard/Dashboard.vue'),
+                component: () => import('../pages/Dashboard/DashboardMain.vue'),
             },
             // Module routes
             customer,