diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/general/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/general/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/general/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/general/page.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/layout-shell.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/layout-shell.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout-shell.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/layout.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/layout.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/layout.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/models/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/models/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/models/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/models/page.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/page.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/prompts/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/prompts/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/prompts/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/prompts/page.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/public-links/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/public-links/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/public-links/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/public-links/page.tsx
diff --git a/surfsense_web/app/dashboard/[workspace_id]/search-space-settings/team-roles/page.tsx b/surfsense_web/app/dashboard/[workspace_id]/workspace-settings/team-roles/page.tsx
similarity index 100%
rename from surfsense_web/app/dashboard/[workspace_id]/search-space-settings/team-roles/page.tsx
rename to surfsense_web/app/dashboard/[workspace_id]/workspace-settings/team-roles/page.tsx
diff --git a/surfsense_web/atoms/search-spaces/search-space-mutation.atoms.ts b/surfsense_web/atoms/workspaces/workspace-mutation.atoms.ts
similarity index 100%
rename from surfsense_web/atoms/search-spaces/search-space-mutation.atoms.ts
rename to surfsense_web/atoms/workspaces/workspace-mutation.atoms.ts
diff --git a/surfsense_web/atoms/search-spaces/search-space-query.atoms.ts b/surfsense_web/atoms/workspaces/workspace-query.atoms.ts
similarity index 100%
rename from surfsense_web/atoms/search-spaces/search-space-query.atoms.ts
rename to surfsense_web/atoms/workspaces/workspace-query.atoms.ts
diff --git a/surfsense_web/components/layout/ui/dialogs/CreateSearchSpaceDialog.tsx b/surfsense_web/components/layout/ui/dialogs/CreateWorkspaceDialog.tsx
similarity index 100%
rename from surfsense_web/components/layout/ui/dialogs/CreateSearchSpaceDialog.tsx
rename to surfsense_web/components/layout/ui/dialogs/CreateWorkspaceDialog.tsx
diff --git a/surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx b/surfsense_web/components/layout/ui/icon-rail/WorkspaceAvatar.tsx
similarity index 100%
rename from surfsense_web/components/layout/ui/icon-rail/SearchSpaceAvatar.tsx
rename to surfsense_web/components/layout/ui/icon-rail/WorkspaceAvatar.tsx
diff --git a/surfsense_web/components/search-space-form.tsx b/surfsense_web/components/workspace-form.tsx
similarity index 100%
rename from surfsense_web/components/search-space-form.tsx
rename to surfsense_web/components/workspace-form.tsx
diff --git a/surfsense_web/contracts/types/search-space.types.ts b/surfsense_web/contracts/types/workspace.types.ts
similarity index 100%
rename from surfsense_web/contracts/types/search-space.types.ts
rename to surfsense_web/contracts/types/workspace.types.ts
diff --git a/surfsense_web/lib/apis/search-spaces-api.service.ts b/surfsense_web/lib/apis/workspaces-api.service.ts
similarity index 100%
rename from surfsense_web/lib/apis/search-spaces-api.service.ts
rename to surfsense_web/lib/apis/workspaces-api.service.ts
diff --git a/surfsense_web/tests/fixtures/search-space.fixture.ts b/surfsense_web/tests/fixtures/workspace.fixture.ts
similarity index 100%
rename from surfsense_web/tests/fixtures/search-space.fixture.ts
rename to surfsense_web/tests/fixtures/workspace.fixture.ts
diff --git a/surfsense_web/tests/helpers/api/search-spaces.ts b/surfsense_web/tests/helpers/api/workspaces.ts
similarity index 100%
rename from surfsense_web/tests/helpers/api/search-spaces.ts
rename to surfsense_web/tests/helpers/api/workspaces.ts