diff --git a/.env.production b/.env.production
index 2036fea..b332e4d 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,3 @@
 API_URL=http://localhost:8090/api
 NEXTAUTH_SECRET=secret
-NEXTAUTH_URL=https://tsms-uat.2fi-solutions.com
\ No newline at end of file
+NEXTAUTH_URL=https://fpsms-uat.2fi-solutions.com
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8b6a27a..9cc9553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,8 +37,8 @@ next-env.d.ts
 
 .vscode
 
-#tsms.zip
-tsms.zip
+#fpsms.zip
+fpsms.zip
 
 # PWA files
 **/public/sw.js
diff --git a/package-lock.json b/package-lock.json
index b243cb6..c4ae051 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "tsms",
+  "name": "fpsms",
   "version": "0.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "tsms",
+      "name": "fpsms",
       "version": "0.1.0",
       "dependencies": {
         "@emotion/cache": "^11.11.0",
diff --git a/package.json b/package.json
index c8eea49..7780a2b 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "tsms",
+  "name": "fpsms",
   "version": "0.1.0",
   "private": true,
   "scripts": {
diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx
deleted file mode 100644
index 5f3d40b..0000000
--- a/src/app/(main)/dashboard/page.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Metadata } from "next";
-import { I18nProvider } from "@/i18n";
-import DashboardPage from "@/components/DashboardPage/DashboardPage";
-import DashboardPageButton from "@/components/DashboardPage/DashboardTabButton";
-import ProgressByClientSearch from "@/components/ProgressByClientSearch";
-import { Suspense } from "react";
-import Tabs, { TabsProps } from "@mui/material/Tabs";
-import Tab from "@mui/material/Tab";
-
-export const metadata: Metadata = {
-  title: "Dashboard",
-};
-
-const Dashboard: React.FC = () => {
-  return <div>test</div>;
-};
-
-export default Dashboard;
diff --git a/src/app/(main)/dashboard/CompanyTeamCashFlow/page.tsx b/src/app/(main)/home/CompanyTeamCashFlow/page.tsx
similarity index 100%
rename from src/app/(main)/dashboard/CompanyTeamCashFlow/page.tsx
rename to src/app/(main)/home/CompanyTeamCashFlow/page.tsx
diff --git a/src/app/(main)/dashboard/ProjectCashFlow/page.tsx b/src/app/(main)/home/ProjectCashFlow/page.tsx
similarity index 100%
rename from src/app/(main)/dashboard/ProjectCashFlow/page.tsx
rename to src/app/(main)/home/ProjectCashFlow/page.tsx
diff --git a/src/app/(main)/dashboard/ProjectFinancialSummary/page.tsx b/src/app/(main)/home/ProjectFinancialSummary/page.tsx
similarity index 100%
rename from src/app/(main)/dashboard/ProjectFinancialSummary/page.tsx
rename to src/app/(main)/home/ProjectFinancialSummary/page.tsx
diff --git a/src/app/(main)/dashboard/ProjectStatusByClient/page.tsx b/src/app/(main)/home/ProjectStatusByClient/page.tsx
similarity index 100%
rename from src/app/(main)/dashboard/ProjectStatusByClient/page.tsx
rename to src/app/(main)/home/ProjectStatusByClient/page.tsx
diff --git a/src/app/(main)/dashboard/StaffUtilization/page.tsx b/src/app/(main)/home/StaffUtilization/page.tsx
similarity index 100%
rename from src/app/(main)/dashboard/StaffUtilization/page.tsx
rename to src/app/(main)/home/StaffUtilization/page.tsx
diff --git a/src/app/(main)/home/page.tsx b/src/app/(main)/home/page.tsx
index a710195..5f3d40b 100644
--- a/src/app/(main)/home/page.tsx
+++ b/src/app/(main)/home/page.tsx
@@ -1,17 +1,18 @@
 import { Metadata } from "next";
 import { I18nProvider } from "@/i18n";
-import UserWorkspacePage from "@/components/UserWorkspacePage/UserWorkspacePage";
+import DashboardPage from "@/components/DashboardPage/DashboardPage";
+import DashboardPageButton from "@/components/DashboardPage/DashboardTabButton";
+import ProgressByClientSearch from "@/components/ProgressByClientSearch";
+import { Suspense } from "react";
+import Tabs, { TabsProps } from "@mui/material/Tabs";
+import Tab from "@mui/material/Tab";
 
 export const metadata: Metadata = {
-  title: "User Workspace",
+  title: "Dashboard",
 };
 
-const Home: React.FC = async () => {
-  return (
-    <I18nProvider namespaces={["home"]}>
-      <UserWorkspacePage />
-    </I18nProvider>
-  );
+const Dashboard: React.FC = () => {
+  return <div>test</div>;
 };
 
-export default Home;
+export default Dashboard;
diff --git a/src/app/(main)/homeX/page.tsx b/src/app/(main)/homeX/page.tsx
new file mode 100644
index 0000000..a710195
--- /dev/null
+++ b/src/app/(main)/homeX/page.tsx
@@ -0,0 +1,17 @@
+import { Metadata } from "next";
+import { I18nProvider } from "@/i18n";
+import UserWorkspacePage from "@/components/UserWorkspacePage/UserWorkspacePage";
+
+export const metadata: Metadata = {
+  title: "User Workspace",
+};
+
+const Home: React.FC = async () => {
+  return (
+    <I18nProvider namespaces={["home"]}>
+      <UserWorkspacePage />
+    </I18nProvider>
+  );
+};
+
+export default Home;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 43b60c1..54a5fa9 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,8 +3,8 @@ import { detectLanguage } from "@/i18n";
 import ThemeRegistry from "@/theme/ThemeRegistry";
 
 export const metadata: Metadata = {
-  title: "TSMS",
-  description: "TSMS - Timesheet Management System",
+  title: "FPSMS",
+  description: "FPSMS - Timesheet Management System",
 };
 
 export default async function RootLayout({
diff --git a/src/app/manifest.ts b/src/app/manifest.ts
index a0f6048..69f94eb 100644
--- a/src/app/manifest.ts
+++ b/src/app/manifest.ts
@@ -2,8 +2,8 @@ import { MetadataRoute } from "next";
 
 export default function manifest(): MetadataRoute.Manifest {
   return {
-    name: "TSMS",
-    short_name: "TSMS",
+    name: "FPSMS",
+    short_name: "FPSMS",
     description: "Timesheet Management System",
     start_url: "/",
     scope: "/",
diff --git a/src/components/NavigationContent/NavigationContent.tsx b/src/components/NavigationContent/NavigationContent.tsx
index 1c5b640..769baa8 100644
--- a/src/components/NavigationContent/NavigationContent.tsx
+++ b/src/components/NavigationContent/NavigationContent.tsx
@@ -32,7 +32,7 @@ interface NavigationItem {
 }
 
 const navigationItems: NavigationItem[] = [
-  { icon: <WorkHistory />, label: "User Workspace", path: "/home" },
+  // { icon: <WorkHistory />, label: "User Workspace", path: "/home" },
   {
     icon: <Dashboard />,
     label: "Dashboard",
diff --git a/src/theme/colorConst.js b/src/theme/colorConst.js
index 0db2053..3c56813 100644
--- a/src/theme/colorConst.js
+++ b/src/theme/colorConst.js
@@ -151,7 +151,7 @@ export const TAB_THEME = {
 };
 
 // copy from MTMS
-export const TSMS_BUTTON_THEME = createTheme({
+export const FPSMS_BUTTON_THEME = createTheme({
   palette: {
     primary: {
       main: "#92C1E9",
@@ -342,7 +342,7 @@ export const ARS_BUTTON_THEME = createTheme({
 });
 
 //from ARS
-export const TSMS_LONG_BUTTON_THEME = createTheme({
+export const FPSMS_LONG_BUTTON_THEME = createTheme({
   palette: {
     create: {
       main: "#57B962",
diff --git a/zip_project.ps1 b/zip_project.ps1
index 07cff92..03bbb3b 100644
--- a/zip_project.ps1
+++ b/zip_project.ps1
@@ -1,7 +1,7 @@
 $sourcePath = Get-Location
-$destination = Join-Path -Path $sourcePath -ChildPath "tsms.zip"
+$destination = Join-Path -Path $sourcePath -ChildPath "fpsms.zip"
 
-$exclude = @(".git", ".next", ".vscode", "node_modules", ".gitignore", "zip_project.ps1", "tsms.zip")
+$exclude = @(".git", ".next", ".vscode", "node_modules", ".gitignore", "zip_project.ps1", "fpsms.zip")
 
 $files = Get-ChildItem -Path $sourcePath -Exclude $exclude