From 65a207b83ba7fda94bb07eb66b0d37fb9a020219 Mon Sep 17 00:00:00 2001
From: Flavien David <flavien.david74@gmail.com>
Date: Thu, 31 Oct 2024 19:05:16 +0100
Subject: [PATCH] More vaults to spaces (#8394)

---
 front/admin/init_dust_apps.ts                 |  2 +-
 front/components/ViewFolderAPIModal.tsx       |  4 +-
 front/components/app/Deploy.tsx               |  4 +-
 front/components/poke/plans/form.tsx          |  2 +-
 .../lib/api/assistant/actions/dust_app_run.ts |  2 +-
 front/lib/api/config.ts                       |  2 +-
 front/lib/api/spaces.ts                       |  8 ++--
 front/lib/registry.ts                         | 42 +++++++++----------
 .../resources/data_source_view_resource.ts    | 20 ++++-----
 front/lib/resources/space_resource.ts         |  2 +-
 front/lib/resources/string_ids.ts             |  3 +-
 front/lib/swr/spaces.ts                       | 18 ++++----
 .../20240730_backfill_data_source_views.ts    |  2 +-
 ...ews_in_agent_data_source_configurations.ts |  2 +-
 .../20240820_backfill_data_source_views.ts    |  2 +-
 ...ews_in_agent_data_source_configurations.ts |  2 +-
 ...20240821_backfill_all_data_source_views.ts |  6 +--
 ...ews_in_agent_table_query_configurations.ts |  2 +-
 .../20240906_backfill_apps_vault_ids.ts       |  8 ++--
 front/migrations/20240910_app_data_sources.ts | 14 +++----
 ...1_backfill_views_in_retrieval_documents.ts |  2 +-
 ..._ds_in_agent_table_query_configurations.ts |  2 +-
 ...0240927_backfill_conversations_groupIds.ts |  2 +-
 front/pages/api/registry/[type]/lookup.ts     |  6 +--
 .../pages/api/w/[wId]/data_sources/managed.ts |  4 +-
 .../[spaceId]/apps/[aId]/datasets/index.ts    |  2 +-
 .../[runId]/blocks/[type]/[name]/index.ts     |  2 +-
 .../[spaceId]/data_source_views/index.ts      |  4 +-
 .../api/w/[wId]/spaces/[spaceId]/index.ts     |  2 +-
 front/pages/poke/[wId]/index.tsx              |  4 +-
 front/poke/temporal/activities.ts             | 36 ++++++++--------
 front/poke/temporal/client.ts                 | 12 +++---
 front/poke/temporal/workflows.ts              | 14 +++----
 front/temporal/scrub_workspace/activities.ts  | 28 ++++++-------
 sdks/js/src/index.ts                          | 12 +++---
 sparkle/src/stories/Breadcrumbs.stories.tsx   | 14 +++----
 .../public/{vaults.ts => spaces.ts}           |  0
 types/src/front/data_source_view.ts           |  2 +-
 types/src/front/groups.ts                     |  8 ++--
 types/src/index.ts                            |  2 +-
 40 files changed, 153 insertions(+), 152 deletions(-)
 rename types/src/front/api_handlers/public/{vaults.ts => spaces.ts} (100%)

diff --git a/front/admin/init_dust_apps.ts b/front/admin/init_dust_apps.ts
index ba121371fc41..53579e28bc78 100644
--- a/front/admin/init_dust_apps.ts
+++ b/front/admin/init_dust_apps.ts
@@ -36,7 +36,7 @@ async function main() {
   });
 
   const group = await GroupResource.makeNew({
-    name: `Group for vault Public Dust Apps`,
+    name: `Group for space Public Dust Apps`,
     workspaceId: w.id,
     kind: "regular",
   });
