diff --git a/src/components/not-found.jsx b/src/components/NotFound.jsx
similarity index 100%
rename from src/components/not-found.jsx
rename to src/components/NotFound.jsx
diff --git a/src/components/dashboard/first/index.jsx b/src/components/dashboard/first/index.jsx
index ee4f80a..3d1c29e 100644
--- a/src/components/dashboard/first/index.jsx
+++ b/src/components/dashboard/first/index.jsx
@@ -1,7 +1,7 @@
 import DashboardLayouts from "@/layouts/dashboardLayouts";
 
-const DashboardFirstComponent = () => {
+const FirstComponent = () => {
     return <DashboardLayouts></DashboardLayouts>;
 };
 
-export default DashboardFirstComponent;
+export default FirstComponent;
diff --git a/src/components/dashboard/loan-follow-up/index.jsx b/src/components/dashboard/loan-follow-up/index.jsx
index 5284cb4..cda243c 100644
--- a/src/components/dashboard/loan-follow-up/index.jsx
+++ b/src/components/dashboard/loan-follow-up/index.jsx
@@ -48,7 +48,7 @@ const data = [
     },
 ];
 
-const DashboardLoanFollowUpComponent = () => {
+const LoanFollowUpComponent = () => {
     const t = useTranslations();
     const {token} = useUser();
 
@@ -120,4 +120,4 @@ const DashboardLoanFollowUpComponent = () => {
     );
 };
 
-export default DashboardLoanFollowUpComponent;
+export default LoanFollowUpComponent;
diff --git a/src/components/dashboard/loan-request/NavyForm.jsx b/src/components/dashboard/loan-request/NavyForm.jsx
index 81ea7e4..99e0d57 100644
--- a/src/components/dashboard/loan-request/NavyForm.jsx
+++ b/src/components/dashboard/loan-request/NavyForm.jsx
@@ -13,7 +13,7 @@ import {useTranslations} from "next-intl";
 import {useEffect, useState} from "react";
 import * as Yup from "yup";
 
-const NavyForm = () => {
+const NavyFormComponent = () => {
     const t = useTranslations();
     const {directionApp} = useDirection();
     const {token} = useUser();
@@ -486,4 +486,4 @@ const NavyForm = () => {
     );
 };
 
-export default NavyForm;
+export default NavyFormComponent;
diff --git a/src/components/dashboard/loan-request/WelfareServicesForm.jsx b/src/components/dashboard/loan-request/WelfareServicesForm.jsx
index 19a4501..a3462e2 100644
--- a/src/components/dashboard/loan-request/WelfareServicesForm.jsx
+++ b/src/components/dashboard/loan-request/WelfareServicesForm.jsx
@@ -12,7 +12,7 @@ import {useTranslations} from "next-intl";
 import {useState} from "react";
 import * as Yup from "yup";
 
-const WelfareServicesForm = () => {
+const WelfareServicesFormComponent = () => {
     const t = useTranslations();
     const {directionApp} = useDirection();
     const {token} = useUser();
@@ -433,4 +433,4 @@ const WelfareServicesForm = () => {
     );
 };
 
-export default WelfareServicesForm;
+export default WelfareServicesFormComponent;
diff --git a/src/components/dashboard/loan-request/index.jsx b/src/components/dashboard/loan-request/index.jsx
index 630642a..a02af7a 100644
--- a/src/components/dashboard/loan-request/index.jsx
+++ b/src/components/dashboard/loan-request/index.jsx
@@ -1,12 +1,12 @@
 import CenterLayout from "@/layouts/CenterLayout";
 import DashboardLayouts from "@/layouts/dashboardLayouts";
 import useUser from "@/lib/app/hooks/useUser";
-import NavyForm from "./NavyForm";
-import WelfareServicesForm from "./WelfareServicesForm";
+import NavyFormComponent from "./NavyForm";
+import WelfareServicesFormComponent from "./WelfareServicesForm";
 import {Box, Chip, Divider} from "@mui/material";
 import {useTranslations} from "next-intl";
 
-const DashboardLoanRequestComponent = () => {
+const LoanRequestComponent = () => {
     const t = useTranslations();
     const {user} = useUser();
 
@@ -22,10 +22,10 @@ const DashboardLoanRequestComponent = () => {
                         />
                     </Divider>
                 </Box>
-                {user.type_id == 1 ? <NavyForm/> : <WelfareServicesForm/>}
+                {user.type_id == 1 ? <NavyFormComponent/> : <WelfareServicesFormComponent/>}
             </CenterLayout>
         </DashboardLayouts>
     );
 };
 
-export default DashboardLoanRequestComponent;
+export default LoanRequestComponent;
diff --git a/src/components/first/index.jsx b/src/components/first/index.jsx
index 67f6284..f12e115 100644
--- a/src/components/first/index.jsx
+++ b/src/components/first/index.jsx
@@ -1,4 +1,4 @@
-import dahsboardImage from "&/images/dashboard.svg";
+import dashboardImage from "&/images/dashboard.svg";
 import {NextLinkComposed} from "@/core/components/LinkRouting";
 import StyledImage from "@/core/components/StyledImage";
 import CenterLayout from "@/layouts/CenterLayout";
@@ -15,7 +15,7 @@ const FirstComponent = () => {
         <FullPageLayout sx={{p: 1}}>
             <CenterLayout spacing={3}>
                 <StyledImage
-                    src={dahsboardImage}
+                    src={dashboardImage}
                     alt={t("app_name")}
                     width={300}
                     height={200}
diff --git a/src/components/login/SendToken.jsx b/src/components/login/SendToken.jsx
index 8699aa4..158bd65 100644
--- a/src/components/login/SendToken.jsx
+++ b/src/components/login/SendToken.jsx
@@ -15,13 +15,13 @@ import {useTranslations} from "next-intl";
 import Image from "next/image";
 import * as Yup from "yup";
 
-const SendToken = ({
-                       PhoneNumber,
-                       setOtpToken,
-                       timer,
-                       setTimer,
-                       initialTimerValue,
-                   }) => {
+const SendTokenComponent = ({
+                                PhoneNumber,
+                                setOtpToken,
+                                timer,
+                                setTimer,
+                                initialTimerValue,
+                            }) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
     const {setToken} = useUser();
@@ -155,4 +155,4 @@ const SendToken = ({
     );
 };
 
-export default SendToken;
+export default SendTokenComponent;
diff --git a/src/components/login/SendUserData.jsx b/src/components/login/SendUserData.jsx
index 93d0593..57b5872 100644
--- a/src/components/login/SendUserData.jsx
+++ b/src/components/login/SendUserData.jsx
@@ -15,13 +15,13 @@ import Image from "next/image";
 import {useSearchParams} from "next/navigation";
 import * as Yup from "yup";
 
-const SendUserData = ({
-                          setOtpToken,
-                          setPhoneNumber,
-                          PhoneNumber,
-                          setTimer,
-                          initialTimerValue,
-                      }) => {
+const SendUserDataComponent = ({
+                                   setOtpToken,
+                                   setPhoneNumber,
+                                   PhoneNumber,
+                                   setTimer,
+                                   initialTimerValue,
+                               }) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
 
@@ -161,4 +161,4 @@ const SendUserData = ({
     );
 };
 
-export default SendUserData;
+export default SendUserDataComponent;
diff --git a/src/components/login/index.jsx b/src/components/login/index.jsx
index 1d90474..deaa2cc 100644
--- a/src/components/login/index.jsx
+++ b/src/components/login/index.jsx
@@ -1,6 +1,6 @@
 import {useState} from "react";
-import SendToken from "./SendToken";
-import SendUserData from "./SendUserData";
+import SendTokenComponent from "./SendToken";
+import SendUserDataComponent from "./SendUserData";
 
 const LoginComponent = () => {
     const [otpToken, setOtpToken] = useState(false);
@@ -13,7 +13,7 @@ const LoginComponent = () => {
 
     if (!otpToken) {
         return (
-            <SendUserData
+            <SendUserDataComponent
                 setOtpToken={setOtpToken}
                 setPhoneNumber={setPhoneNumber}
                 PhoneNumber={PhoneNumber}
@@ -23,7 +23,7 @@ const LoginComponent = () => {
         );
     } else {
         return (
-            <SendToken
+            <SendTokenComponent
                 PhoneNumber={PhoneNumber}
                 setOtpToken={setOtpToken}
                 timer={timer}
diff --git a/src/components/register/RequestOtp.jsx b/src/components/register/RequestOtp.jsx
index b0a78ed..37d8460 100644
--- a/src/components/register/RequestOtp.jsx
+++ b/src/components/register/RequestOtp.jsx
@@ -14,13 +14,13 @@ import Image from "next/image";
 import {useSearchParams} from "next/navigation";
 import * as Yup from "yup";
 
-const RequestOtp = ({
-                        setOtpToken,
-                        setPhoneNumber,
-                        PhoneNumber,
-                        setTimer,
-                        initialTimerValue,
-                    }) => {
+const RequestOtpComponent = ({
+                                 setOtpToken,
+                                 setPhoneNumber,
+                                 PhoneNumber,
+                                 setTimer,
+                                 initialTimerValue,
+                             }) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
 
@@ -140,4 +140,4 @@ const RequestOtp = ({
     );
 };
 
-export default RequestOtp;
+export default RequestOtpComponent;
diff --git a/src/components/register/navy/UserRegister.jsx b/src/components/register/navy/UserRegister.jsx
index bb5ad6d..9d4da4d 100644
--- a/src/components/register/navy/UserRegister.jsx
+++ b/src/components/register/navy/UserRegister.jsx
@@ -15,13 +15,13 @@ import * as Yup from "yup";
 import ResendToken from "@/core/components/ResendToken";
 import useUser from "@/lib/app/hooks/useUser";
 
-const UserRegister = ({
-                          PhoneNumber,
-                          setOtpToken,
-                          initialTimerValue,
-                          timer,
-                          setTimer,
-                      }) => {
+const UserRegisterComponent = ({
+                                   PhoneNumber,
+                                   setOtpToken,
+                                   initialTimerValue,
+                                   timer,
+                                   setTimer,
+                               }) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
     const {setToken} = useUser();
@@ -209,4 +209,4 @@ const UserRegister = ({
     );
 };
 
-export default UserRegister;
+export default UserRegisterComponent;
diff --git a/src/components/register/navy/index.jsx b/src/components/register/navy/index.jsx
index 68a6069..9296f78 100644
--- a/src/components/register/navy/index.jsx
+++ b/src/components/register/navy/index.jsx
@@ -1,6 +1,6 @@
 import {useState} from "react";
-import RequestOtp from "../RequestOtp";
-import UserRegister from "./UserRegister";
+import RequestOtpComponent from "../RequestOtp";
+import UserRegisterComponent from "./UserRegister";
 
 const NavyComponent = () => {
     const [otpToken, setOtpToken] = useState(false);
@@ -13,7 +13,7 @@ const NavyComponent = () => {
 
     if (!otpToken) {
         return (
-            <RequestOtp
+            <RequestOtpComponent
                 setOtpToken={setOtpToken}
                 PhoneNumber={PhoneNumber}
                 setPhoneNumber={setPhoneNumber}
@@ -23,7 +23,7 @@ const NavyComponent = () => {
         );
     } else {
         return (
-            <UserRegister
+            <UserRegisterComponent
                 PhoneNumber={PhoneNumber}
                 setOtpToken={setOtpToken}
                 timer={timer}
diff --git a/src/components/register/welfare-services/UserRegister.jsx b/src/components/register/welfare-services/UserRegister.jsx
index c83e3ba..50c80a0 100644
--- a/src/components/register/welfare-services/UserRegister.jsx
+++ b/src/components/register/welfare-services/UserRegister.jsx
@@ -15,13 +15,13 @@ import * as Yup from "yup";
 import ResendToken from "@/core/components/ResendToken";
 import useUser from "@/lib/app/hooks/useUser";
 
-const UserRegister = ({
-                          PhoneNumber,
-                          setOtpToken,
-                          initialTimerValue,
-                          timer,
-                          setTimer,
-                      }) => {
+const UserRegisterComponent = ({
+                                   PhoneNumber,
+                                   setOtpToken,
+                                   initialTimerValue,
+                                   timer,
+                                   setTimer,
+                               }) => {
     const t = useTranslations();
     const {directionApp} = useDirection();
     const {setToken} = useUser();
@@ -185,4 +185,4 @@ const UserRegister = ({
     );
 };
 
-export default UserRegister;
+export default UserRegisterComponent;
diff --git a/src/components/register/welfare-services/index.jsx b/src/components/register/welfare-services/index.jsx
index 68a6069..322490f 100644
--- a/src/components/register/welfare-services/index.jsx
+++ b/src/components/register/welfare-services/index.jsx
@@ -1,8 +1,8 @@
 import {useState} from "react";
-import RequestOtp from "../RequestOtp";
-import UserRegister from "./UserRegister";
+import RequestOtpComponent from "../RequestOtp";
+import UserRegisterComponent from "./UserRegister";
 
-const NavyComponent = () => {
+const WelfareServicesComponent = () => {
     const [otpToken, setOtpToken] = useState(false);
     const [PhoneNumber, setPhoneNumber] = useState("");
 
@@ -13,7 +13,7 @@ const NavyComponent = () => {
 
     if (!otpToken) {
         return (
-            <RequestOtp
+            <RequestOtpComponent
                 setOtpToken={setOtpToken}
                 PhoneNumber={PhoneNumber}
                 setPhoneNumber={setPhoneNumber}
@@ -23,7 +23,7 @@ const NavyComponent = () => {
         );
     } else {
         return (
-            <UserRegister
+            <UserRegisterComponent
                 PhoneNumber={PhoneNumber}
                 setOtpToken={setOtpToken}
                 timer={timer}
@@ -34,4 +34,4 @@ const NavyComponent = () => {
     }
 };
 
-export default NavyComponent;
+export default WelfareServicesComponent;
diff --git a/src/core/components/isBotHandler.jsx b/src/core/components/NoSsrHandler.jsx
similarity index 100%
rename from src/core/components/isBotHandler.jsx
rename to src/core/components/NoSsrHandler.jsx
diff --git a/src/layouts/MuiLayout.jsx b/src/layouts/MuiLayout.jsx
index 2614ac2..26f3e4a 100644
--- a/src/layouts/MuiLayout.jsx
+++ b/src/layouts/MuiLayout.jsx
@@ -1,4 +1,4 @@
-import NoSsrHandler from "@/core/components/isBotHandler";
+import NoSsrHandler from "@/core/components/NoSsrHandler";
 import {createEmotionCacheRtl} from "@/core/utils/createEmotionCache";
 import themeRtl from "@/core/utils/theme-rtl";
 import {CacheProvider} from "@emotion/react";
diff --git a/src/pages/404.jsx b/src/pages/404.jsx
index af810b6..36eba21 100644
--- a/src/pages/404.jsx
+++ b/src/pages/404.jsx
@@ -1,4 +1,4 @@
-import NotFoundComponent from "@/components/not-found";
+import NotFoundComponent from "@/components/NotFound";
 import Head from "next/head";
 
 export default function NotFound() {
diff --git a/src/pages/dashboard/index.jsx b/src/pages/dashboard/index.jsx
index af824d5..02c438a 100644
--- a/src/pages/dashboard/index.jsx
+++ b/src/pages/dashboard/index.jsx
@@ -1,11 +1,11 @@
-import DashboardFirstComponent from "@/components/dashboard/first";
+import FirstComponent from "@/components/dashboard/first";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
 
 export default function Dashboard() {
     return (
         <WithAuthMiddleware>
-            <DashboardFirstComponent/>
+            <FirstComponent/>
         </WithAuthMiddleware>
     );
 }
diff --git a/src/pages/dashboard/loan-follow-up/index.jsx b/src/pages/dashboard/loan-follow-up/index.jsx
index 1fbea74..dcc1290 100644
--- a/src/pages/dashboard/loan-follow-up/index.jsx
+++ b/src/pages/dashboard/loan-follow-up/index.jsx
@@ -1,11 +1,11 @@
-import DashboardLoanFollowUpComponent from "@/components/dashboard/loan-follow-up";
+import LoanFollowUpComponent from "@/components/dashboard/loan-follow-up";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
 
 export default function LoanFollowUp() {
     return (
         <WithAuthMiddleware>
-            <DashboardLoanFollowUpComponent/>
+            <LoanFollowUpComponent/>
         </WithAuthMiddleware>
     );
 }
diff --git a/src/pages/dashboard/loan-request/index.jsx b/src/pages/dashboard/loan-request/index.jsx
index 8519fca..2566815 100644
--- a/src/pages/dashboard/loan-request/index.jsx
+++ b/src/pages/dashboard/loan-request/index.jsx
@@ -1,11 +1,11 @@
-import DashboardLoanRequestComponent from "@/components/dashboard/loan-request";
+import LoanRequestComponent from "@/components/dashboard/loan-request";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
 
 export default function LoanRequest() {
     return (
         <WithAuthMiddleware>
-            <DashboardLoanRequestComponent/>
+            <LoanRequestComponent/>
         </WithAuthMiddleware>
     );
 }