feat: removed last bit of workspace in frontend. Fatality!

2026-10-21 00:17:46 +00:00 · 2025-09-16 00:08:41 +05:30
parent 37a80fa1ac
commit ac80242749
356 changed files with 1788 additions and 1890 deletions
@@ -13,7 +13,7 @@ import {
  Select,
  SelectItem
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  useCreatePkiAlert,
  useGetPkiAlertById,
@@ -60,15 +60,15 @@ type Props = {
 };

 export const PkiAlertModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data: alert } = useGetPkiAlertById(
    (popUp?.pkiAlert?.data as { alertId: string })?.alertId || ""
  );

  const { data: pkiCollections } = useListWorkspacePkiCollections({
-    workspaceId: projectId
+    projectId
  });

  const { mutateAsync: createPkiAlert } = useCreatePkiAlert();
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiAlert } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";

@@ -12,8 +12,8 @@ import { PkiAlertModal } from "./PkiAlertModal";
 import { PkiAlertsTable } from "./PkiAlertsTable";

 export const PkiAlertsSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
  const { mutateAsync: deletePkiAlert } = useDeletePkiAlert();

  const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
@@ -10,7 +10,7 @@ import {
  THead,
  Tr
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useListWorkspacePkiAlerts } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";

@@ -24,11 +24,11 @@ type Props = {
 };

 export const PkiAlertsTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data, isPending } = useListWorkspacePkiAlerts({
-    workspaceId: projectId
+    projectId
  });

  return (
@@ -6,7 +6,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  useCreatePkiCollection,
  useGetPkiCollectionById,
@@ -28,8 +28,8 @@ type Props = {

 export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data: pkiCollection } = useGetPkiCollectionById(
    (popUp?.pkiCollection?.data as { collectionId: string })?.collectionId || ""
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiCollection } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";

@@ -12,8 +12,8 @@ import { PkiCollectionModal } from "./PkiCollectionModal";
 import { PkiCollectionTable } from "./PkiCollectionTable";

 export const PkiCollectionSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
  const { mutateAsync: deletePkiCollection } = useDeletePkiCollection();

  const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
@@ -19,7 +19,7 @@ import {
  THead,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useListWorkspacePkiCollections } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";

@@ -32,11 +32,11 @@ type Props = {

 export const PkiCollectionTable = ({ handlePopUpOpen }: Props) => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data, isPending } = useListWorkspacePkiCollections({
-    workspaceId: projectId
+    projectId
  });

  return (
@@ -15,7 +15,7 @@ import {
  Tooltip
 } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaType, useDeleteCa, useGetCa } from "@app/hooks/api";
 import { TInternalCertificateAuthority } from "@app/hooks/api/ca/types";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -30,7 +30,7 @@ import {
 } from "./components";

 const Page = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const navigate = useNavigate();
  const params = useParams({
    from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id
@@ -38,11 +38,11 @@ const Page = () => {
  const { caName } = params as { caName: string };
  const { data } = useGetCa({
    caName,
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
    type: CaType.INTERNAL
  }) as { data: TInternalCertificateAuthority };

-  const projectId = currentWorkspace?.id || "";
+  const projectId = currentProject?.id || "";

  const { mutateAsync: deleteCa } = useDeleteCa();

@@ -55,11 +55,11 @@ const Page = () => {

  const onRemoveCaSubmit = async () => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      await deleteCa({
        caName,
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        type: CaType.INTERNAL
      });

@@ -4,7 +4,7 @@ import { format } from "date-fns";

 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, IconButton, Tooltip } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import { CaStatus, CaType, InternalCaType, useGetCa } from "@app/hooks/api";
 import { caStatusToNameMap, caTypeToNameMap } from "@app/hooks/api/ca/constants";
@@ -21,7 +21,7 @@ type Props = {
 };

 export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const [copyTextId, isCopyingId, setCopyTextId] = useTimedReset<string>({
    initialState: "Copy ID to clipboard"
  });
@@ -31,7 +31,7 @@ export const CaDetailsSection = ({ caName, handlePopUpOpen }: Props) => {

  const { data } = useGetCa({
    caName,
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
    type: CaType.INTERNAL
  });

@@ -13,7 +13,7 @@ import {
  Select,
  SelectItem
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaRenewalType,
  useRenewCa
@@ -45,8 +45,8 @@ type Props = {
 };

 export const CaRenewalModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectSlug = currentWorkspace?.slug || "";
+  const { currentProject } = useProject();
+  const projectSlug = currentProject?.slug || "";

  const popUpData = popUp?.renewCa?.data as {
    caId: string;
@@ -8,7 +8,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, IconButton, TextArea, Tooltip } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import { useGetCaCsr, useImportCaCertificate } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -26,7 +26,7 @@ type Props = {
 };

 export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const [copyTextCaCsr, isCopyingCaCsr, setCopyTextCaCsr] = useTimedReset<string>({
    initialState: "Copy to clipboard"
  });
@@ -41,7 +41,7 @@ export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
  });

  const { data: csr } = useGetCaCsr(caId);
-  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentWorkspace.id);
+  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentProject.id);

  useEffect(() => {
    reset();
@@ -49,11 +49,11 @@ export const ExternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {

  const onFormSubmit = async ({ certificate, certificateChain }: FormData) => {
    try {
-      if (!csr || !caId || !currentWorkspace?.slug) return;
+      if (!csr || !caId || !currentProject?.slug) return;

      await importCaCertificate({
        caId,
-        projectSlug: currentWorkspace?.slug,
+        projectSlug: currentProject?.slug,
        certificate,
        certificateChain
      });
@@ -6,7 +6,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaStatus,
  useGetCaById,
@@ -46,16 +46,16 @@ type Props = {
 };

 export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject.id,
    status: CaStatus.ACTIVE
  });
  const { data: ca } = useGetCaById(caId);
  const { data: csr } = useGetCaCsr(caId);

  const { mutateAsync: signIntermediate } = useSignIntermediate();
-  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentWorkspace.id);
+  const { mutateAsync: importCaCertificate } = useImportCaCertificate(currentProject.id);

  const {
    control,
@@ -102,7 +102,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {

  const onFormSubmit = async ({ notAfter, maxPathLength }: FormData) => {
    try {
-      if (!csr || !caId || !currentWorkspace?.slug) return;
+      if (!csr || !caId || !currentProject?.slug) return;

      const { certificate, certificateChain } = await signIntermediate({
        caId: parentCaId,
@@ -114,7 +114,7 @@ export const InternalCaInstallForm = ({ caId, handlePopUpToggle }: Props) => {

      await importCaCertificate({
        caId,
-        projectSlug: currentWorkspace?.slug,
+        projectSlug: currentProject?.slug,
        certificate,
        certificateChain
      });
@@ -16,7 +16,7 @@ import {
  Switch
  // DatePicker
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaStatus,
  CaType,
@@ -84,10 +84,10 @@ const caTypes = [
 ];

 export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data: ca } = useGetCa({
    caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
    type: CaType.INTERNAL
  });

@@ -178,13 +178,13 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
    configuration
  }: FormData) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      if (ca) {
        // update
        await updateMutateAsync({
          caName: ca.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          name,
          type: CaType.INTERNAL,
          status,
@@ -193,7 +193,7 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
      } else {
        // create
        await createMutateAsync({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          name,
          type,
          status,
@@ -5,7 +5,7 @@ import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useDeleteCa, useUpdateCa } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";

@@ -15,7 +15,7 @@ import { CaModal } from "./CaModal";
 import { CaTable } from "./CaTable";

 export const CaSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { mutateAsync: deleteCa } = useDeleteCa();
  const { mutateAsync: updateCa } = useUpdateCa();

@@ -30,9 +30,9 @@ export const CaSection = () => {

  const onRemoveCaSubmit = async (caName: string) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

-      await deleteCa({ caName, projectId: currentWorkspace.id, type: CaType.INTERNAL });
+      await deleteCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL });

      createNotification({
        text: "Successfully deleted CA",
@@ -50,9 +50,9 @@ export const CaSection = () => {

  const onUpdateCaStatus = async ({ caName, status }: { caName: string; status: CaStatus }) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

-      await updateCa({ caName, projectId: currentWorkspace.id, type: CaType.INTERNAL, status });
+      await updateCa({ caName, projectId: currentProject.id, type: CaType.INTERNAL, status });

      createNotification({
        text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
@@ -22,7 +22,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useListCasByTypeAndProjectId } from "@app/hooks/api";
 import {
  caStatusToNameMap,
@@ -49,8 +49,8 @@ type Props = {

 export const CaTable = ({ handlePopUpOpen }: Props) => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentWorkspace.id);
+  const { currentProject } = useProject();
+  const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentProject.id);
  const cas = data as TInternalCertificateAuthority[];

  return (
@@ -80,7 +80,7 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
                      navigate({
                        to: "/projects/cert-management/$projectId/ca/$caName",
                        params: {
-                          projectId: currentWorkspace.id,
+                          projectId: currentProject.id,
                          caName: ca.name
                        }
                      })
@@ -16,7 +16,7 @@ import {
  SelectItem,
  Switch
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { APP_CONNECTION_MAP } from "@app/helpers/appConnections";
 import {
  TAvailableAppConnection,
@@ -127,11 +127,11 @@ const caTypes = [
 ];

 export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { data: ca, isLoading: isCaLoading } = useGetCa({
    caName: (popUp?.ca?.data as { name: string })?.name || "",
-    projectId: currentWorkspace?.id || "",
+    projectId: currentProject?.id || "",
    type: (popUp?.ca?.data as { type: CaType })?.type || ""
  });

@@ -297,7 +297,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
    configuration: formConfiguration
  }: FormData) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      let configPayload: any;

@@ -321,7 +321,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
      if (ca) {
        await updateMutateAsync({
          caName: ca.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          name,
          type,
          status,
@@ -330,7 +330,7 @@ export const ExternalCaModal = ({ popUp, handlePopUpToggle }: Props) => {
        });
      } else {
        await createMutateAsync({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          name,
          type,
          status,
@@ -5,7 +5,7 @@ import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Button, DeleteActionModal } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useDeleteCa, useUpdateCa } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";

@@ -13,7 +13,7 @@ import { ExternalCaModal } from "./ExternalCaModal";
 import { ExternalCaTable } from "./ExternalCaTable";

 export const ExternalCaSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { mutateAsync: deleteCa } = useDeleteCa();
  const { mutateAsync: updateCa } = useUpdateCa();

@@ -26,9 +26,9 @@ export const ExternalCaSection = () => {

  const onRemoveCaSubmit = async (caName: string, type: CaType) => {
    try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;

-      await deleteCa({ caName, type, projectId: currentWorkspace.id });
+      await deleteCa({ caName, type, projectId: currentProject.id });

      createNotification({
        text: "Successfully deleted CA",
@@ -54,9 +54,9 @@ export const ExternalCaSection = () => {
    status: CaStatus;
  }) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

-      await updateCa({ caName: name, type, status, projectId: currentWorkspace.id });
+      await updateCa({ caName: name, type, status, projectId: currentProject.id });

      createNotification({
        text: `Successfully ${status === CaStatus.ACTIVE ? "enabled" : "disabled"} CA`,
@@ -26,7 +26,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { CaStatus, CaType, useListExternalCasByProjectId } from "@app/hooks/api";
 import { caStatusToNameMap, getCaStatusBadgeVariant } from "@app/hooks/api/ca/constants";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -44,8 +44,8 @@ type Props = {
 };

 export const ExternalCaTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListExternalCasByProjectId(currentWorkspace.id);
+  const { currentProject } = useProject();
+  const { data, isPending } = useListExternalCasByProjectId(currentProject.id);

  return (
    <div>
@@ -14,7 +14,7 @@ import {
  SelectItem,
  TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useGetCert, useImportCertificate, useListWorkspacePkiCollections } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";

@@ -48,13 +48,13 @@ type TCertificateDetails = {

 export const CertificateImportModal = ({ popUp, handlePopUpToggle }: Props) => {
  const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data: cert } = useGetCert(
    (popUp?.certificateImport?.data as { serialNumber: string })?.serialNumber || ""
  );

  const { data } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
  });

  const { mutateAsync: importCertificate } = useImportCertificate();
@@ -76,10 +76,10 @@ export const CertificateImportModal = ({ popUp, handlePopUpToggle }: Props) => {
    collectionId
  }: FormData) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      const { serialNumber, certificate, certificateChain, privateKey } = await importCertificate({
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,

        certificatePem,
        privateKeyPem,
@@ -22,7 +22,7 @@ import {
  SelectItem,
  Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaStatus,
  useCreateCertificate,
@@ -89,22 +89,22 @@ const CERT_TEMPLATE_NONE_VALUE = "none";

 export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
  const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data: cert } = useGetCert(
    (popUp?.certificate?.data as { serialNumber: string })?.serialNumber || ""
  );

  const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject.id,
    status: CaStatus.ACTIVE
  });

  const { data } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
  });

  const { data: templatesData } = useListWorkspaceCertificateTemplates({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
  });

  const { mutateAsync: createCertificate } = useCreateCertificate();
@@ -191,12 +191,12 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
    extendedKeyUsages
  }: FormData) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      const { serialNumber, certificate, certificateChain, privateKey } = await createCertificate({
        caId: !selectedCertTemplate ? caId : undefined,
        certificateTemplateId: selectedCertTemplate ? selectedCertTemplateId : undefined,
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,
        pkiCollectionId: collectionId,
        friendlyName,
        commonName,
@@ -4,7 +4,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useRevokeCert } from "@app/hooks/api";
 import { crlReasons } from "@app/hooks/api/certificates/constants";
 import { CrlReason } from "@app/hooks/api/certificates/enums";
@@ -35,7 +35,7 @@ type Props = {
 };

 export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { mutateAsync: revokeCertificate } = useRevokeCert();

  const {
@@ -49,12 +49,12 @@ export const CertificateRevocationModal = ({ popUp, handlePopUpToggle }: Props)

  const onFormSubmit = async ({ revocationReason }: FormData) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      const { serialNumber } = popUp.revokeCertificate.data as { serialNumber: string };

      await revokeCertificate({
-        projectSlug: currentWorkspace.slug,
+        projectSlug: currentProject.slug,
        serialNumber,
        revocationReason
      });
@@ -22,7 +22,7 @@ import {
  SelectItem,
  Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaStatus,
  useCreateCertTemplate,
@@ -82,7 +82,7 @@ type Props = {
 };

 export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { data: ca } = useGetCaById(caId);

@@ -91,12 +91,12 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
  );

  const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug ?? "",
+    projectId: currentProject?.id,
    status: CaStatus.ACTIVE
  });

  const { data: collectionsData } = useListWorkspacePkiCollections({
-    workspaceId: currentWorkspace?.id || ""
+    projectId: currentProject?.id || ""
  });

  const { mutateAsync: createCertTemplate } = useCreateCertTemplate();
@@ -155,7 +155,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
    keyUsages,
    extendedKeyUsages
  }: FormData) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
      return;
    }

@@ -163,7 +163,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
      if (certTemplate) {
        await updateCertTemplate({
          id: certTemplate.id,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          pkiCollectionId: collectionId,
          caId,
          name,
@@ -184,7 +184,7 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
        });
      } else {
        await createCertTemplate({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          pkiCollectionId: collectionId,
          caId,
          name,
@@ -12,7 +12,7 @@ import { DeleteActionModal, IconButton } from "@app/components/v2";
 import {
  ProjectPermissionPkiTemplateActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplate } from "@app/hooks/api";
@@ -33,18 +33,18 @@ export const CertificateTemplatesSection = ({ caId }: Props) => {
    "upgradePlan"
  ] as const);

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { mutateAsync: deleteCertTemplate } = useDeleteCertTemplate();

  const onRemoveCertificateTemplateSubmit = async (id: string) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
      return;
    }

    try {
      await deleteCertTemplate({
        id,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
      });

      createNotification({
@@ -7,7 +7,7 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
  ProjectPermissionCertificateActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeleteCert } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -19,7 +19,7 @@ import { CertificateRevocationModal } from "./CertificateRevocationModal";
 import { CertificatesTable } from "./CertificatesTable";

 export const CertificatesSection = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { mutateAsync: deleteCert } = useDeleteCert();

  const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
@@ -32,9 +32,9 @@ export const CertificatesSection = () => {

  const onRemoveCertificateSubmit = async (serialNumber: string) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

-      await deleteCert({ serialNumber, projectSlug: currentWorkspace.slug });
+      await deleteCert({ serialNumber, projectSlug: currentProject.slug });

      createNotification({
        text: "Successfully deleted certificate",
@@ -33,7 +33,7 @@ import {
 import {
  ProjectPermissionCertificateActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useListWorkspaceCertificates } from "@app/hooks/api";
 import { caSupportsCapability } from "@app/hooks/api/ca/constants";
@@ -62,15 +62,15 @@ export const CertificatesTable = ({ handlePopUpOpen }: Props) => {
  const [page, setPage] = useState(1);
  const [perPage, setPerPage] = useState(PER_PAGE_INIT);

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data, isPending } = useListWorkspaceCertificates({
-    projectId: currentWorkspace?.slug ?? "",
+    projectId: currentProject?.slug ?? "",
    offset: (page - 1) * perPage,
    limit: perPage
  });

  // Fetch CA data to determine capabilities
-  const { data: caData } = useListCasByProjectId(currentWorkspace?.id ?? "");
+  const { data: caData } = useListCasByProjectId(currentProject?.id ?? "");

  // Create mapping from caId to CA type for capability checking
  const caCapabilityMap = useMemo(() => {
@@ -16,7 +16,7 @@ import {
  Tooltip
 } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { useDeletePkiCollection, useGetPkiCollectionById } from "@app/hooks/api";
 import { PkiItemType } from "@app/hooks/api/pkiCollections/constants";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -30,8 +30,8 @@ export const PkiCollectionPage = () => {
    from: ROUTE_PATHS.CertManager.PkiCollectionDetailsByIDPage.id
  });
  const collectionId = params.collectionId as string;
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data } = useGetPkiCollectionById(collectionId);
  const { mutateAsync: deletePkiCollection } = useDeletePkiCollection();
@@ -4,7 +4,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaStatus,
  useAddItemToPkiCollection,
@@ -41,15 +41,15 @@ export const AddPkiCollectionItemModal = ({
  popUp,
  handlePopUpToggle
 }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { data: cas } = useListWorkspaceCas({
-    projectSlug: currentWorkspace?.slug || "",
+    projectId: currentProject?.id || "",
    status: CaStatus.ACTIVE
  });

  const { data } = useListWorkspaceCertificates({
-    projectId: currentWorkspace?.slug || "",
+    projectId: currentProject?.slug || "",
    offset: 0,
    limit: 25
  });
@@ -19,7 +19,7 @@ import { ROUTE_PATHS } from "@app/const/routes";
 import {
  ProjectPermissionPkiSubscriberActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeletePkiSubscriber, useGetPkiSubscriber } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -29,8 +29,8 @@ import { PkiSubscriberCertificatesSection, PkiSubscriberDetailsSection } from ".

 const Page = () => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const subscriberName = useParams({
    from: ROUTE_PATHS.CertManager.PkiSubscriberDetailsByIDPage.id,
    select: (el) => el.subscriberName
@@ -28,7 +28,7 @@ import {
  ProjectPermissionPkiSubscriberActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetPkiSubscriberCertificates } from "@app/hooks/api";
 import { caSupportsCapability } from "@app/hooks/api/ca/constants";
@@ -45,8 +45,8 @@ type Props = {
 const PER_PAGE_INIT = 25;

 export const PkiSubscriberCertificatesTable = ({ subscriberName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const { permission } = useProjectPermission();
  const [page, setPage] = useState(1);
  const [perPage, setPerPage] = useState(PER_PAGE_INIT);
@@ -64,7 +64,7 @@ export const PkiSubscriberCertificatesTable = ({ subscriberName, handlePopUpOpen
  );

  // Fetch CA data to determine capabilities
-  const { data: caData } = useListCasByProjectId(currentWorkspace.id);
+  const { data: caData } = useListCasByProjectId(currentProject.id);

  // Create mapping from caId to CA type for capability checking
  const caCapabilityMap = useMemo(() => {
@@ -17,7 +17,7 @@ import {
  ProjectPermissionPkiSubscriberActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useTimedReset } from "@app/hooks";
 import {
@@ -44,8 +44,8 @@ type TCertificateDetails = {
 };

 export const PkiSubscriberDetailsSection = ({ subscriberName, handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const { permission } = useProjectPermission();
  const [certificateDetails, setCertificateDetails] = useState<TCertificateDetails | null>(null);
  const [isModalOpen, setIsModalOpen] = useState(false);
@@ -22,7 +22,7 @@ import {
  TabPanel,
  Tabs
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  CaType,
  useCreatePkiSubscriber,
@@ -158,8 +158,8 @@ const schema = z
 export type FormData = z.infer<typeof schema>;

 export const PkiSubscriberModal = ({ popUp, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const { data: subscribers } = useListWorkspacePkiSubscribers(projectId);
  const { data: cas } = useListCasByProjectId(projectId);
  const [tabValue, setTabValue] = useState<FormTab>(FormTab.Configuration);
@@ -7,7 +7,7 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import {
  ProjectPermissionPkiSubscriberActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeletePkiSubscriber, useUpdatePkiSubscriber } from "@app/hooks/api";
 import { PkiSubscriberStatus } from "@app/hooks/api/pkiSubscriber/types";
@@ -17,8 +17,8 @@ import { PkiSubscriberModal } from "./PkiSubscriberModal";
 import { PkiSubscribersTable } from "./PkiSubscribersTable";

 export const PkiSubscriberSection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const { mutateAsync: deletePkiSubscriber } = useDeletePkiSubscriber();
  const { mutateAsync: updatePkiSubscriber } = useUpdatePkiSubscriber();

@@ -55,7 +55,7 @@ export const PkiSubscriberSection = () => {
    status: PkiSubscriberStatus;
  }) => {
    try {
-      if (!currentWorkspace?.slug) return;
+      if (!currentProject?.slug) return;

      await updatePkiSubscriber({ subscriberName, projectId, status });

@@ -30,7 +30,7 @@ import {
 import {
  ProjectPermissionPkiSubscriberActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useListWorkspacePkiSubscribers } from "@app/hooks/api";
 import {
@@ -49,8 +49,8 @@ type Props = {

 export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useListWorkspacePkiSubscribers(currentWorkspace?.id || "");
+  const { currentProject } = useProject();
+  const { data, isPending } = useListWorkspacePkiSubscribers(currentProject?.id || "");
  return (
    <div>
      <TableContainer>
@@ -77,7 +77,7 @@ export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
                      navigate({
                        to: "/projects/cert-management/$projectId/subscribers/$subscriberName",
                        params: {
-                          projectId: currentWorkspace.id,
+                          projectId: currentProject.id,
                          subscriberName: subscriber.name
                        }
                      })
@@ -43,7 +43,7 @@ import {
  ProjectPermissionPkiTemplateActions,
  ProjectPermissionSub,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteCertTemplateV2 } from "@app/hooks/api";
@@ -55,7 +55,7 @@ import { PkiTemplateForm } from "./components/PkiTemplateForm";
 const PER_PAGE_INIT = 25;
 export const PkiTemplateListPage = () => {
  const { t } = useTranslation();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const [page, setPage] = useState(1);
  const [perPage, setPerPage] = useState(PER_PAGE_INIT);
  const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -68,7 +68,7 @@ export const PkiTemplateListPage = () => {
  const { subscription } = useSubscription();

  const { data, isPending } = useListCertificateTemplates({
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
    offset: (page - 1) * perPage,
    limit: perPage
  });
@@ -78,7 +78,7 @@ export const PkiTemplateListPage = () => {
  const onRemovePkiSubscriberSubmit = async () => {
    try {
      const pkiTemplate = await deleteCertTemplate.mutateAsync({
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        templateName: popUp?.deleteTemplate?.data?.name
      });

@@ -18,7 +18,7 @@ import {
  Input,
  Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  useCreateCertTemplateV2,
  useListCasByProjectId,
@@ -72,9 +72,9 @@ type Props = {
 };

 export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

-  const { data: cas, isPending: isCaLoading } = useListCasByProjectId(currentWorkspace.id);
+  const { data: cas, isPending: isCaLoading } = useListCasByProjectId(currentProject.id);

  const { mutateAsync: createCertTemplate } = useCreateCertTemplateV2();
  const { mutateAsync: updateCertTemplate } = useUpdateCertTemplateV2();
@@ -124,7 +124,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
    extendedKeyUsages,
    ca
  }: FormData) => {
-    if (!currentWorkspace?.id) {
+    if (!currentProject?.id) {
      return;
    }

@@ -132,7 +132,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
      if (certTemplate) {
        await updateCertTemplate({
          templateName: certTemplate.name,
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          caName: ca.name,
          name,
          commonName,
@@ -152,7 +152,7 @@ export const PkiTemplateForm = ({ certTemplate, handlePopUpToggle }: Props) => {
        });
      } else {
        await createCertTemplate({
-          projectId: currentWorkspace.id,
+          projectId: currentProject.id,
          caName: ca.name,
          name,
          commonName,
@@ -1,9 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";

 import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
+import { projectKeys } from "@app/hooks/api";
 import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
+import { fetchProjectById } from "@app/hooks/api/projects/queries";
 import { PkiManagerLayout } from "@app/layouts/PkiManagerLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";

@@ -13,15 +13,15 @@ export const Route = createFileRoute(
  component: PkiManagerLayout,
  beforeLoad: async ({ params, context }) => {
    const project = await context.queryClient.ensureQueryData({
-      queryKey: workspaceKeys.getWorkspaceById(params.projectId),
-      queryFn: () => fetchWorkspaceById(params.projectId)
+      queryKey: projectKeys.getProjectById(params.projectId),
+      queryFn: () => fetchProjectById(params.projectId)
    });

    await context.queryClient.ensureQueryData({
      queryKey: roleQueryKeys.getUserProjectPermissions({
-        workspaceId: params.projectId
+        projectId: params.projectId
      }),
-      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
+      queryFn: () => fetchUserProjectPermissions({ projectId: params.projectId })
    });

    return {
@@ -13,7 +13,7 @@ import {
  ModalContent,
  TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useCreateKmipClient, useUpdateKmipClient } from "@app/hooks/api/kmip";
 import { KmipPermission, TKmipClient } from "@app/hooks/api/kmip/types";

@@ -60,8 +60,8 @@ type FormProps = Pick<Props, "kmipClient"> & {
 const KmipClientForm = ({ onComplete, kmipClient }: FormProps) => {
  const createKmipClient = useCreateKmipClient();
  const updateKmipClient = useUpdateKmipClient();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const isUpdate = !!kmipClient;

  const {
@@ -41,7 +41,7 @@ import {
  ProjectPermissionSub,
  useProjectPermission,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import {
  getUserTablePreference,
@@ -59,9 +59,9 @@ import { KmipClientCertificateModal } from "./KmipClientCertificateModal";
 import { KmipClientModal } from "./KmipClientModal";

 export const KmipClientTable = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

-  const projectId = currentWorkspace?.id ?? "";
+  const projectId = currentProject?.id ?? "";

  const {
    offset,
@@ -14,7 +14,7 @@ import {
  SelectItem,
  TextArea
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { keyUsageDefaultOption, kmsKeyUsageOptions } from "@app/helpers/kms";
 import {
  AllowedEncryptionKeyAlgorithms,
@@ -49,8 +49,8 @@ type FormProps = Pick<Props, "cmek"> & {
 const CmekForm = ({ onComplete, cmek }: FormProps) => {
  const createCmek = useCreateCmek();
  const updateCmek = useUpdateCmek();
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace.id;
+  const { currentProject } = useProject();
+  const projectId = currentProject.id;
  const isUpdate = !!cmek;

  const {
@@ -50,7 +50,7 @@ import {
  ProjectPermissionCmekActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { kmsKeyUsageOptions } from "@app/helpers/kms";
 import {
@@ -87,10 +87,10 @@ const getStatusBadgeProps = (
 };

 export const CmekTable = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { permission } = useProjectPermission();

-  const projectId = currentWorkspace?.id ?? "";
+  const projectId = currentProject?.id ?? "";

  const {
    offset,
@@ -1,9 +1,9 @@
 import { createFileRoute } from "@tanstack/react-router";

 import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
+import { projectKeys } from "@app/hooks/api";
 import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
+import { fetchProjectById } from "@app/hooks/api/projects/queries";
 import { KmsLayout } from "@app/layouts/KmsLayout";
 import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";

@@ -13,15 +13,15 @@ export const Route = createFileRoute(
  component: KmsLayout,
  beforeLoad: async ({ params, context }) => {
    const project = await context.queryClient.ensureQueryData({
-      queryKey: workspaceKeys.getWorkspaceById(params.projectId),
-      queryFn: () => fetchWorkspaceById(params.projectId)
+      queryKey: projectKeys.getProjectById(params.projectId),
+      queryFn: () => fetchProjectById(params.projectId)
    });

    await context.queryClient.ensureQueryData({
      queryKey: roleQueryKeys.getUserProjectPermissions({
-        workspaceId: params.projectId
+        projectId: params.projectId
      }),
-      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
+      queryFn: () => fetchUserProjectPermissions({ projectId: params.projectId })
    });

    return {
@@ -21,10 +21,10 @@ import {
  useAddUsersToOrg,
  useFetchServerStatus,
  useGetOrgRoles,
-  useGetUserWorkspaces
+  useGetUserProjects
 } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectType, ProjectVersion } from "@app/hooks/api/workspace/types";
+import { ProjectType, ProjectVersion } from "@app/hooks/api/projects/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";

 import { OrgInviteLink } from "./OrgInviteLink";
@@ -76,7 +76,7 @@ export const AddOrgMemberModal = ({
  const { data: organizationRoles } = useGetOrgRoles(currentOrg?.id ?? "");
  const { data: serverDetails } = useFetchServerStatus();
  const { mutateAsync: addUsersMutateAsync } = useAddUsersToOrg();
-  const { data: projects, isPending: isProjectsLoading } = useGetUserWorkspaces({
+  const { data: projects, isPending: isProjectsLoading } = useGetUserProjects({
    includeRoles: true
  });

@@ -21,7 +21,7 @@ import {
  SelectItem
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import {
  eventToNameMap,
  secretEvents,
@@ -29,7 +29,7 @@ import {
 } from "@app/hooks/api/auditLogs/constants";
 import { EventType } from "@app/hooks/api/auditLogs/enums";
 import { UserAgentType } from "@app/hooks/api/auth/types";
-import { Project } from "@app/hooks/api/workspace/types";
+import { Project } from "@app/hooks/api/projects/types";

 import { LogFilterItem } from "./LogFilterItem";
 import { auditLogFilterFormSchema, Presets, TAuditLogFilterFormData } from "./types";
@@ -72,7 +72,7 @@ const getActiveFilterCount = (filter: TAuditLogFilterFormData) => {
 };

 export const LogsFilter = ({ presets, setFilter, filter, project }: Props) => {
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();
  const { currentOrg } = useOrganization();

  const workspacesInOrg = workspaces.filter((ws) => ws.orgId === currentOrg?.id);
@@ -13,7 +13,7 @@ import {
 } from "@app/context";
 import { Timezone } from "@app/helpers/datetime";
 import { withPermission, withProjectPermission } from "@app/hoc";
-import { Project } from "@app/hooks/api/workspace/types";
+import { Project } from "@app/hooks/api/projects/types";
 import { usePopUp } from "@app/hooks/usePopUp";

 import { LogsDateFilter } from "./LogsDateFilter";
@@ -1,7 +1,7 @@
 import { z } from "zod";

 import { ActorType, EventType, UserAgentType } from "@app/hooks/api/auditLogs/enums";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 export enum AuditLogDateFilterType {
  Relative = "relative",
@@ -17,7 +17,7 @@ import {
  useAddIdentityToWorkspace,
  useGetIdentityProjectMemberships,
  useGetProjectRoles,
-  useGetUserWorkspaces,
+  useGetUserProjects,
  useGetWorkspaceById
 } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -44,7 +44,7 @@ type Props = {

 const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
  const { currentOrg } = useOrganization();
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();
  const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace();

  const {
@@ -77,7 +77,7 @@ const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
  const onFormSubmit = async ({ project: selectedProject, role }: FormData) => {
    try {
      await addIdentityToWorkspace({
-        workspaceId: selectedProject.id,
+        projectId: selectedProject.id,
        identityId,
        role: role.slug || undefined
      });
@@ -8,7 +8,7 @@ import { createNotification } from "@app/components/notifications";
 import { IconButton, Td, Tooltip, Tr } from "@app/components/v2";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import { IdentityMembership } from "@app/hooks/api/identities/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";

@@ -31,7 +31,7 @@ export const IdentityProjectRow = ({
  membership: { id, createdAt, identity, project, roles },
  handlePopUpOpen
 }: Props) => {
-  const { data: workspaces } = useGetUserWorkspaces();
+  const { data: workspaces } = useGetUserProjects();
  const navigate = useNavigate();

  const isAccessible = useMemo(() => {
@@ -25,7 +25,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => {
    try {
      await deleteMutateAsync({
        identityId: id,
-        workspaceId: projectId
+        projectId: projectId
      });

      createNotification({
@@ -48,7 +48,7 @@ import {
  useRequestProjectAccess,
  useSearchProjects
 } from "@app/hooks/api";
-import { ProjectType, Project, WorkspaceEnv } from "@app/hooks/api/workspace/types";
+import { ProjectType, Project, ProjectEnv } from "@app/hooks/api/projects/types";
 import {
  ProjectListToggle,
  ProjectListView
@@ -155,7 +155,7 @@ export const AllProjectView = ({
  const handleAccessProject = async (
    type: ProjectType,
    projectId: string,
-    environments: WorkspaceEnv[]
+    environments: ProjectEnv[]
  ) => {
    try {
      await orgAdminAccessProject.mutateAsync({
@@ -39,11 +39,11 @@ import {
  setUserTablePreference
 } from "@app/helpers/userTablePreferences";
 import { usePagination, useResetPageHelper } from "@app/hooks";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
 import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
 import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
-import { ProjectType, Project } from "@app/hooks/api/workspace/types";
+import { ProjectType, Project } from "@app/hooks/api/projects/types";
 import {
  ProjectListToggle,
  ProjectListView
@@ -79,7 +79,7 @@ export const MyProjectView = ({
    {}
  );

-  const { data: workspaces = [], isPending: isWorkspaceLoading } = useGetUserWorkspaces();
+  const { data: workspaces = [], isPending: isWorkspaceLoading } = useGetUserProjects();
  const {
    setPage,
    perPage,
@@ -8,7 +8,7 @@ import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
 import { getProjectTitle } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
 import { TProjectTemplate, useDeleteProjectTemplate } from "@app/hooks/api/projectTemplates";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 import { ProjectTemplateDetailsModal } from "../../ProjectTemplateDetailsModal";
 import { ProjectTemplateEnvironmentsForm } from "./ProjectTemplateEnvironmentsForm";
@@ -20,7 +20,7 @@ import {
  useCreateProjectTemplate,
  useUpdateProjectTemplate
 } from "@app/hooks/api/projectTemplates";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 import { slugSchema } from "@app/lib/schemas";

 const formSchema = z.object({
@@ -9,9 +9,9 @@ import { useOrganization } from "@app/context";
 import {
  useAddUserToWsNonE2EE,
  useGetOrgMembershipProjectMemberships,
-  useGetUserWorkspaces
+  useGetUserProjects
 } from "@app/hooks/api";
-import { ProjectVersion } from "@app/hooks/api/workspace/types";
+import { ProjectVersion } from "@app/hooks/api/projects/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";

 const schema = z
@@ -34,7 +34,7 @@ type Props = {
 const UserAddToProjectModalChild = ({ membershipId, popUp, handlePopUpToggle }: Props) => {
  const { currentOrg } = useOrganization();
  const orgId = currentOrg?.id || "";
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();

  const { mutateAsync: addUserToWorkspaceNonE2EE } = useAddUserToWsNonE2EE();

@@ -7,7 +7,7 @@ import { createNotification } from "@app/components/notifications";
 import { IconButton, Td, Tooltip, Tr } from "@app/components/v2";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
-import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useGetUserProjects } from "@app/hooks/api";
 import { TWorkspaceUser } from "@app/hooks/api/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 import { OrgAccessControlTabSections } from "@app/types/org";
@@ -24,7 +24,7 @@ export const UserProjectRow = ({
  membership: { id, project, user, roles },
  handlePopUpOpen
 }: Props) => {
-  const { data: workspaces = [] } = useGetUserWorkspaces();
+  const { data: workspaces = [] } = useGetUserProjects();
  const navigate = useNavigate();

  const isAccessible = useMemo(() => {
@@ -32,7 +32,7 @@ export const UserProjectsSection = ({ membershipId }: Props) => {

  const handleRemoveUser = async (projectId: string, username: string) => {
    try {
-      await removeUserFromWorkspace({ workspaceId: projectId, usernames: [username], orgId });
+      await removeUserFromWorkspace({ projectId, usernames: [username], orgId });
      createNotification({
        text: "Successfully removed user from project",
        type: "success"
@@ -3,9 +3,9 @@ import { useTranslation } from "react-i18next";
 import { useNavigate, useSearch } from "@tanstack/react-router";

 import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 import { ProjectAccessControlTabs } from "@app/types/project";

 import {
@@ -18,7 +18,7 @@ import {

 const Page = () => {
  const navigate = useNavigate();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const selectedTab = useSearch({
    strict: false,
    select: (el) => el.selectedTab
@@ -26,15 +26,15 @@ const Page = () => {

  const updateSelectedTab = (tab: string) => {
    navigate({
-      to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
+      to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
      search: (prev) => ({ ...prev, selectedTab: tab }),
      params: {
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
      }
    });
  };

-  const isSecretManager = currentWorkspace.type === ProjectType.SecretManager;
+  const isSecretManager = currentProject.type === ProjectType.SecretManager;

  return (
    <div className="container mx-auto flex flex-col justify-between bg-bunker-800 text-white">
@@ -6,7 +6,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FilterableSelect, FormControl, Modal, ModalContent } from "@app/components/v2";
-import { useOrganization, useWorkspace } from "@app/context";
+import { useOrganization, useProject } from "@app/context";
 import {
  useAddGroupToWorkspace,
  useGetOrganizationGroups,
@@ -31,14 +31,14 @@ type Props = {

 const Content = ({ popUp, handlePopUpToggle }: Props) => {
  const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const orgId = currentOrg?.id || "";

  const { data: groups } = useGetOrganizationGroups(orgId);
-  const { data: groupMemberships } = useListWorkspaceGroups(currentWorkspace?.id || "");
+  const { data: groupMemberships } = useListWorkspaceGroups(currentProject?.id || "");

-  const { data: roles } = useGetProjectRoles(currentWorkspace?.id || "");
+  const { data: roles } = useGetProjectRoles(currentProject?.id || "");

  const { mutateAsync: addGroupToWorkspaceMutateAsync } = useAddGroupToWorkspace();

@@ -64,7 +64,7 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
  const onFormSubmit = async ({ group, role }: FormData) => {
    try {
      await addGroupToWorkspaceMutateAsync({
-        projectId: currentWorkspace?.id || "",
+        projectId: currentProject?.id || "",
        groupId: group.id,
        role: role.slug || undefined
      });
@@ -24,13 +24,13 @@ import {
  Tag,
  Tooltip
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useGetProjectRoles, useUpdateGroupWorkspaceRole } from "@app/hooks/api";
 import { TGroupMembership } from "@app/hooks/api/groups/types";
 import { TProjectRole } from "@app/hooks/api/roles/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/workspace/types";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";
 import { groupBy } from "@app/lib/fn/array";

 const temporaryRoleFormSchema = z.object({
@@ -213,7 +213,7 @@ type FormProps = {
 };

 const GroupRolesForm = ({ projectRoles, roles, groupId, onClose }: FormProps) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const [searchRoles, setSearchRoles] = useState("");

@@ -255,7 +255,7 @@ const GroupRolesForm = ({ projectRoles, roles, groupId, onClose }: FormProps) =>

    try {
      await updateGroupWorkspaceRole.mutateAsync({
-        projectId: currentWorkspace?.id || "",
+        projectId: currentProject?.id || "",
        groupId,
        roles: selectedRoles
      });
@@ -373,11 +373,11 @@ export const GroupRoles = ({
  className,
  popperContentProps
 }: TMemberRolesProp) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { popUp, handlePopUpToggle } = usePopUp(["editRole"] as const);

  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(
-    currentWorkspace?.id ?? ""
+    currentProject?.id ?? ""
  );

  return (
@@ -9,7 +9,7 @@ import {
  ProjectPermissionActions,
  ProjectPermissionSub,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteGroupFromWorkspace } from "@app/hooks/api";
@@ -19,7 +19,7 @@ import { GroupTable } from "./GroupsTable";

 export const GroupsSection = () => {
  const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { mutateAsync: deleteMutateAsync } = useDeleteGroupFromWorkspace();

@@ -44,7 +44,7 @@ export const GroupsSection = () => {
    try {
      await deleteMutateAsync({
        groupId,
-        projectId: currentWorkspace?.id || ""
+        projectId: currentProject?.id || ""
      });

      createNotification({
@@ -32,7 +32,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import {
  getUserTablePreference,
@@ -61,7 +61,7 @@ enum GroupsOrderBy {
 }

 export const GroupTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const navigate = useNavigate();

  const {
@@ -85,7 +85,7 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
  };

  const { data: groupMemberships = [], isPending } = useListWorkspaceGroups(
-    currentWorkspace?.id || ""
+    currentProject?.id || ""
  );

  const filteredGroupMemberships = useMemo(() => {
@@ -159,9 +159,9 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
                      onKeyDown={(evt) => {
                        if (evt.key === "Enter") {
                          navigate({
-                            to: `${getProjectBaseURL(currentWorkspace.type)}/groups/$groupId` as const,
+                            to: `${getProjectBaseURL(currentProject.type)}/groups/$groupId` as const,
                            params: {
-                              projectId: currentWorkspace.id,
+                              projectId: currentProject.id,
                              groupId: id
                            }
                          });
@@ -169,9 +169,9 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
                      }}
                      onClick={() =>
                        navigate({
-                          to: `${getProjectBaseURL(currentWorkspace.type)}/groups/$groupId` as const,
+                          to: `${getProjectBaseURL(currentProject.type)}/groups/$groupId` as const,
                          params: {
-                            projectId: currentWorkspace.id,
+                            projectId: currentProject.id,
                            groupId: id
                          }
                        })
@@ -45,7 +45,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import {
@@ -57,7 +57,7 @@ import { withProjectPermission } from "@app/hoc";
 import { usePagination, useResetPageHelper } from "@app/hooks";
 import { useDeleteIdentityFromWorkspace, useGetWorkspaceIdentityMemberships } from "@app/hooks/api";
 import { OrderByDirection } from "@app/hooks/api/generic/types";
-import { ProjectIdentityOrderBy } from "@app/hooks/api/workspace/types";
+import { ProjectIdentityOrderBy } from "@app/hooks/api/projects/types";
 import { usePopUp } from "@app/hooks/usePopUp";

 import { IdentityModal } from "./components/IdentityModal";
@@ -66,7 +66,7 @@ const MAX_ROLES_TO_BE_SHOWN_IN_TABLE = 2;

 export const IdentityTab = withProjectPermission(
  () => {
-    const { currentWorkspace } = useWorkspace();
+    const { currentProject, projectId } = useProject();
    const navigate = useNavigate();

    const {
@@ -92,11 +92,9 @@ export const IdentityTab = withProjectPermission(
      setUserTablePreference("projectIdentityTable", PreferenceKey.PerPage, newPerPage);
    };

-    const workspaceId = currentWorkspace?.id ?? "";
-
    const { data, isPending, isFetching } = useGetWorkspaceIdentityMemberships(
      {
-        workspaceId: currentWorkspace?.id || "",
+        projectId,
        offset,
        limit,
        orderDirection,
@@ -126,7 +124,7 @@ export const IdentityTab = withProjectPermission(
      try {
        await deleteMutateAsync({
          identityId,
-          workspaceId
+          projectId
        });

        createNotification({
@@ -261,9 +259,9 @@ export const IdentityTab = withProjectPermission(
                        onKeyDown={(evt) => {
                          if (evt.key === "Enter") {
                            navigate({
-                              to: `${getProjectBaseURL(currentWorkspace.type)}/identities/$identityId` as const,
+                              to: `${getProjectBaseURL(currentProject.type)}/identities/$identityId` as const,
                              params: {
-                                projectId: currentWorkspace.id,
+                                projectId: currentProject.id,
                                identityId: id
                              }
                            });
@@ -271,9 +269,9 @@ export const IdentityTab = withProjectPermission(
                        }}
                        onClick={() =>
                          navigate({
-                            to: `${getProjectBaseURL(currentWorkspace.type)}/identities/$identityId` as const,
+                            to: `${getProjectBaseURL(currentProject.type)}/identities/$identityId` as const,
                            params: {
-                              projectId: currentWorkspace.id,
+                              projectId: currentProject.id,
                              identityId: id
                            }
                          })
@@ -14,7 +14,7 @@ import {
  ModalContent,
  Spinner
 } from "@app/components/v2";
-import { useOrganization, useWorkspace } from "@app/context";
+import { useOrganization, useProject } from "@app/context";
 import {
  useAddIdentityToWorkspace,
  useGetIdentityMembershipOrgs,
@@ -37,10 +37,9 @@ type Props = {

 const Content = ({ popUp, handlePopUpToggle }: Props) => {
  const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
+  const { projectId } = useProject();

  const organizationId = currentOrg?.id || "";
-  const workspaceId = currentWorkspace?.id || "";

  const { data: identityMembershipOrgsData, isPending: isMembershipsLoading } =
    useGetIdentityMembershipOrgs({
@@ -49,12 +48,12 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
    });
  const identityMembershipOrgs = identityMembershipOrgsData?.identityMemberships;
  const { data: identityMembershipsData } = useGetWorkspaceIdentityMemberships({
-    workspaceId,
+    projectId,
    limit: 20000 // TODO: this is temp to preserve functionality for larger projects, will optimize in PR referenced above
  });
  const identityMemberships = identityMembershipsData?.identityMemberships;

-  const { data: roles, isPending: isRolesLoading } = useGetProjectRoles(workspaceId);
+  const { data: roles, isPending: isRolesLoading } = useGetProjectRoles(projectId);

  const { mutateAsync: addIdentityToWorkspaceMutateAsync } = useAddIdentityToWorkspace();

@@ -80,7 +79,7 @@ const Content = ({ popUp, handlePopUpToggle }: Props) => {
  const onFormSubmit = async ({ identity, role }: FormData) => {
    try {
      await addIdentityToWorkspaceMutateAsync({
-        workspaceId,
+        projectId,
        identityId: identity.id,
        role: role.slug || undefined
      });
@@ -22,7 +22,7 @@ import {
  OrgPermissionSubjects,
  useOrganization,
  useOrgPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import {
  useAddUsersToOrg,
@@ -31,7 +31,7 @@ import {
  useGetWorkspaceUsers
 } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectVersion } from "@app/hooks/api/workspace/types";
+import { ProjectVersion } from "@app/hooks/api/projects/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";

 const addMemberFormSchema = z.object({
@@ -57,7 +57,7 @@ type Props = {
 export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
  const { t } = useTranslation();
  const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const navigate = useNavigate({ from: "" });
  const { permission } = useOrgPermission();
  const requesterEmail = useSearch({
@@ -66,12 +66,12 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
  });

  const orgId = currentOrg?.id || "";
-  const workspaceId = currentWorkspace?.id || "";
+  const workspaceId = currentProject?.id || "";

  const { data: members } = useGetWorkspaceUsers(workspaceId);
  const { data: orgUsers } = useGetOrgUsers(orgId);

-  const { data: roles } = useGetProjectRoles(currentWorkspace?.id || "");
+  const { data: roles } = useGetProjectRoles(currentProject?.id || "");

  const {
    control,
@@ -94,7 +94,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
  }, [requesterEmail]);

  const onAddMembers = async ({ orgMemberships, projectRoleSlugs }: TAddMemberForm) => {
-    if (!currentWorkspace) return;
+    if (!currentProject) return;
    if (!currentOrg?.id) return;

    const existingMembers = orgMemberships.filter((membership) => !membership.isNewInvitee);
@@ -109,7 +109,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
    if (!selectedMembers) return;

    try {
-      if (currentWorkspace.version === ProjectVersion.V1) {
+      if (currentProject.version === ProjectVersion.V1) {
        createNotification({
          type: "error",
          text: "Please upgrade your project to invite new members to the project."
@@ -146,8 +146,8 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {
            organizationRoleSlug: ProjectMembershipRole.Member, // only applies to new invites
            projects: [
              {
-                slug: currentWorkspace.slug,
-                id: currentWorkspace.id,
+                slug: currentProject.slug,
+                id: currentProject.id,
                projectRoleSlug: projectRoleSlugs.map((role) => role.slug)
              }
            ]
@@ -31,12 +31,12 @@ import {
  ProjectPermissionSub,
  useProjectPermission,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateUserWorkspaceRole } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/workspace/types";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";

 const roleFormSchema = z.object({
  roles: z
@@ -64,9 +64,8 @@ type Props = {
 };
 export const MemberRbacSection = ({ projectMember, onOpenUpgradeModal }: Props) => {
  const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
-  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(workspaceId);
+  const { projectId } = useProject();
+  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(projectId);
  const { permission } = useProjectPermission();
  const isMemberEditDisabled = permission.cannot(
    ProjectPermissionMemberActions.Edit,
@@ -130,7 +129,7 @@ export const MemberRbacSection = ({ projectMember, onOpenUpgradeModal }: Props)

    try {
      await updateMembershipRole.mutateAsync({
-        workspaceId,
+        projectId,
        membershipId: projectMember.id,
        roles: sanitizedRoles
      });
@@ -1,7 +1,7 @@
 import { Link } from "@tanstack/react-router";

 import { Alert, AlertDescription } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { TWorkspaceUser } from "@app/hooks/api/types";

@@ -12,7 +12,7 @@ type Props = {
  onOpenUpgradeModal: (title: string) => void;
 };
 export const MemberRoleForm = ({ projectMember, onOpenUpgradeModal }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  return (
    <div>
      <MemberRbacSection projectMember={projectMember} onOpenUpgradeModal={onOpenUpgradeModal} />
@@ -22,9 +22,9 @@ export const MemberRoleForm = ({ projectMember, onOpenUpgradeModal }: Props) =>
      >
        <AlertDescription>
          <Link
-            to={`${getProjectBaseURL(currentWorkspace.type)}/members/$membershipId` as const}
+            to={`${getProjectBaseURL(currentProject.type)}/members/$membershipId` as const}
            params={{
-              projectId: currentWorkspace.id,
+              projectId: currentProject.id,
              membershipId: projectMember.id
            }}
          >
@@ -44,7 +44,7 @@ import {
  ProjectPermissionMemberActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { removeTrailingSlash } from "@app/helpers/string";
 import { usePopUp } from "@app/hooks";
@@ -89,7 +89,7 @@ export const SpecificPrivilegeSecretForm = ({
  secretPath?: string;
  onClose?: () => void;
 }) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
    "deletePrivilege",
@@ -129,7 +129,7 @@ export const SpecificPrivilegeSecretForm = ({
            temporaryAccess: privilege
          }
        : {
-            environmentSlug: currentWorkspace.environments?.[0]?.slug,
+            environmentSlug: currentProject.environments?.[0]?.slug,
            secretPath: initialSecretPath,
            read: selectedActions.includes(ProjectPermissionActions.Read),
            edit: selectedActions.includes(ProjectPermissionActions.Edit),
@@ -202,7 +202,7 @@ export const SpecificPrivilegeSecretForm = ({
  // This is used for requesting access additional privileges, not directly creating a privilege!
  const handleRequestAccess = async (data: TSecretPermissionForm) => {
    if (!policies) return;
-    if (!currentWorkspace) {
+    if (!currentProject) {
      createNotification({
        type: "error",
        text: "No workspace found.",
@@ -253,7 +253,7 @@ export const SpecificPrivilegeSecretForm = ({
      ...(data.temporaryAccess.isTemporary && {
        temporaryRange: data.temporaryAccess.temporaryRange
      }),
-      projectSlug: currentWorkspace.slug,
+      projectSlug: currentProject.slug,
      isTemporary: data.temporaryAccess.isTemporary,
      permissions: actions
        .filter(({ allowed }) => allowed)
@@ -307,7 +307,7 @@ export const SpecificPrivilegeSecretForm = ({
                  position="popper"
                  dropdownContainerClassName="max-w-none"
                >
-                  {currentWorkspace?.environments?.map(({ slug, id, name }) => (
+                  {currentProject?.environments?.map(({ slug, id, name }) => (
                    <SelectItem value={slug} key={id}>
                      {name}
                    </SelectItem>
@@ -9,7 +9,7 @@ import {
  ProjectPermissionActions,
  ProjectPermissionSub,
  useOrganization,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteUserFromWorkspace } from "@app/hooks/api";
@@ -19,7 +19,7 @@ import { MembersTable } from "./MembersTable";

 export const MembersSection = () => {
  const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { mutateAsync: removeUserFromWorkspace } = useDeleteUserFromWorkspace();

@@ -32,11 +32,11 @@ export const MembersSection = () => {
  const handleRemoveUser = async () => {
    const username = (popUp?.removeMember?.data as { username: string })?.username;
    if (!currentOrg?.id) return;
-    if (!currentWorkspace?.id) return;
+    if (!currentProject?.id) return;

    try {
      await removeUserFromWorkspace({
-        workspaceId: currentWorkspace.id,
+        projectId: currentProject.id,
        usernames: [username],
        orgId: currentOrg.id
      });
@@ -44,12 +44,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import {
-  ProjectPermissionActions,
-  ProjectPermissionSub,
-  useUser,
-  useWorkspace
-} from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useUser, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import {
@@ -81,7 +76,7 @@ type Filter = {
 };

 export const MembersTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { user } = useUser();
  const navigate = useNavigate();
  const [filter, setFilter] = useState<Filter>({
@@ -90,7 +85,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
  const filterRoles = useMemo(() => filter.roles, [filter.roles]);

  const userId = user?.id || "";
-  const workspaceId = currentWorkspace?.id || "";
+  const workspaceId = currentProject?.id || "";
  const { data: projectRoles } = useGetProjectRoles(workspaceId);

  const {
@@ -312,7 +307,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
                    onKeyDown={(evt) => {
                      if (evt.key === "Enter") {
                        navigate({
-                          to: `${getProjectBaseURL(currentWorkspace.type)}/members/$membershipId`,
+                          to: `${getProjectBaseURL(currentProject.type)}/members/$membershipId`,
                          params: {
                            projectId: workspaceId,
                            membershipId
@@ -322,7 +317,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
                    }}
                    onClick={() =>
                      navigate({
-                        to: `${getProjectBaseURL(currentWorkspace.type)}/members/$membershipId`,
+                        to: `${getProjectBaseURL(currentProject.type)}/members/$membershipId`,
                        params: {
                          projectId: workspaceId,
                          membershipId
@@ -39,7 +39,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { isCustomProjectRole } from "@app/helpers/roles";
 import {
@@ -67,8 +67,8 @@ export const ProjectRoleList = () => {
    "deleteRole",
    "duplicateRole"
  ] as const);
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data: roles, isPending: isRolesLoading } = useGetProjectRoles(projectId);

@@ -250,9 +250,9 @@ export const ProjectRoleList = () => {
                  className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
                  onClick={() =>
                    navigate({
-                      to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug`,
+                      to: `${getProjectBaseURL(currentProject.type)}/roles/$roleSlug`,
                      params: {
-                        projectId: currentWorkspace.id,
+                        projectId: currentProject.id,
                        roleSlug: slug
                      }
                    })
@@ -292,9 +292,9 @@ export const ProjectRoleList = () => {
                                onClick={(e) => {
                                  e.stopPropagation();
                                  navigate({
-                                    to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug`,
+                                    to: `${getProjectBaseURL(currentProject.type)}/roles/$roleSlug`,
                                    params: {
-                                      projectId: currentWorkspace.id,
+                                      projectId: currentProject.id,
                                      roleSlug: slug
                                    }
                                  });
@@ -22,7 +22,7 @@ import {
  Select,
  SelectItem
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useToggle } from "@app/hooks";
 import { useCreateServiceToken } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -70,7 +70,7 @@ type Props = {
 const ServiceTokenForm = () => {
  const { t } = useTranslation();

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const {
    control,
    handleSubmit,
@@ -81,7 +81,7 @@ const ServiceTokenForm = () => {
      scopes: [
        {
          secretPath: "/",
-          environment: currentWorkspace?.environments?.[0]?.slug
+          environment: currentProject?.environments?.[0]?.slug
        }
      ]
    }
@@ -111,7 +111,7 @@ const ServiceTokenForm = () => {

  const onFormSubmit = async ({ name, scopes, expiresIn, permissions }: FormData) => {
    try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;

      const randomBytes = crypto.randomBytes(16).toString("hex");

@@ -122,7 +122,7 @@ const ServiceTokenForm = () => {
        scopes,
        expiresIn: Number(expiresIn),
        name,
-        workspaceId: currentWorkspace.id,
+        workspaceId: currentProject.id,
        randomBytes,
        permissions: Object.entries(permissions)
          .filter(([, permissionsValue]) => permissionsValue)
@@ -172,7 +172,7 @@ const ServiceTokenForm = () => {
          <Controller
            control={control}
            name={`scopes.${index}.environment`}
-            defaultValue={currentWorkspace?.environments?.[0]?.slug}
+            defaultValue={currentProject?.environments?.[0]?.slug}
            render={({ field: { onChange, ...field }, fieldState: { error } }) => (
              <FormControl
                className="mb-0"
@@ -186,7 +186,7 @@ const ServiceTokenForm = () => {
                  onValueChange={(e) => onChange(e)}
                  className="w-full"
                >
-                  {currentWorkspace?.environments.map(({ name, slug }) => (
+                  {currentProject?.environments.map(({ name, slug }) => (
                    <SelectItem value={slug} key={slug}>
                      {name}
                    </SelectItem>
@@ -225,7 +225,7 @@ const ServiceTokenForm = () => {
          variant="outline_bg"
          onClick={() =>
            append({
-              environment: currentWorkspace?.environments?.[0]?.slug || "",
+              environment: currentProject?.environments?.[0]?.slug || "",
              secretPath: ""
            })
          }
@@ -334,7 +334,7 @@ const ServiceTokenForm = () => {
 export const AddServiceTokenModal = ({ popUp, handlePopUpToggle }: Props) => {
  const { t } = useTranslation();

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  return (
    <Modal
@@ -346,7 +346,7 @@ export const AddServiceTokenModal = ({ popUp, handlePopUpToggle }: Props) => {
      <ModalContent
        title={
          t("section.token.add-dialog.title", {
-            target: currentWorkspace?.name
+            target: currentProject?.name
          }) as string
        }
        subTitle={t("section.token.add-dialog.description") as string}
@@ -33,7 +33,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import {
  getUserTablePreference,
  PreferenceKey,
@@ -63,9 +63,9 @@ enum TokensOrderBy {
 }

 export const ServiceTokenTable = ({ handlePopUpOpen }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { data, isPending } = useGetUserWsServiceTokens({
-    workspaceID: currentWorkspace?.id || ""
+    workspaceID: currentProject?.id || ""
  });

  const {
@@ -1,11 +1,11 @@
 import { Helmet } from "react-helmet";

 import { PageHeader } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { LogsSection } from "@app/pages/organization/AuditLogsPage/components";

 export const AuditLogsPage = () => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  return (
    <div className="container mx-auto flex flex-col justify-between bg-bunker-800 text-white">
@@ -19,7 +19,7 @@ export const AuditLogsPage = () => {
            title="Audit logs"
            description="Audit logs for security and compliance teams to monitor information access."
          />
-          <LogsSection pageView project={currentWorkspace} />
+          <LogsSection pageView project={currentProject} />
        </div>
      </div>
    </div>
@@ -4,8 +4,8 @@ import { useParams } from "@tanstack/react-router";

 import { ProjectPermissionCan } from "@app/components/permissions";
 import { EmptyState, PageHeader, Spinner } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
-import { useGetWorkspaceGroupMembershipDetails } from "@app/hooks/api/workspace/queries";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
+import { useGetWorkspaceGroupMembershipDetails } from "@app/hooks/api/projects/queries";

 import { GroupDetailsSection } from "./components/GroupDetailsSection";
 import { GroupMembersSection } from "./components/GroupMembersSection";
@@ -16,10 +16,10 @@ const Page = () => {
    select: (el) => el.groupId as string
  });

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { data: groupMembership, isPending } = useGetWorkspaceGroupMembershipDetails(
-    currentWorkspace.id,
+    currentProject.id,
    groupId
  );

@@ -14,7 +14,7 @@ import {
  IconButton
 } from "@app/components/v2";
 import { CopyButton } from "@app/components/v2/CopyButton";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
 import { useDeleteGroupFromWorkspace } from "@app/hooks/api";
@@ -31,14 +31,14 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
  ] as const);

  const { mutateAsync: deleteMutateAsync } = useDeleteGroupFromWorkspace();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const navigate = useNavigate();

  const onRemoveGroupSubmit = async () => {
    try {
      await deleteMutateAsync({
        groupId: groupMembership.group.id,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
      });

      createNotification({
@@ -47,9 +47,9 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
      });

      navigate({
-        to: `${getProjectBaseURL(currentWorkspace.type)}/access-management`,
+        to: `${getProjectBaseURL(currentProject.type)}/access-management`,
        params: {
-          projectId: currentWorkspace.id
+          projectId: currentProject.id
        },
        search: {
          selectedTab: "groups"
@@ -23,7 +23,7 @@ import {
  THead,
  Tr
 } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { getProjectHomePage } from "@app/helpers/project";
 import {
  getUserTablePreference,
@@ -69,12 +69,12 @@ export const GroupMembersTable = ({ groupMembership }: Props) => {
    setUserTablePreference("projectGroupMembersTable", PreferenceKey.PerPage, newPerPage);
  };

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { data: groupMemberships, isPending } = useListProjectGroupUsers({
    id: groupMembership.group.id,
    groupSlug: groupMembership.group.slug,
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
    offset,
    limit: perPage,
    search,
@@ -127,7 +127,7 @@ export const GroupMembersTable = ({ groupMembership }: Props) => {
      {
        actorId: userId,
        actorType: ActorType.USER,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
      },
      {
        onSuccess: () => {
@@ -136,8 +136,8 @@ export const GroupMembersTable = ({ groupMembership }: Props) => {
            text: "User privilege assumption has started"
          });

-          const url = getProjectHomePage(currentWorkspace.type, currentWorkspace.environments);
-          window.location.href = url.replace("$projectId", currentWorkspace.id);
+          const url = getProjectHomePage(currentProject.type, currentProject.environments);
+          window.location.href = url.replace("$projectId", currentProject.id);
        }
      }
    );
@@ -18,7 +18,7 @@ import {
  ProjectPermissionActions,
  ProjectPermissionIdentityActions,
  ProjectPermissionSub,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { getProjectBaseURL, getProjectHomePage } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
@@ -38,12 +38,10 @@ const Page = () => {
    strict: false,
    select: (el) => el.identityId as string
  });
-  const { currentWorkspace } = useWorkspace();
-
-  const workspaceId = currentWorkspace?.id || "";
+  const { currentProject, projectId } = useProject();

  const { data: identityMembershipDetails, isPending: isMembershipDetailsLoading } =
-    useGetWorkspaceIdentityMembershipDetails(workspaceId, identityId);
+    useGetWorkspaceIdentityMembershipDetails(projectId, identityId);

  const { mutateAsync: deleteMutateAsync, isPending: isDeletingIdentity } =
    useDeleteIdentityFromWorkspace();
@@ -59,7 +57,7 @@ const Page = () => {
      {
        actorId: identityId,
        actorType: ActorType.IDENTITY,
-        projectId: workspaceId
+        projectId: projectId
      },
      {
        onSuccess: () => {
@@ -67,8 +65,8 @@ const Page = () => {
            type: "success",
            text: "Identity privilege assumption has started"
          });
-          const url = getProjectHomePage(currentWorkspace.type, currentWorkspace.environments);
-          window.location.href = url.replace("$projectId", currentWorkspace.id);
+          const url = getProjectHomePage(currentProject.type, currentProject.environments);
+          window.location.href = url.replace("$projectId", currentProject.id);
        }
      }
    );
@@ -78,7 +76,7 @@ const Page = () => {
    try {
      await deleteMutateAsync({
        identityId,
-        workspaceId
+        projectId
      });
      createNotification({
        text: "Successfully removed identity from project",
@@ -86,9 +84,9 @@ const Page = () => {
      });
      handlePopUpClose("deleteIdentity");
      navigate({
-        to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
+        to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
        params: {
-          projectId: workspaceId
+          projectId: projectId
        },
        search: {
          selectedTab: "identities"
@@ -25,7 +25,7 @@ import {
  ProjectPermissionIdentityActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import {
  useCreateIdentityProjectAdditionalPrivilege,
@@ -78,8 +78,8 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({
  isDisabled
 }: Props) => {
  const isCreate = !privilegeId;
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
  const { data: privilegeDetails, isPending } = useGetIdentityProjectPrivilegeDetails({
    identityId,
    projectId,
@@ -225,7 +225,7 @@ export const IdentityProjectAdditionalPrivilegeModifySection = ({
              >
                Save
              </Button>
-              <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
+              <AddPoliciesButton isDisabled={isDisabled} projectType={currentProject.type} />
            </div>
          </div>
        </div>
@@ -23,7 +23,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useUpdateIdentityWorkspaceRole } from "@app/hooks/api";
@@ -41,7 +41,7 @@ export const IdentityRoleDetailsSection = ({
  identityMembershipDetails,
  isMembershipDetailsLoading
 }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
    "deleteRole",
    "modifyRole"
@@ -53,7 +53,7 @@ export const IdentityRoleDetailsSection = ({
    try {
      const updatedRoles = identityMembershipDetails?.roles?.filter((el) => el.id !== id);
      await updateIdentityWorkspaceRole({
-        workspaceId: currentWorkspace?.id || "",
+        projectId: currentProject?.id || "",
        identityId: identityMembershipDetails.identity.id,
        roles: updatedRoles.map(
          ({
@@ -30,12 +30,12 @@ import {
  ProjectPermissionIdentityActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateIdentityWorkspaceRole } from "@app/hooks/api";
 import { IdentityMembership } from "@app/hooks/api/identities/types";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/workspace/types";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";

 const roleFormSchema = z.object({
  roles: z
@@ -62,9 +62,8 @@ type Props = {
 };

 export const IdentityRoleModify = ({ identityProjectMembership }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
-  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(workspaceId);
+  const { projectId } = useProject();
+  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(projectId);
  const { permission } = useProjectPermission();
  const isIdentityEditDisabled = permission.cannot(
    ProjectPermissionIdentityActions.Edit,
@@ -117,7 +116,7 @@ export const IdentityRoleModify = ({ identityProjectMembership }: Props) => {

    try {
      await updateIdentityWorkspaceRole.mutateAsync({
-        workspaceId,
+        projectId,
        identityId: identityProjectMembership.identity.id,
        roles: sanitizedRoles
      });
@@ -19,7 +19,7 @@ import {
  ProjectPermissionMemberActions,
  ProjectPermissionSub,
  useOrganization,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { getProjectBaseURL, getProjectHomePage } from "@app/helpers/project";
 import { usePopUp } from "@app/hooks";
@@ -40,12 +40,10 @@ export const Page = () => {
    select: (el) => el.membershipId as string
  });
  const { currentOrg } = useOrganization();
-  const { currentWorkspace } = useWorkspace();
-
-  const workspaceId = currentWorkspace?.id || "";
+  const { currentProject, projectId } = useProject();

  const { data: membershipDetails, isPending: isMembershipDetailsLoading } =
-    useGetWorkspaceUserDetails(workspaceId, membershipId);
+    useGetWorkspaceUserDetails(projectId, membershipId);

  const { mutateAsync: removeUserFromWorkspace, isPending: isRemovingUserFromWorkspace } =
    useDeleteUserFromWorkspace();
@@ -63,7 +61,7 @@ export const Page = () => {
      {
        actorId: userId,
        actorType: ActorType.USER,
-        projectId: workspaceId
+        projectId
      },
      {
        onSuccess: () => {
@@ -72,19 +70,19 @@ export const Page = () => {
            text: "User privilege assumption has started"
          });

-          const url = getProjectHomePage(currentWorkspace.type, currentWorkspace.environments);
-          window.location.href = url.replace("$projectId", currentWorkspace.id);
+          const url = getProjectHomePage(currentProject.type, currentProject.environments);
+          window.location.href = url.replace("$projectId", currentProject.id);
        }
      }
    );
  };

  const handleRemoveUser = async () => {
-    if (!currentOrg?.id || !currentWorkspace?.id || !membershipDetails?.user?.username) return;
+    if (!currentOrg?.id || !currentProject?.id || !membershipDetails?.user?.username) return;

    try {
      await removeUserFromWorkspace({
-        workspaceId: currentWorkspace.id,
+        projectId,
        usernames: [membershipDetails?.user?.username],
        orgId: currentOrg.id
      });
@@ -93,9 +91,9 @@ export const Page = () => {
        type: "success"
      });
      navigate({
-        to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
+        to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
        params: {
-          projectId: currentWorkspace.id
+          projectId: currentProject.id
        }
      });
    } catch (error) {
@@ -24,7 +24,7 @@ import {
  ProjectPermissionMemberActions,
  ProjectPermissionSub,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import {
  useCreateProjectUserAdditionalPrivilege,
@@ -77,8 +77,8 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
  isDisabled
 }: Props) => {
  const isCreate = !privilegeId;
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
  const { data: privilegeDetails, isPending } = useGetProjectUserPrivilegeDetails(
    privilegeId || ""
  );
@@ -221,7 +221,7 @@ export const MembershipProjectAdditionalPrivilegeModifySection = ({
              >
                Save
              </Button>
-              <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
+              <AddPoliciesButton isDisabled={isDisabled} projectType={currentProject.type} />
            </div>
          </div>
        </div>
@@ -22,12 +22,7 @@ import {
  Tooltip,
  Tr
 } from "@app/components/v2";
-import {
-  ProjectPermissionActions,
-  ProjectPermissionSub,
-  useUser,
-  useWorkspace
-} from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useUser, useProject } from "@app/context";
 import { formatProjectRoleName } from "@app/helpers/roles";
 import { usePopUp } from "@app/hooks";
 import { useUpdateUserWorkspaceRole } from "@app/hooks/api";
@@ -49,7 +44,7 @@ export const MemberRoleDetailsSection = ({
 }: Props) => {
  const { user } = useUser();
  const userId = user?.id;
-  const { currentWorkspace } = useWorkspace();
+  const { projectId } = useProject();
  const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
    "deleteRole",
    "modifyRole"
@@ -63,7 +58,7 @@ export const MemberRoleDetailsSection = ({
    try {
      const updatedRoles = membershipDetails?.roles?.filter((el) => el.id !== id);
      await updateUserWorkspaceRole({
-        workspaceId: currentWorkspace?.id || "",
+        projectId,
        roles: updatedRoles.map(
          ({
            role,
@@ -31,12 +31,12 @@ import {
  ProjectPermissionSub,
  useProjectPermission,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetProjectRoles, useUpdateUserWorkspaceRole } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
-import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/workspace/types";
+import { ProjectUserMembershipTemporaryMode } from "@app/hooks/api/projects/types";

 const roleFormSchema = z.object({
  roles: z
@@ -65,9 +65,8 @@ type Props = {

 export const MemberRoleModify = ({ projectMember, onOpenUpgradeModal }: Props) => {
  const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
-  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(workspaceId);
+  const { projectId } = useProject();
+  const { data: projectRoles, isPending: isRolesLoading } = useGetProjectRoles(projectId);
  const { permission } = useProjectPermission();
  const isMemberEditDisabled = permission.cannot(
    ProjectPermissionMemberActions.Edit,
@@ -131,7 +130,7 @@ export const MemberRoleModify = ({ projectMember, onOpenUpgradeModal }: Props) =

    try {
      await updateMembershipRole.mutateAsync({
-        workspaceId,
+        projectId,
        membershipId: projectMember.id,
        roles: sanitizedRoles
      });
@@ -16,7 +16,7 @@ import {
  DropdownMenuTrigger,
  PageHeader
 } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { useDeleteProjectRole, useGetProjectRoleBySlug } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
@@ -33,8 +33,8 @@ const Page = () => {
    strict: false,
    select: (el) => el.roleSlug as string
  });
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data } = useGetProjectRoleBySlug(projectId, roleSlug as string);

@@ -48,7 +48,7 @@ const Page = () => {

  const onDeleteRoleSubmit = async () => {
    try {
-      if (!currentWorkspace?.slug || !data?.id) return;
+      if (!currentProject?.slug || !data?.id) return;

      await deleteProjectRole({
        projectId,
@@ -61,7 +61,7 @@ const Page = () => {
      });
      handlePopUpClose("deleteRole");
      navigate({
-        to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
+        to: `${getProjectBaseURL(currentProject.type)}/access-management` as const,
        params: {
          projectId
        },
@@ -9,7 +9,7 @@ import {
  IconButton
 } from "@app/components/v2";
 import { usePopUp } from "@app/hooks";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";
 import { PolicySelectionModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal";
 import { PolicyTemplateModal } from "@app/pages/project/RoleDetailsBySlugPage/components/PolicyTemplateModal";

@@ -5,7 +5,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent, Spinner } from "@app/components/v2";
-import { ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject } from "@app/context";
 import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionContext/types";
 import { getProjectBaseURL } from "@app/helpers/project";
 import { useCreateProjectRole, useGetProjectRoleBySlug } from "@app/hooks/api";
@@ -45,7 +45,7 @@ const Content = ({ role, onClose }: ContentProps) => {
    resolver: zodResolver(schema)
  });

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const createRole = useCreateProjectRole();
  const navigate = useNavigate();
@@ -70,7 +70,7 @@ const Content = ({ role, onClose }: ContentProps) => {
    });

    const newRole = await createRole.mutateAsync({
-      projectId: currentWorkspace.id,
+      projectId: currentProject.id,
      permissions: sanitizedPermission,
      ...form
    });
@@ -81,10 +81,10 @@ const Content = ({ role, onClose }: ContentProps) => {
    });

    navigate({
-      to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug` as const,
+      to: `${getProjectBaseURL(currentProject.type)}/roles/$roleSlug` as const,
      params: {
        roleSlug: newRole.slug,
-        projectId: currentWorkspace.id
+        projectId: currentProject.id
      }
    });

@@ -142,9 +142,9 @@ const Content = ({ role, onClose }: ContentProps) => {
 };

 export const DuplicateProjectRoleModal = ({ isOpen, onOpenChange, roleSlug }: Props) => {
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

-  const { data: role, isPending } = useGetProjectRoleBySlug(currentWorkspace.id, roleSlug ?? "");
+  const { data: role, isPending } = useGetProjectRoleBySlug(currentProject.id, roleSlug ?? "");

  if (!roleSlug) return null;

@@ -19,7 +19,7 @@ import {
  Tr
 } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 import {
  EXCLUDED_PERMISSION_SUBS,
@@ -13,7 +13,7 @@ import {
  ModalContent
 } from "@app/components/v2";
 import { ProjectPermissionSub } from "@app/context";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 import {
  PROJECT_PERMISSION_OBJECT,
@@ -33,7 +33,7 @@ import {
  TPermissionConditionOperators
 } from "@app/context/ProjectPermissionContext/types";
 import { TProjectPermission } from "@app/hooks/api/roles/types";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 const GeneralPolicyActionSchema = z.object({
  read: z.boolean().optional(),
@@ -6,7 +6,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { getProjectBaseURL } from "@app/helpers/project";
 import {
  useCreateProjectRole,
@@ -38,8 +38,8 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
    roleSlug: string;
  };

-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";

  const { data: role } = useGetProjectRoleBySlug(projectId, popupData?.roleSlug ?? "");

@@ -101,7 +101,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
        });

        navigate({
-          to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug` as const,
+          to: `${getProjectBaseURL(currentProject.type)}/roles/$roleSlug` as const,
          params: {
            roleSlug: newRole.slug,
            projectId
@@ -8,12 +8,12 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { createNotification } from "@app/components/notifications";
 import { AccessTree } from "@app/components/permissions";
 import { Button } from "@app/components/v2";
-import { ProjectPermissionSub, useWorkspace } from "@app/context";
+import { ProjectPermissionSub, useProject } from "@app/context";
 import { ProjectPermissionSet } from "@app/context/ProjectPermissionContext";
 import { evaluatePermissionsAbility } from "@app/helpers/permissions";
 import { useGetProjectRoleBySlug, useUpdateProjectRole } from "@app/hooks/api";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { ProjectType } from "@app/hooks/api/workspace/types";
+import { ProjectType } from "@app/hooks/api/projects/types";

 import { AddPoliciesButton } from "./AddPoliciesButton";
 import { DynamicSecretPermissionConditions } from "./DynamicSecretPermissionConditions";
@@ -84,10 +84,10 @@ export const renderConditionalComponents = (
 };

 export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const projectId = currentWorkspace?.id || "";
+  const { currentProject } = useProject();
+  const projectId = currentProject?.id || "";
  const { data: role, isPending } = useGetProjectRoleBySlug(
-    currentWorkspace?.id ?? "",
+    currentProject?.id ?? "",
    roleSlug as string
  );

@@ -126,7 +126,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
    (role?.slug ?? "") as ProjectMembershipRole
  );

-  const isSecretManagerProject = currentWorkspace.type === ProjectType.SecretManager;
+  const isSecretManagerProject = currentProject.type === ProjectType.SecretManager;

  const permissions = form.watch("permissions");

@@ -178,7 +178,7 @@ export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
                  Save
                </Button>
                <div className="ml-2 border-l border-mineshaft-500 pl-4">
-                  <AddPoliciesButton isDisabled={isDisabled} projectType={currentWorkspace.type} />
+                  <AddPoliciesButton isDisabled={isDisabled} projectType={currentProject.type} />
                </div>
              </div>
            )}
@@ -5,10 +5,10 @@ import { z } from "zod";
 import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input } from "@app/components/v2";
-import { useProjectPermission, useSubscription, useWorkspace } from "@app/context";
+import { useProjectPermission, useSubscription, useProject } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
-import { useUpdateWorkspaceAuditLogsRetention } from "@app/hooks/api/workspace/queries";
+import { useUpdateWorkspaceAuditLogsRetention } from "@app/hooks/api/projects/queries";

 const formSchema = z.object({
  auditLogsRetentionDays: z.coerce.number().min(0)
@@ -19,7 +19,7 @@ type TForm = z.infer<typeof formSchema>;
 export const AuditLogsRetentionSection = () => {
  const { mutateAsync: updateAuditLogsRetention } = useUpdateWorkspaceAuditLogsRetention();

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const { membership } = useProjectPermission();
  const { subscription } = useSubscription();
  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const);
@@ -32,11 +32,11 @@ export const AuditLogsRetentionSection = () => {
    resolver: zodResolver(formSchema),
    values: {
      auditLogsRetentionDays:
-        currentWorkspace?.auditLogsRetentionDays ?? subscription?.auditLogsRetentionDays ?? 0
+        currentProject?.auditLogsRetentionDays ?? subscription?.auditLogsRetentionDays ?? 0
    }
  });

-  if (!currentWorkspace) return null;
+  if (!currentProject) return null;

  const handleAuditLogsRetentionSubmit = async ({ auditLogsRetentionDays }: TForm) => {
    try {
@@ -59,7 +59,7 @@ export const AuditLogsRetentionSection = () => {

      await updateAuditLogsRetention({
        auditLogsRetentionDays,
-        projectSlug: currentWorkspace.slug
+        projectSlug: currentProject.slug
      });

      createNotification({
@@ -1,20 +1,19 @@
 import { createNotification } from "@app/components/notifications";
 import { ProjectPermissionCan } from "@app/components/permissions";
 import { Checkbox } from "@app/components/v2";
-import { ProjectPermissionActions, ProjectPermissionSub, useWorkspace } from "@app/context";
-import { useToggleDeleteProjectProtection } from "@app/hooks/api/workspace/queries";
+import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";
+import { useUpdateProject } from "@app/hooks/api";

 export const DeleteProjectProtection = () => {
-  const { currentWorkspace } = useWorkspace();
-  const { mutateAsync } = useToggleDeleteProjectProtection();
+  const { projectId, currentProject } = useProject();
+
+  const { mutateAsync } = useUpdateProject();

  const handleToggleDeleteProjectProtection = async (state: boolean) => {
    try {
-      if (!currentWorkspace?.id) return;
-
      await mutateAsync({
-        workspaceID: currentWorkspace.id,
-        state
+        projectId: projectId,
+        hasDeleteProtection: state
      });

      const text = `Successfully ${state ? "enabled" : "disabled"} delete protection`;
@@ -40,7 +39,7 @@ export const DeleteProjectProtection = () => {
            <Checkbox
              id="hasDeleteProtection"
              isDisabled={!isAllowed}
-              isChecked={currentWorkspace?.hasDeleteProtection ?? false}
+              isChecked={currentProject?.hasDeleteProtection ?? false}
              onCheckedChange={(state) => {
                handleToggleDeleteProjectProtection(state as boolean);
              }}
@@ -10,7 +10,7 @@ import {
  ProjectPermissionSub,
  useOrganization,
  useProjectPermission,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useToggle } from "@app/hooks";
 import { useDeleteWorkspace, useGetWorkspaceUsers, useLeaveProject } from "@app/hooks/api";
@@ -26,13 +26,13 @@ export const DeleteProjectSection = () => {

  const { currentOrg } = useOrganization();
  const { hasProjectRole, membership } = useProjectPermission();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const [isDeleting, setIsDeleting] = useToggle();
  const [isLeaving, setIsLeaving] = useToggle();
  const deleteWorkspace = useDeleteWorkspace();
  const leaveProject = useLeaveProject();
  const { data: members, isPending: isMembersLoading } = useGetWorkspaceUsers(
-    currentWorkspace?.id || ""
+    currentProject?.id || ""
  );

  // If isNoAccessMember is true, then the user can't read the workspace members. So we need to handle this case separately.
@@ -51,10 +51,10 @@ export const DeleteProjectSection = () => {
  const handleDeleteWorkspaceSubmit = async () => {
    setIsDeleting.on();
    try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;

      await deleteWorkspace.mutateAsync({
-        workspaceID: currentWorkspace?.id
+        projectID: currentProject?.id
      });

      createNotification({
@@ -81,7 +81,7 @@ export const DeleteProjectSection = () => {
    try {
      setIsLeaving.on();

-      if (!currentWorkspace?.id || !currentOrg?.id) return;
+      if (!currentProject?.id || !currentOrg?.id) return;

      // If there's no members, and the user has access to read members, something went wrong.
      if (!members && !isNoAccessMember) return;
@@ -110,7 +110,7 @@ export const DeleteProjectSection = () => {
      // If it's actually a no-access member, then we don't really care about the members.

      await leaveProject.mutateAsync({
-        workspaceId: currentWorkspace.id
+        projectId: currentProject.id
      });

      navigate({
@@ -141,7 +141,7 @@ export const DeleteProjectSection = () => {
              type="submit"
              onClick={() => handlePopUpOpen("deleteWorkspace")}
            >
-              {`Delete ${currentWorkspace?.name}`}
+              {`Delete ${currentProject?.name}`}
            </Button>
          )}
        </ProjectPermissionCan>
@@ -154,7 +154,7 @@ export const DeleteProjectSection = () => {
            type="submit"
            onClick={() => handlePopUpOpen("leaveWorkspace")}
          >
-            {`Leave ${currentWorkspace?.name}`}
+            {`Leave ${currentProject?.name}`}
          </Button>
        )}
      </div>
@@ -162,7 +162,7 @@ export const DeleteProjectSection = () => {
      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
        title="Are you sure you want to delete this project?"
-        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
+        subTitle={`Permanently delete ${currentProject?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Delete Project"
@@ -172,7 +172,7 @@ export const DeleteProjectSection = () => {
      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
        title="Are you sure you want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
+        subTitle={`If you leave ${currentProject?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
@@ -2,7 +2,7 @@ import { useNavigate, useParams, useSearch } from "@tanstack/react-router";

 import { ProjectPermissionCan } from "@app/components/permissions";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  ProjectPermissionCommitsActions,
  ProjectPermissionSub
@@ -23,7 +23,7 @@ export const CommitDetailsPage = () => {
    from: ROUTE_PATHS.SecretManager.CommitDetailsPage.id,
    select: (el) => el.folderId
  });
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const navigate = useNavigate();
  const routerQueryParams: { secretPath?: string } = useSearch({
@@ -36,7 +36,7 @@ export const CommitDetailsPage = () => {
    navigate({
      to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
      params: {
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        folderId,
        environment: envSlug
      },
@@ -51,7 +51,7 @@ export const CommitDetailsPage = () => {
    navigate({
      to: "/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId/restore",
      params: {
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        folderId,
        environment: envSlug,
        commitId: selectedCommitId
@@ -73,7 +73,7 @@ export const CommitDetailsPage = () => {
        >
          <CommitDetailsTab
            selectedCommitId={selectedCommitId}
-            workspaceId={currentWorkspace.id}
+            workspaceId={currentProject.id}
            goBackToHistory={handleGoBackToHistory}
            envSlug={envSlug}
            goToRollbackPreview={handleGoToRollbackPreview}
@@ -17,7 +17,7 @@ import {
  Tooltip
 } from "@app/components/v2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  ProjectPermissionCommitsActions,
  ProjectPermissionSub
@@ -79,7 +79,7 @@ export const RollbackPreviewTab = (): JSX.Element => {
  const [deepRollback, setDeepRollback] = useState<boolean>(false);
  const [message, setMessage] = useState<string>("");
  const [selectedFolderId, setSelectedFolderId] = useState<string | null>(null);
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const envSlug = useParams({
    from: ROUTE_PATHS.SecretManager.RollbackPreviewPage.id,
    select: (el) => el.environment
@@ -104,7 +104,7 @@ export const RollbackPreviewTab = (): JSX.Element => {
    navigate({
      to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
      params: {
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        folderId,
        environment: envSlug
      },
@@ -120,7 +120,7 @@ export const RollbackPreviewTab = (): JSX.Element => {
  ] as const);

  const { mutateAsync: rollback } = useCommitRollback({
-    projectId: currentWorkspace.id,
+    projectId: currentProject.id,
    commitId: selectedCommitId,
    folderId,
    deepRollback,
@@ -133,7 +133,7 @@ export const RollbackPreviewTab = (): JSX.Element => {
    folderId,
    selectedCommitId,
    envSlug,
-    currentWorkspace.id,
+    currentProject.id,
    deepRollback,
    secretPath
  );
@@ -4,7 +4,7 @@ import { ProjectPermissionCan } from "@app/components/permissions";
 import { PageHeader } from "@app/components/v2";
 import { NoticeBannerV2 } from "@app/components/v2/NoticeBannerV2/NoticeBannerV2";
 import { ROUTE_PATHS } from "@app/const/routes";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import {
  ProjectPermissionCommitsActions,
  ProjectPermissionSub
@@ -17,7 +17,7 @@ export const CommitsPage = () => {
    from: ROUTE_PATHS.SecretManager.CommitsPage.id,
    select: (el) => el.environment
  });
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const navigate = useNavigate();
  const folderId = useParams({
    from: ROUTE_PATHS.SecretManager.CommitsPage.id,
@@ -33,7 +33,7 @@ export const CommitsPage = () => {
    navigate({
      to: "/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId",
      params: {
-        projectId: currentWorkspace.id,
+        projectId: currentProject.id,
        folderId,
        environment: envSlug,
        commitId
@@ -67,7 +67,7 @@ export const CommitsPage = () => {
        >
          <CommitHistoryTab
            onSelectCommit={handleSelectCommit}
-            projectId={currentWorkspace.id}
+            projectId={currentProject.id}
            environment={envSlug}
            secretPath={secretPath}
          />
@@ -136,7 +136,7 @@ export const CommitHistoryTab = ({
    isFetchingNextPage,
    hasNextPage
  } = useGetFolderCommitHistory({
-    workspaceId: projectId,
+    projectId,
    environment,
    directory: secretPath,
    limit,
@@ -5,7 +5,7 @@ import { z } from "zod";

 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
+import { useProject } from "@app/context";
 import { useAddTrustedIp, useGetMyIp, useUpdateTrustedIp } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";

@@ -27,7 +27,7 @@ type Props = {
 export const IPAllowlistModal = ({ popUp, handlePopUpClose, handlePopUpToggle }: Props) => {
  const { data, isPending } = useGetMyIp();

-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();
  const addTrustedIp = useAddTrustedIp();
  const updateTrustedIp = useUpdateTrustedIp();

@@ -65,11 +65,11 @@ export const IPAllowlistModal = ({ popUp, handlePopUpClose, handlePopUpToggle }:

  const onIPAllowlistModalSubmit = async ({ ipAddress, comment }: FormData) => {
    try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;

      if (popUp?.trustedIp?.data) {
        await updateTrustedIp.mutateAsync({
-          workspaceId: currentWorkspace.id,
+          projectId: currentProject.id,
          trustedIpId: (popUp?.trustedIp?.data as { trustedIpId: string })?.trustedIpId,
          ipAddress,
          comment,
@@ -77,7 +77,7 @@ export const IPAllowlistModal = ({ popUp, handlePopUpClose, handlePopUpToggle }:
        });
      } else {
        await addTrustedIp.mutateAsync({
-          workspaceId: currentWorkspace.id,
+          projectId: currentProject.id,
          ipAddress,
          comment,
          isActive: true
@@ -9,7 +9,7 @@ import {
  ProjectPermissionActions,
  ProjectPermissionSub,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useDeleteTrustedIp } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
@@ -20,7 +20,7 @@ import { IPAllowlistTable } from "./IPAllowlistTable";
 export const IPAllowlistSection = () => {
  const { mutateAsync } = useDeleteTrustedIp();
  const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
+  const { currentProject } = useProject();

  const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
    "trustedIp",
@@ -30,10 +30,10 @@ export const IPAllowlistSection = () => {

  const onDeleteTrustedIpSubmit = async (trustedIpId: string) => {
    try {
-      if (!currentWorkspace?.id) return;
+      if (!currentProject?.id) return;

      await mutateAsync({
-        workspaceId: currentWorkspace.id,
+        projectId: currentProject.id,
        trustedIpId
      });

@@ -19,7 +19,7 @@ import {
  ProjectPermissionActions,
  ProjectPermissionSub,
  useSubscription,
-  useWorkspace
+  useProject
 } from "@app/context";
 import { useGetTrustedIps } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -41,8 +41,8 @@ type Props = {

 export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Props) => {
  const { subscription } = useSubscription();
-  const { currentWorkspace } = useWorkspace();
-  const { data, isPending } = useGetTrustedIps(currentWorkspace?.id ?? "");
+  const { currentProject } = useProject();
+  const { data, isPending } = useGetTrustedIps(currentProject?.id ?? "");

  const formatType = (type: string, prefix?: number) => {
    return `${type.slice(0, 2).toUpperCase() + type.slice(2)} ${
@@ -77,10 +77,10 @@ export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
                      <Td>{comment}</Td>
                      {/* <Td>
                                        <div className="flex items-center">
-                                            <FontAwesomeIcon 
-                                                icon={faCircle} 
+                                            <FontAwesomeIcon
+                                                icon={faCircle}
                                                color="#2ecc71"
-                                            /> 
+                                            />
                                            <p className="ml-4">Active</p>
                                        </div>
                                    </Td> */}
--- a/Show More
+++ b/Show More