diff --git a/front/components/ViewFolderAPIModal.tsx b/front/components/ViewFolderAPIModal.tsx
index 075c941178d0..00479b56bfd7 100644
--- a/front/components/ViewFolderAPIModal.tsx
+++ b/front/components/ViewFolderAPIModal.tsx
@@ -30,7 +30,7 @@ export function ViewFolderAPIModal({
   const cURLRequest = (type: "upsert" | "search") => {
     switch (type) {
       case "upsert":
-        return `curl "${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/vaults/${space.sId}/data_sources/${dataSource.sId}/documents/YOUR_DOCUMENT_ID" \\
+        return `curl "${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/spaces/${space.sId}/data_sources/${dataSource.sId}/documents/YOUR_DOCUMENT_ID" \\
     -H "Authorization: Bearer YOUR_API_KEY" \\
     -H "Content-Type: application/json" \\
     -d '{
@@ -38,7 +38,7 @@ export function ViewFolderAPIModal({
       "source_url": "https://acme.com"
     }'`;
       case "search":
-        return `curl "${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/vaults/${space.sId}/data_sources/${dataSource.sId}/search?query=foo+bar&top_k=16&full_text=false" \\
+        return `curl "${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/spaces/${space.sId}/data_sources/${dataSource.sId}/search?query=foo+bar&top_k=16&full_text=false" \\
     -H "Authorization: Bearer YOUR_API_KEY"`;
       default:
         assertNever(type);
diff --git a/front/components/app/Deploy.tsx b/front/components/app/Deploy.tsx
index 03c95624d8e6..380b63c09134 100644
--- a/front/components/app/Deploy.tsx
+++ b/front/components/app/Deploy.tsx
@@ -57,7 +57,7 @@ export function ViewAppAPIModal({
   const cURLRequest = (type: "run") => {
     switch (type) {
       case "run":
-        return `curl ${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/vaults/${app.space.sId}/apps/${app.sId}/runs \\
+        return `curl ${process.env.NEXT_PUBLIC_DUST_CLIENT_FACING_URL}/api/v1/w/${owner.sId}/spaces/${app.space.sId}/apps/${app.sId}/runs \\
     -H "Authorization: Bearer YOUR_API_KEY" \\
     -H "Content-Type: application/json" \\
     -d '{
@@ -103,7 +103,7 @@ export function ViewAppAPIModal({
             <Page.P>
               <ul className="text-gray-500">
                 <li>
-                  vaultId: <span className="font-bold">{app.space.sId}</span>{" "}
+                  spaceId: <span className="font-bold">{app.space.sId}</span>{" "}
                 </li>
                 <li>
                   appId: <span className="font-bold">{app.sId}</span>
diff --git a/front/components/poke/plans/form.tsx b/front/components/poke/plans/form.tsx
index 6cb9188beb0e..0ff9e04261e9 100644
--- a/front/components/poke/plans/form.tsx
+++ b/front/components/poke/plans/form.tsx
@@ -260,7 +260,7 @@ export const PLAN_FIELDS = {
   maxVaults: {
     type: "number",
     width: "small",
-    title: "# Vaults",
+    title: "# Spaces",
     error: (plan: EditingPlanType) => errorCheckNumber(plan.maxVaults),
   },
   trialPeriodDays: {
diff --git a/front/lib/api/assistant/actions/dust_app_run.ts b/front/lib/api/assistant/actions/dust_app_run.ts
index 244678fe7f2d..37c5394e8090 100644
--- a/front/lib/api/assistant/actions/dust_app_run.ts
+++ b/front/lib/api/assistant/actions/dust_app_run.ts
@@ -315,7 +315,7 @@ export class DustAppRunConfigurationServerRunner extends BaseActionConfiguration
       {
         workspaceId: actionConfiguration.appWorkspaceId,
         appId: actionConfiguration.appId,
-        appVaultId: app.space.sId,
+        appSpaceId: app.space.sId,
         appHash: "latest",
       },
       appConfig,
diff --git a/front/lib/api/config.ts b/front/lib/api/config.ts
index 87bcc7eeee35..ae8e98e8e53a 100644
--- a/front/lib/api/config.ts
+++ b/front/lib/api/config.ts
@@ -102,7 +102,7 @@ const config = {
       "DEVELOPMENT_DUST_APPS_WORKSPACE_ID"
     );
   },
-  getDevelopmentDustAppsVaultId: (): string | undefined => {
+  getDevelopmentDustAppsSpaceId: (): string | undefined => {
     return EnvironmentConfig.getOptionalEnvVariable(
       "DEVELOPMENT_DUST_APPS_VAULT_ID"
     );
diff --git a/front/lib/api/spaces.ts b/front/lib/api/spaces.ts
index 986651a33324..5ee2a15b4efe 100644
--- a/front/lib/api/spaces.ts
+++ b/front/lib/api/spaces.ts
@@ -11,7 +11,7 @@ import { DataSourceViewResource } from "@app/lib/resources/data_source_view_reso
 import { KeyResource } from "@app/lib/resources/key_resource";
 import type { SpaceResource } from "@app/lib/resources/space_resource";
 import { frontSequelize } from "@app/lib/resources/storage";
-import { launchScrubVaultWorkflow } from "@app/poke/temporal/client";
+import { launchScrubSpaceWorkflow } from "@app/poke/temporal/client";
 
 export async function softDeleteSpaceAndLaunchScrubWorkflow(
   auth: Authenticator,
@@ -90,7 +90,7 @@ export async function softDeleteSpaceAndLaunchScrubWorkflow(
       throw res.error;
     }
 
-    await launchScrubVaultWorkflow(auth, space);
+    await launchScrubSpaceWorkflow(auth, space);
   });
 
   return new Ok(undefined);
@@ -105,9 +105,9 @@ export async function hardDeleteSpace(
 ): Promise<Result<void, Error>> {
   assert(auth.isAdmin(), "Only admins can delete spaces.");
 
-  const isDeletableVault =
+  const isDeletableSpace =
     space.isDeleted() || space.isGlobal() || space.isSystem();
-  assert(isDeletableVault, "Vault is not soft deleted.");
+  assert(isDeletableSpace, "Space is not soft deleted.");
 
   const dataSourceViews = await DataSourceViewResource.listBySpace(
     auth,
diff --git a/front/lib/registry.ts b/front/lib/registry.ts
index 8657ad4d5e3a..e82ff334e1f8 100644
--- a/front/lib/registry.ts
+++ b/front/lib/registry.ts
@@ -4,7 +4,7 @@ import config from "@app/lib/api/config";
 
 export const PRODUCTION_DUST_WORKSPACE_ID = "0ec9852c2f";
 export const PRODUCTION_DUST_APPS_WORKSPACE_ID = "78bda07b39";
-export const PRODUCTION_DUST_APPS_VAULT_ID = "vlt_rICtlrSEpWqX";
+export const PRODUCTION_DUST_APPS_SPACE_ID = "vlt_rICtlrSEpWqX";
 export const PRODUCTION_DUST_APPS_HELPER_DATASOURCE_VIEW_ID =
   "dsv_artLN7ZRrKWB";
 export type Action = {
@@ -12,7 +12,7 @@ export type Action = {
     workspaceId: string;
     appId: string;
     appHash: string;
-    appVaultId: string;
+    appSpaceId: string;
   };
   config: { [key: string]: unknown };
 };
@@ -21,10 +21,10 @@ const createActionRegistry = <K extends string, R extends Record<K, Action>>(
   registry: R
 ) => {
   const developmentWorkspaceId = config.getDevelopmentDustAppsWorkspaceId();
-  const developmentVaultId = config.getDevelopmentDustAppsVaultId();
+  const developmentSpaceId = config.getDevelopmentDustAppsSpaceId();
 
   if (isDevelopment() && developmentWorkspaceId) {
-    if (!developmentVaultId) {
+    if (!developmentSpaceId) {
       throw new Error(
         "DEVELOPMENT_DUST_APPS_VAULT_ID must be set in development if DEVELOPMENT_DUST_APPS_WORKSPACE_ID is set"
       );
@@ -32,7 +32,7 @@ const createActionRegistry = <K extends string, R extends Record<K, Action>>(
     const actions: Action[] = Object.values(registry);
     actions.forEach((action) => {
       action.app.workspaceId = developmentWorkspaceId;
-      action.app.appVaultId = developmentVaultId;
+      action.app.appSpaceId = developmentSpaceId;
     });
   }
 
@@ -46,7 +46,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "0e9889c787",
       appHash:
         "4e896f08ef6c2c69c97610c861cd444e3d34c839eab44f9b4fd7dd1d166c40a2",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
@@ -63,7 +63,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "84dfc1d4f7",
       appHash:
         "6ea231add2ae690ee959c5d8d5d06420ea2feae7dd32ac13a4e655910087e313",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
@@ -79,7 +79,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "471b6aa923",
       appHash:
         "3b634a84930020a7a18d3b32f4c5f5cd85690bf4958127ba51061fb101edea33",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       DATASOURCE: {
@@ -96,7 +96,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "953b79fe89",
       appHash:
         "06e0af3c215ee205d2eff01826f763e36f5694c0650bf645ab156ee189e50b3a",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       DATASOURCE: {
@@ -119,7 +119,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "4180309c80",
       appHash:
         "8adcc9ae33a63cc735c9a23a97d7bffe658c6ef2400fc997e61e8817f611a1f8",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       SEMANTIC_SEARCH: {
@@ -143,7 +143,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "76b40f14fb",
       appHash:
         "d06ec19c9196fdecda4c37f0f96c00343fcf401e0e9d206c1b12618292c6462a",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       SUGGEST_CHANGES: {
@@ -159,7 +159,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "b4f205e453",
       appHash:
         "59b0d9aa49ed9232f88f3ac1cd260ae25e0cd68e0622058c87cd4a42edce18da",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
@@ -175,7 +175,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "098b515f8e",
       appHash:
         "514d54c0967638656b437417228efec26de465796b5ab67ae0480d6976250768",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: { SEARCH: { provider_id: "serpapi", use_cache: false } },
   },
@@ -185,7 +185,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "21092925b9",
       appHash:
         "766618e57ff6600cac27d170395c74f4067e8671ef5bf36db5a820fb411f044b",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       WEBCONTENT: {
@@ -201,7 +201,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "d995d868a8",
       appHash:
         "7fb9c826d9de74c98de2a675093f66eab9da93a1a2cb9bc0bcc919fd074cd7eb",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       CREATE_SUGGESTIONS: {
@@ -217,7 +217,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "34a8c4a2aa",
       appHash:
         "65020161030b555f4d2efc9d1ce3a6d0020dcf76e663f746bd98213c90a0675f",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       CREATE_SUGGESTIONS: {
@@ -233,7 +233,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "b69YdlJ3PJ",
       appHash:
         "0b6b63def0224321f2bece0751bad632baca33f6d5bb596bbeb3f95b6bea5966",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       CREATE_SUGGESTIONS: {
@@ -249,7 +249,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "aba0057f4c",
       appHash:
         "e4bda2ba50f160712c08309628b4a6bf2b68dd7e9709669cc29ac43e36d663f7",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       CREATE_SUGGESTIONS: {
@@ -265,7 +265,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "b36c7416bd",
       appHash:
         "1ca7b9568681b06ef6cc0830239a479644a3ecc203c812983f3386a72e214d48",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
@@ -281,7 +281,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "tWcuYDj1OE",
       appHash:
         "8298c6543759d1d11db0e360a8b7aa7b8ec0fa71ed274f2667678302073e4f8d",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
@@ -297,7 +297,7 @@ export const DustProdActionRegistry = createActionRegistry({
       appId: "Hllp6rDlNo",
       appHash:
         "99f72c76477abd761f33d693b13c8d98750b2e80a68d24eb8963de777a77ebdc",
-      appVaultId: PRODUCTION_DUST_APPS_VAULT_ID,
+      appSpaceId: PRODUCTION_DUST_APPS_SPACE_ID,
     },
     config: {
       MODEL: {
diff --git a/front/lib/resources/data_source_view_resource.ts b/front/lib/resources/data_source_view_resource.ts
index b0fff168a99c..7b876e3a645b 100644
--- a/front/lib/resources/data_source_view_resource.ts
+++ b/front/lib/resources/data_source_view_resource.ts
@@ -128,7 +128,7 @@ export class DataSourceViewResource extends ResourceWithSpace<DataSourceViewMode
         space,
         transaction
       );
-      return this.createDefaultViewInVaultFromDataSourceIncludingAllDocuments(
+      return this.createDefaultViewInSpaceFromDataSourceIncludingAllDocuments(
         auth,
         dataSource.space,
         dataSource,
@@ -137,9 +137,9 @@ export class DataSourceViewResource extends ResourceWithSpace<DataSourceViewMode
     });
   }
 
-  static async createViewInVaultFromDataSource(
+  static async createViewInSpaceFromDataSource(
     auth: Authenticator,
-    vault: SpaceResource,
+    space: SpaceResource,
     dataSource: DataSourceResource,
     parentsIn: string[]
   ) {
@@ -148,18 +148,18 @@ export class DataSourceViewResource extends ResourceWithSpace<DataSourceViewMode
       {
         dataSourceId: dataSource.id,
         parentsIn,
-        workspaceId: vault.workspaceId,
+        workspaceId: space.workspaceId,
         kind: "custom",
       },
-      vault,
+      space,
       dataSource
     );
   }
 
   // This view has access to all documents, which is represented by null.
-  private static async createDefaultViewInVaultFromDataSourceIncludingAllDocuments(
+  private static async createDefaultViewInSpaceFromDataSourceIncludingAllDocuments(
     auth: Authenticator,
-    vault: SpaceResource,
+    space: SpaceResource,
     dataSource: DataSourceResource,
     transaction?: Transaction
   ) {
@@ -168,10 +168,10 @@ export class DataSourceViewResource extends ResourceWithSpace<DataSourceViewMode
       {
         dataSourceId: dataSource.id,
         parentsIn: null,
-        workspaceId: vault.workspaceId,
+        workspaceId: space.workspaceId,
         kind: "default",
       },
-      vault,
+      space,
       dataSource,
       transaction
     );
@@ -273,7 +273,7 @@ export class DataSourceViewResource extends ResourceWithSpace<DataSourceViewMode
     });
   }
 
-  static async listForDataSourcesInVault(
+  static async listForDataSourcesInSpace(
     auth: Authenticator,
     dataSources: DataSourceResource[],
     space: SpaceResource,
diff --git a/front/lib/resources/space_resource.ts b/front/lib/resources/space_resource.ts
index cecaaec50867..6a2afdc3d8a8 100644
--- a/front/lib/resources/space_resource.ts
+++ b/front/lib/resources/space_resource.ts
@@ -131,7 +131,7 @@ export class SpaceResource extends BaseResource<SpaceModel> {
     id: ModelId;
     workspaceId: ModelId;
   }): string {
-    return makeSId("vault", {
+    return makeSId("space", {
       id,
       workspaceId,
     });
diff --git a/front/lib/resources/string_ids.ts b/front/lib/resources/string_ids.ts
index 33e191251cd5..a05fc6783626 100644
--- a/front/lib/resources/string_ids.ts
+++ b/front/lib/resources/string_ids.ts
@@ -21,7 +21,8 @@ const REGION = 1; // US.
 const RESOURCES_PREFIX = {
   file: "fil",
   group: "grp",
-  vault: "vlt",
+  // TODO(2024-10-31 flav) Add new prefix for space.
+  space: "vlt",
   data_source: "dts",
   data_source_view: "dsv",
 };
diff --git a/front/lib/swr/spaces.ts b/front/lib/swr/spaces.ts
index b8079a01a131..6cb8762c1996 100644
--- a/front/lib/swr/spaces.ts
+++ b/front/lib/swr/spaces.ts
@@ -451,7 +451,7 @@ export function useUpdateSpace({ owner }: { owner: LightWorkspaceType }) {
   });
 
   const doUpdate = async (
-    vault: SpaceType,
+    space: SpaceType,
     params: DoCreateOrUpdateAllowedParams
   ) => {
     const { name: newName, memberIds, isRestricted } = params;
@@ -460,7 +460,7 @@ export function useUpdateSpace({ owner }: { owner: LightWorkspaceType }) {
 
     // Prepare space update request.
     if (newName) {
-      const spaceUrl = `/api/w/${owner.sId}/spaces/${vault.sId}`;
+      const spaceUrl = `/api/w/${owner.sId}/spaces/${space.sId}`;
       updatePromises.push(
         fetch(spaceUrl, {
           method: "PATCH",
@@ -475,7 +475,7 @@ export function useUpdateSpace({ owner }: { owner: LightWorkspaceType }) {
     }
 
     // Prepare space members update request if provided.
-    const spaceMembersUrl = `/api/w/${owner.sId}/spaces/${vault.sId}/members`;
+    const spaceMembersUrl = `/api/w/${owner.sId}/spaces/${space.sId}/members`;
     updatePromises.push(
       fetch(spaceMembersUrl, {
         method: "PATCH",
@@ -533,11 +533,11 @@ export function useDeleteSpace({ owner }: { owner: LightWorkspaceType }) {
     disabled: true, // Needed just to mutate
   });
 
-  const doDelete = async (vault: SpaceType | null) => {
-    if (!vault) {
+  const doDelete = async (space: SpaceType | null) => {
+    if (!space) {
       return false;
     }
-    const url = `/api/w/${owner.sId}/spaces/${vault.sId}`;
+    const url = `/api/w/${owner.sId}/spaces/${space.sId}`;
     const res = await fetch(url, {
       method: "DELETE",
     });
@@ -548,15 +548,15 @@ export function useDeleteSpace({ owner }: { owner: LightWorkspaceType }) {
 
       sendNotification({
         type: "success",
-        title: `Successfully deleted ${getSpaceName(vault)}`,
-        description: `${getSpaceName(vault)} was successfully deleted.`,
+        title: `Successfully deleted ${getSpaceName(space)}`,
+        description: `${getSpaceName(space)} was successfully deleted.`,
       });
     } else {
       const errorData = await getErrorFromResponse(res);
 
       sendNotification({
         type: "error",
-        title: `Error deleting ${getSpaceName(vault)}`,
+        title: `Error deleting ${getSpaceName(space)}`,
         description: `Error: ${errorData.message}`,
       });
     }
diff --git a/front/migrations/20240730_backfill_data_source_views.ts b/front/migrations/20240730_backfill_data_source_views.ts
index 6f1a7e282d88..cd06fc86a8fe 100644
--- a/front/migrations/20240730_backfill_data_source_views.ts
+++ b/front/migrations/20240730_backfill_data_source_views.ts
@@ -45,7 +45,7 @@ async function backfillDataSourceViewsForWorkspace(
     }
 
     // Create a view for this data source in the global vault.
-    await DataSourceViewResource.createViewInVaultFromDataSource(
+    await DataSourceViewResource.createViewInSpaceFromDataSource(
       auth,
       globalVault,
       dataSource,
diff --git a/front/migrations/20240731_backfill_views_in_agent_data_source_configurations.ts b/front/migrations/20240731_backfill_views_in_agent_data_source_configurations.ts
index 22d7e235091d..4ab66018b92c 100644
--- a/front/migrations/20240731_backfill_views_in_agent_data_source_configurations.ts
+++ b/front/migrations/20240731_backfill_views_in_agent_data_source_configurations.ts
@@ -31,7 +31,7 @@ async function backfillViewsInAgentDataSourceConfigurationForWorkspace(
 
   // Retrieve data source views for managed data sources.
   const dataSourceViews =
-    await DataSourceViewResource.listForDataSourcesInVault(
+    await DataSourceViewResource.listForDataSourcesInSpace(
       auth,
       managedDataSources,
       globalVault
diff --git a/front/migrations/20240820_backfill_data_source_views.ts b/front/migrations/20240820_backfill_data_source_views.ts
index a56598eee37e..d71f0b169ae3 100644
--- a/front/migrations/20240820_backfill_data_source_views.ts
+++ b/front/migrations/20240820_backfill_data_source_views.ts
@@ -38,7 +38,7 @@ async function backfillDefaultViewForDataSource(
   }
 
   // Create a default view for this data source in the vault.
-  await DataSourceViewResource.createViewInVaultFromDataSource(
+  await DataSourceViewResource.createViewInSpaceFromDataSource(
     auth,
     vault,
     dataSource,
diff --git a/front/migrations/20240820_backfill_views_in_agent_data_source_configurations.ts b/front/migrations/20240820_backfill_views_in_agent_data_source_configurations.ts
index 9e96ec6b83a8..b2d80261d2eb 100644
--- a/front/migrations/20240820_backfill_views_in_agent_data_source_configurations.ts
+++ b/front/migrations/20240820_backfill_views_in_agent_data_source_configurations.ts
@@ -28,7 +28,7 @@
 //
 //   // Retrieve data source views for data sources.
 //   const dataSourceViews =
-//     await DataSourceViewResource.listForDataSourcesInVault(
+//     await DataSourceViewResource.listForDataSourcesInSpace(
 //       auth,
 //       dataSources,
 //       globalVault
diff --git a/front/migrations/20240821_backfill_all_data_source_views.ts b/front/migrations/20240821_backfill_all_data_source_views.ts
index 1e0364375285..839417f5ed89 100644
--- a/front/migrations/20240821_backfill_all_data_source_views.ts
+++ b/front/migrations/20240821_backfill_all_data_source_views.ts
@@ -16,7 +16,7 @@ async function backfillDefaultViewForDataSource(
   const { space } = dataSource;
   // Check if there is already a view for this managed data source in the vault.
   const dataSourceViews =
-    await DataSourceViewResource.listForDataSourcesInVault(
+    await DataSourceViewResource.listForDataSourcesInSpace(
       auth,
       [dataSource],
       space
@@ -34,7 +34,7 @@ async function backfillDefaultViewForDataSource(
   }
 
   // Create a default view for this data source in the vault.
-  await DataSourceViewResource.createViewInVaultFromDataSource(
+  await DataSourceViewResource.createViewInSpaceFromDataSource(
     auth,
     space,
     dataSource,
@@ -65,7 +65,7 @@ async function backfillDataSourceViewsForWorkspace(
     if (dataSource.space.isSystem()) {
       // Update the kind to "custom" for the data source view created in the global vault.
       const dataSourceViews =
-        await DataSourceViewResource.listForDataSourcesInVault(
+        await DataSourceViewResource.listForDataSourcesInSpace(
           auth,
           [dataSource],
           globalVault
diff --git a/front/migrations/20240902_backfill_views_in_agent_table_query_configurations.ts b/front/migrations/20240902_backfill_views_in_agent_table_query_configurations.ts
index 21a034ff9a00..c2a2829d2a0a 100644
--- a/front/migrations/20240902_backfill_views_in_agent_table_query_configurations.ts
+++ b/front/migrations/20240902_backfill_views_in_agent_table_query_configurations.ts
@@ -29,7 +29,7 @@ async function backfillViewsInAgentTableQueryConfigurationForWorkspace(
 
   // Retrieve data source views for data sources.
   const dataSourceViews =
-    await DataSourceViewResource.listForDataSourcesInVault(
+    await DataSourceViewResource.listForDataSourcesInSpace(
       auth,
       dataSources,
       globalVault
diff --git a/front/migrations/20240906_backfill_apps_vault_ids.ts b/front/migrations/20240906_backfill_apps_vault_ids.ts
index 64473fcbfcea..582d6c34e44f 100644
--- a/front/migrations/20240906_backfill_apps_vault_ids.ts
+++ b/front/migrations/20240906_backfill_apps_vault_ids.ts
@@ -17,15 +17,15 @@ makeScript({}, async ({ execute }, logger) => {
 
     const auth = await Authenticator.internalAdminForWorkspace(workspace.sId);
 
-    const globalVault = await SpaceResource.fetchWorkspaceGlobalSpace(auth);
+    const globalSpace = await SpaceResource.fetchWorkspaceGlobalSpace(auth);
 
     if (execute) {
-      await app.update({ vaultId: globalVault.id });
+      await app.update({ vaultId: globalSpace.id });
       logger.info(
         {
           workspaceId: workspace.sId,
           appId: app.sId,
-          vaultId: globalVault.sId,
+          vaultId: globalSpace.sId,
           execute,
         },
         "Updated app"
@@ -35,7 +35,7 @@ makeScript({}, async ({ execute }, logger) => {
         {
           workspaceId: workspace.sId,
           appId: app.sId,
-          vaultId: globalVault.sId,
+          vaultId: globalSpace.sId,
           execute,
         },
         "Would have updated app"
diff --git a/front/migrations/20240910_app_data_sources.ts b/front/migrations/20240910_app_data_sources.ts
index a97cb1eab79e..da8c4dfeaa9b 100644
--- a/front/migrations/20240910_app_data_sources.ts
+++ b/front/migrations/20240910_app_data_sources.ts
@@ -42,12 +42,12 @@ async function migrateApps(
   after: fs.WriteStream
 ) {
   const auth = await Authenticator.internalAdminForWorkspace(workspace.sId);
-  const vaults = await SpaceResource.listWorkspaceSpaces(auth);
+  const spaces = await SpaceResource.listWorkspaceSpaces(auth);
 
-  for (const vault of vaults) {
-    const apps = await AppResource.listBySpace(auth, vault);
+  for (const space of spaces) {
+    const apps = await AppResource.listBySpace(auth, space);
     if (apps.length > 0) {
-      logger.info(`Found ${apps.length} apps in vault ${vault.name}.`);
+      logger.info(`Found ${apps.length} apps in space ${space.name}.`);
 
       const dataSourceNames = new Set<string>();
       const dataSourceNameFinder = (obj: any, key: string) => {
@@ -80,10 +80,10 @@ async function migrateApps(
       );
 
       const dataSourceViews: Record<string, DataSourceViewResource> = (
-        await DataSourceViewResource.listForDataSourcesInVault(
+        await DataSourceViewResource.listForDataSourcesInSpace(
           auth,
           dataSources,
-          vault
+          space
         )
       ).reduce(
         (acc, dataSourceView) => ({
@@ -104,7 +104,7 @@ async function migrateApps(
           if (dataSourceViews[value]?.sId) {
             obj[key] = dataSourceViews[value]?.sId;
           } else {
-            logger.warn({}, `Cannot find datasource ${value} in ${vault.name}`);
+            logger.warn({}, `Cannot find datasource ${value} in ${space.name}`);
           }
         }
       };
diff --git a/front/migrations/20240911_backfill_views_in_retrieval_documents.ts b/front/migrations/20240911_backfill_views_in_retrieval_documents.ts
index 3bbe209e88e9..bb2d13dd1bc2 100644
--- a/front/migrations/20240911_backfill_views_in_retrieval_documents.ts
+++ b/front/migrations/20240911_backfill_views_in_retrieval_documents.ts
@@ -30,7 +30,7 @@
 //
 //   // Retrieve data source views for data sources.
 //   const dataSourceViews =
-//     await DataSourceViewResource.listForDataSourcesInVault(
+//     await DataSourceViewResource.listForDataSourcesInSpace(
 //       auth,
 //       dataSources,
 //       globalVault
diff --git a/front/migrations/20240916_backfill_ds_in_agent_table_query_configurations.ts b/front/migrations/20240916_backfill_ds_in_agent_table_query_configurations.ts
index 6a00d5e471b5..8ddad6f0e0ad 100644
--- a/front/migrations/20240916_backfill_ds_in_agent_table_query_configurations.ts
+++ b/front/migrations/20240916_backfill_ds_in_agent_table_query_configurations.ts
@@ -29,7 +29,7 @@ async function backfillDataSourceIdInAgentTableQueryConfigurationForWorkspace(
 
   // Retrieve data source views for data sources.
   const dataSourceViews =
-    await DataSourceViewResource.listForDataSourcesInVault(
+    await DataSourceViewResource.listForDataSourcesInSpace(
       auth,
       dataSources,
       globalVault
diff --git a/front/migrations/20240927_backfill_conversations_groupIds.ts b/front/migrations/20240927_backfill_conversations_groupIds.ts
index b2147cd4a4a4..ab4ae29e52f5 100644
--- a/front/migrations/20240927_backfill_conversations_groupIds.ts
+++ b/front/migrations/20240927_backfill_conversations_groupIds.ts
@@ -86,7 +86,7 @@ async function updateConversation(
   logger: Logger
 ) {
   // we get all messages without checking rank, because we only use them to get
-  // the agentConfigurationIds. At the time of writing (pre-vaults release), we
+  // the agentConfigurationIds. At the time of writing (pre-spaces release), we
   // don't need to consider message version at all for the backfill.
   const messages = await Message.findAll({
     where: {
diff --git a/front/pages/api/registry/[type]/lookup.ts b/front/pages/api/registry/[type]/lookup.ts
index bf1de1c94d8c..8a1ea7f73cd8 100644
--- a/front/pages/api/registry/[type]/lookup.ts
+++ b/front/pages/api/registry/[type]/lookup.ts
@@ -234,12 +234,12 @@ async function handleDataSource(
   // Until we pass the data source view id for managed data sources, we need to fetch it here.
   // TODO(DATASOURCE_SID) Clean-up Remove once dust apps rely on the data source view id for managed data sources.
   if (isManaged(dataSource)) {
-    const globalVault = await SpaceResource.fetchWorkspaceGlobalSpace(auth);
+    const globalSpace = await SpaceResource.fetchWorkspaceGlobalSpace(auth);
     const dataSourceView =
-      await DataSourceViewResource.listForDataSourcesInVault(
+      await DataSourceViewResource.listForDataSourcesInSpace(
         auth,
         [dataSource],
-        globalVault
+        globalSpace
       );
 
     return handleDataSourceView(auth, dataSourceView[0].sId);
diff --git a/front/pages/api/w/[wId]/data_sources/managed.ts b/front/pages/api/w/[wId]/data_sources/managed.ts
index 82fb6a888793..268a1b6ca686 100644
--- a/front/pages/api/w/[wId]/data_sources/managed.ts
+++ b/front/pages/api/w/[wId]/data_sources/managed.ts
@@ -295,7 +295,7 @@ async function handler(
         });
       }
 
-      const vault = await (provider === "webcrawler"
+      const space = await (provider === "webcrawler"
         ? SpaceResource.fetchWorkspaceGlobalSpace(auth)
         : SpaceResource.fetchWorkspaceSystemSpace(auth));
 
@@ -312,7 +312,7 @@ async function handler(
             name: dataSourceName,
             workspaceId: owner.id,
           },
-          vault
+          space
         );
 
       const dataSource = dataSourceView.dataSource;
diff --git a/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/datasets/index.ts b/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/datasets/index.ts
index 219e437bdd5d..669fb2177a15 100644
--- a/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/datasets/index.ts
+++ b/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/datasets/index.ts
@@ -80,7 +80,7 @@ async function handler(
       api_error: {
         type: "app_auth_error",
         message:
-          "Interacting with datasets requires write access to the app's vault.",
+          "Interacting with datasets requires write access to the app's space.",
       },
     });
   }
diff --git a/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/runs/[runId]/blocks/[type]/[name]/index.ts b/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/runs/[runId]/blocks/[type]/[name]/index.ts
index 04a3c8e346af..f504f67d127a 100644
--- a/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/runs/[runId]/blocks/[type]/[name]/index.ts
+++ b/front/pages/api/w/[wId]/spaces/[spaceId]/apps/[aId]/runs/[runId]/blocks/[type]/[name]/index.ts
@@ -52,7 +52,7 @@ async function handler(
       api_error: {
         type: "app_auth_error",
         message:
-          "Retrieving content of runs requires write access to the app's vault.",
+          "Retrieving content of runs requires write access to the app's space.",
       },
     });
   }
diff --git a/front/pages/api/w/[wId]/spaces/[spaceId]/data_source_views/index.ts b/front/pages/api/w/[wId]/spaces/[spaceId]/data_source_views/index.ts
index 262c9f52ed97..8ab47b4bf0dd 100644
--- a/front/pages/api/w/[wId]/spaces/[spaceId]/data_source_views/index.ts
+++ b/front/pages/api/w/[wId]/spaces/[spaceId]/data_source_views/index.ts
@@ -200,7 +200,7 @@ async function handler(
           },
         });
       }
-      const existing = await DataSourceViewResource.listForDataSourcesInVault(
+      const existing = await DataSourceViewResource.listForDataSourcesInSpace(
         auth,
         [dataSource],
         space
@@ -215,7 +215,7 @@ async function handler(
         });
       }
       const dataSourceView =
-        await DataSourceViewResource.createViewInVaultFromDataSource(
+        await DataSourceViewResource.createViewInSpaceFromDataSource(
           auth,
           space,
           dataSource,
diff --git a/front/pages/api/w/[wId]/spaces/[spaceId]/index.ts b/front/pages/api/w/[wId]/spaces/[spaceId]/index.ts
index 89e259df8f2d..885d6fb8a58a 100644
--- a/front/pages/api/w/[wId]/spaces/[spaceId]/index.ts
+++ b/front/pages/api/w/[wId]/spaces/[spaceId]/index.ts
@@ -184,7 +184,7 @@ async function handler(
               dataSourceConfig.dataSourceId
             );
             if (dataSource) {
-              await DataSourceViewResource.createViewInVaultFromDataSource(
+              await DataSourceViewResource.createViewInSpaceFromDataSource(
                 auth,
                 space,
                 dataSource,
diff --git a/front/pages/poke/[wId]/index.tsx b/front/pages/poke/[wId]/index.tsx
index bd494d19a3cf..99e735b2ed89 100644
--- a/front/pages/poke/[wId]/index.tsx
+++ b/front/pages/poke/[wId]/index.tsx
@@ -289,10 +289,10 @@ function DustAppLogsModal({
           ([
             action,
             {
-              app: { appId, workspaceId: appWorkspaceid, appVaultId },
+              app: { appId, workspaceId: appWorkspaceid, appSpaceId },
             },
           ]) => {
-            const url = `https://dust.tt/w/${appWorkspaceid}/spaces/${appVaultId}/apps/${appId}/runs?wIdTarget=${owner.sId}`;
+            const url = `https://dust.tt/w/${appWorkspaceid}/spaces/${appSpaceId}/apps/${appId}/runs?wIdTarget=${owner.sId}`;
 
             return (
               <div key={appId}>
diff --git a/front/poke/temporal/activities.ts b/front/poke/temporal/activities.ts
index 779de88bf3cf..ac9057c86e27 100644
--- a/front/poke/temporal/activities.ts
+++ b/front/poke/temporal/activities.ts
@@ -122,28 +122,28 @@ export async function scrubDataSourceActivity({
   await hardDeleteDataSource(auth, dataSource);
 }
 
-export async function scrubVaultActivity({
-  vaultId,
+export async function scrubSpaceActivity({
+  spaceId,
   workspaceId,
 }: {
-  vaultId: string;
+  spaceId: string;
   workspaceId: string;
 }) {
   const auth = await Authenticator.internalAdminForWorkspace(workspaceId);
-  const vault = await SpaceResource.fetchById(auth, vaultId, {
+  const space = await SpaceResource.fetchById(auth, spaceId, {
     includeDeleted: true,
   });
 
-  if (!vault) {
-    throw new Error("Vault not found.");
+  if (!space) {
+    throw new Error("Space not found.");
   }
 
-  const isDeletableVault =
-    vault.isDeleted() || vault.isGlobal() || vault.isSystem();
-  assert(isDeletableVault, "Vault is not soft deleted.");
+  const isDeletableSpace =
+    space.isDeleted() || space.isGlobal() || space.isSystem();
+  assert(isDeletableSpace, "Space is not soft deleted.");
 
-  // Delete all the data sources of the vaults.
-  const dataSources = await DataSourceResource.listBySpace(auth, vault, {
+  // Delete all the data sources of the spaces.
+  const dataSources = await DataSourceResource.listBySpace(auth, space, {
     includeDeleted: true,
   });
   for (const ds of dataSources) {
@@ -153,9 +153,9 @@ export async function scrubVaultActivity({
     });
   }
 
-  hardDeleteLogger.info({ vault: vault.sId }, "Deleting vault");
+  hardDeleteLogger.info({ space: space.sId }, "Deleting space");
 
-  await hardDeleteSpace(auth, vault);
+  await hardDeleteSpace(auth, space);
 }
 
 export async function isWorkflowDeletableActivity({
@@ -563,17 +563,17 @@ export async function deleteMembersActivity({
   });
 }
 
-export async function deleteVaultsActivity({
+export async function deleteSpacesActivity({
   workspaceId,
 }: {
   workspaceId: string;
 }) {
   const auth = await Authenticator.internalAdminForWorkspace(workspaceId);
-  const vaults = await SpaceResource.listWorkspaceSpaces(auth);
+  const spaces = await SpaceResource.listWorkspaceSpaces(auth);
 
-  for (const vault of vaults) {
-    await scrubVaultActivity({
-      vaultId: vault.sId,
+  for (const space of spaces) {
+    await scrubSpaceActivity({
+      spaceId: space.sId,
       workspaceId,
     });
   }
diff --git a/front/poke/temporal/client.ts b/front/poke/temporal/client.ts
index c1bac828de3d..f773810b781a 100644
--- a/front/poke/temporal/client.ts
+++ b/front/poke/temporal/client.ts
@@ -11,7 +11,7 @@ import logger from "@app/logger/logger";
 import {
   deleteWorkspaceWorkflow,
   scrubDataSourceWorkflow,
-  scrubVaultWorkflow,
+  scrubSpaceWorkflow,
 } from "./workflows";
 
 export async function launchScrubDataSourceWorkflow(
@@ -47,22 +47,22 @@ export async function launchScrubDataSourceWorkflow(
   }
 }
 
-export async function launchScrubVaultWorkflow(
+export async function launchScrubSpaceWorkflow(
   auth: Authenticator,
-  vault: SpaceResource
+  space: SpaceResource
 ) {
   const client = await getTemporalClient();
   const owner = auth.getNonNullableWorkspace();
 
-  await client.workflow.start(scrubVaultWorkflow, {
+  await client.workflow.start(scrubSpaceWorkflow, {
     args: [
       {
-        vaultId: vault.sId,
+        spaceId: space.sId,
         workspaceId: owner.sId,
       },
     ],
     taskQueue: "poke-queue",
-    workflowId: `poke-${owner.sId}-scrub-vault-${vault.sId}`,
+    workflowId: `poke-${owner.sId}-scrub-space-${space.sId}`,
   });
 }
 
diff --git a/front/poke/temporal/workflows.ts b/front/poke/temporal/workflows.ts
index 78a6005a3203..40c6bdb9d26e 100644
--- a/front/poke/temporal/workflows.ts
+++ b/front/poke/temporal/workflows.ts
@@ -13,11 +13,11 @@ const {
   deleteConversationsActivity,
   deleteMembersActivity,
   deleteRunOnDustAppsActivity,
-  deleteVaultsActivity,
+  deleteSpacesActivity,
   deleteWorkspaceActivity,
   isWorkflowDeletableActivity,
   scrubDataSourceActivity,
-  scrubVaultActivity,
+  scrubSpaceActivity,
 } = activityProxies;
 
 export async function scrubDataSourceWorkflow({
@@ -30,14 +30,14 @@ export async function scrubDataSourceWorkflow({
   await scrubDataSourceActivity({ dataSourceId, workspaceId });
 }
 
-export async function scrubVaultWorkflow({
-  vaultId,
+export async function scrubSpaceWorkflow({
+  spaceId,
   workspaceId,
 }: {
-  vaultId: string;
+  spaceId: string;
   workspaceId: string;
 }) {
-  await scrubVaultActivity({ vaultId, workspaceId });
+  await scrubSpaceActivity({ spaceId, workspaceId });
 }
 
 export async function deleteWorkspaceWorkflow({
@@ -54,6 +54,6 @@ export async function deleteWorkspaceWorkflow({
   await deleteAppsActivity({ workspaceId });
   await deleteRunOnDustAppsActivity({ workspaceId });
   await deleteMembersActivity({ workspaceId });
-  await deleteVaultsActivity({ workspaceId });
+  await deleteSpacesActivity({ workspaceId });
   await deleteWorkspaceActivity({ workspaceId });
 }
diff --git a/front/temporal/scrub_workspace/activities.ts b/front/temporal/scrub_workspace/activities.ts
index 6dc1b18e4fba..7666d51e0b86 100644
--- a/front/temporal/scrub_workspace/activities.ts
+++ b/front/temporal/scrub_workspace/activities.ts
@@ -90,7 +90,7 @@ export async function scrubWorkspaceData({
   await deleteAllConversations(auth);
   await archiveAssistants(auth);
   await deleteDatasources(auth);
-  await deleteVaults(auth);
+  await deleteSpaces(auth);
   await cleanupCustomerio(auth);
 }
 
@@ -152,14 +152,14 @@ async function archiveAssistants(auth: Authenticator) {
 }
 
 async function deleteDatasources(auth: Authenticator) {
-  const globalAndSystemVaults =
+  const globalAndSystemSpaces =
     await SpaceResource.listWorkspaceDefaultSpaces(auth);
 
-  // Retrieve and delete all data sources associated with the system and global vaults.
-  // Others will be deleted when deleting the vaults.
+  // Retrieve and delete all data sources associated with the system and global spaces.
+  // Others will be deleted when deleting the spaces.
   const dataSources = await DataSourceResource.listBySpaces(
     auth,
-    globalAndSystemVaults
+    globalAndSystemSpaces
   );
 
   for (const ds of dataSources) {
@@ -171,18 +171,18 @@ async function deleteDatasources(auth: Authenticator) {
   }
 }
 
-// Remove all user-created vaults and their associated groups,
-// preserving only the system and global vaults.
-async function deleteVaults(auth: Authenticator) {
-  const vaults = await SpaceResource.listWorkspaceSpaces(auth);
+// Remove all user-created spaces and their associated groups,
+// preserving only the system and global spaces.
+async function deleteSpaces(auth: Authenticator) {
+  const spaces = await SpaceResource.listWorkspaceSpaces(auth);
 
-  // Filter out system and global vaults.
-  const filteredVaults = vaults.filter(
-    (vault) => !vault.isGlobal() && !vault.isSystem()
+  // Filter out system and global spaces.
+  const filteredSpaces = spaces.filter(
+    (space) => !space.isGlobal() && !space.isSystem()
   );
 
-  for (const vault of filteredVaults) {
-    await softDeleteSpaceAndLaunchScrubWorkflow(auth, vault);
+  for (const space of filteredSpaces) {
+    await softDeleteSpaceAndLaunchScrubWorkflow(auth, space);
   }
 }
 
diff --git a/sdks/js/src/index.ts b/sdks/js/src/index.ts
index 7a3abe869272..0e3ffb44e2a3 100644
--- a/sdks/js/src/index.ts
+++ b/sdks/js/src/index.ts
@@ -366,11 +366,11 @@ export class DustAPI {
       workspaceId,
       appId,
       appHash,
-      appVaultId,
+      appSpaceId,
     }: {
       workspaceId: string;
       appId: string;
-      appVaultId: string;
+      appSpaceId: string;
       appHash: string;
     },
     config: DustAppConfigType,
@@ -379,7 +379,7 @@ export class DustAPI {
       useWorkspaceCredentials: false,
     }
   ): Promise<DustAPIResponse<RunType>> {
-    let url = `${this.apiUrl()}/api/v1/w/${workspaceId}/vaults/${appVaultId}/apps/${appId}/runs`;
+    let url = `${this.apiUrl()}/api/v1/w/${workspaceId}/spaces/${appSpaceId}/apps/${appId}/runs`;
     if (useWorkspaceCredentials) {
       url += "?use_workspace_credentials=true";
     }
@@ -425,11 +425,11 @@ export class DustAPI {
       workspaceId,
       appId,
       appHash,
-      appVaultId,
+      appSpaceId,
     }: {
       workspaceId: string;
       appId: string;
-      appVaultId: string;
+      appSpaceId: string;
       appHash: string;
     },
     config: DustAppConfigType,
@@ -439,7 +439,7 @@ export class DustAPI {
       useWorkspaceCredentials: false,
     }
   ) {
-    let url = `${this.apiUrl()}/api/v1/w/${workspaceId}/vaults/${appVaultId}/apps/${appId}/runs`;
+    let url = `${this.apiUrl()}/api/v1/w/${workspaceId}/spaces/${appSpaceId}/apps/${appId}/runs`;
     if (useWorkspaceCredentials) {
       url += "?use_workspace_credentials=true";
     }
diff --git a/sparkle/src/stories/Breadcrumbs.stories.tsx b/sparkle/src/stories/Breadcrumbs.stories.tsx
index 0b8b4d27c4c5..9220d5301535 100644
--- a/sparkle/src/stories/Breadcrumbs.stories.tsx
+++ b/sparkle/src/stories/Breadcrumbs.stories.tsx
@@ -18,13 +18,13 @@ export default meta;
 export const BreadcrumbsExample = () => {
   const items1 = [
     { label: "Home", href: "#", icon: HomeIcon },
-    { label: "Vaults", href: ".." },
-    { label: "My Vault" },
+    { label: "Spaces", href: ".." },
+    { label: "My Space" },
   ];
   const items2 = [
     { label: "Home", href: "#", icon: HomeIcon },
-    { label: "Vaults", href: "#", icon: CompanyIcon },
-    { label: "My Vault", href: "#" },
+    { label: "Spaces", href: "#", icon: CompanyIcon },
+    { label: "My Space", href: "#" },
     { label: "loooong name in the end, like very very long long" },
   ];
 
@@ -35,7 +35,7 @@ export const BreadcrumbsExample = () => {
       href: "#",
       icon: CompanyIcon,
     },
-    { label: "My Vault", href: "#" },
+    { label: "My Space", href: "#" },
     { label: "Data Sources", href: ".." },
     { label: "Folder1", href: "#", icon: FolderIcon },
     { label: "With ellipsis", href: "#" },
@@ -48,7 +48,7 @@ export const BreadcrumbsExample = () => {
       href: "#",
       icon: CompanyIcon,
     },
-    { label: "My Vault", href: "#" },
+    { label: "My Space", href: "#" },
     { label: "Data Sources" },
     { label: "Folder1", href: "#", icon: FolderIcon },
     { label: "Folder2", href: "#", icon: FolderIcon },
@@ -63,7 +63,7 @@ export const BreadcrumbsExample = () => {
       href: "#",
       icon: CompanyIcon,
     },
-    { label: "My Vault", href: "#" },
+    { label: "My Space", href: "#" },
     { label: "Data Sources" },
   ];
 
diff --git a/types/src/front/api_handlers/public/vaults.ts b/types/src/front/api_handlers/public/spaces.ts
similarity index 100%
rename from types/src/front/api_handlers/public/vaults.ts
rename to types/src/front/api_handlers/public/spaces.ts
diff --git a/types/src/front/data_source_view.ts b/types/src/front/data_source_view.ts
index 952cf9d1b2eb..392d763b4d28 100644
--- a/types/src/front/data_source_view.ts
+++ b/types/src/front/data_source_view.ts
@@ -1,5 +1,5 @@
 import { ModelId } from "../shared/model_id";
-import { DataSourceViewCategory } from "./api_handlers/public/vaults";
+import { DataSourceViewCategory } from "./api_handlers/public/spaces";
 import {
   ConnectorStatusDetails,
   DataSourceType,
diff --git a/types/src/front/groups.ts b/types/src/front/groups.ts
index 248b975b7eaa..3aae5cda1af4 100644
--- a/types/src/front/groups.ts
+++ b/types/src/front/groups.ts
@@ -3,15 +3,15 @@ import { ModelId } from "../shared/model_id";
 /**
  * system group:
  * Accessible by no-one other than our system API keys.
- * Has access to the system Vault which holds the connected data sources.
+ * Has access to the system Space which holds the connected data sources.
  *
  * global group:
  * Contains all users from the workspace.
- * Has access to the global Vault which holds all existing datasource created before vaults.
+ * Has access to the global Space which holds all existing datasource created before spaces.
  *
  * regular group:
  * Contains specific users added by workspace admins.
- * Has access to the list of Vaults configured by workspace admins.
+ * Has access to the list of spaces configured by workspace admins.
  */
 export const GROUP_KINDS = ["regular", "global", "system"] as const;
 export type GroupKind = (typeof GROUP_KINDS)[number];
@@ -30,7 +30,7 @@ export function prettifyGroupName(group: GroupType) {
   if (group.kind === "global") {
     return "Company Data";
   }
-  return group.name.replace("Group for vault ", "");
+  return group.name.replace("Group for Space ", "");
 }
 
 export type GroupType = {
diff --git a/types/src/index.ts b/types/src/index.ts
index b1be3d15df61..2161c635b3c7 100644
--- a/types/src/index.ts
+++ b/types/src/index.ts
@@ -19,7 +19,7 @@ export * from "./front/api_handlers/internal/assistant";
 export * from "./front/api_handlers/internal/spaces";
 export * from "./front/api_handlers/public/assistant";
 export * from "./front/api_handlers/public/data_sources";
-export * from "./front/api_handlers/public/vaults";
+export * from "./front/api_handlers/public/spaces";
 export * from "./front/app";
 export * from "./front/assistant/actions/browse";
 export * from "./front/assistant/actions/dust_app_run";