diff --git a/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx b/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx
index 167860b3a3..610aee892d 100644
--- a/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx
+++ b/src/cloud/components/molecules/Banner/SubLimitReachedBanner.tsx
@@ -29,8 +29,8 @@ const DocLimitReachedBanner = () => {
       <Banner variant='warning' className='doc__edit__limit'>
         <span className='limit__reached__banner__label'>
           {subscription == null
-            ? `Your workspace exceeds the limit of your current plan. (${freePlanDocLimit} created documents)`
-            : `Your workspace exceeds the limit of your current plan. (${subscription.seats} team members)`}
+            ? `Your space exceeds the limit of your current plan. (${freePlanDocLimit} created documents)`
+            : `Your space exceeds the limit of your current plan. (${subscription.seats} team members)`}
         </span>
         <Button
           variant='primary'
diff --git a/src/cloud/components/organisms/Modal/contents/Import/ImportModalGuide.tsx b/src/cloud/components/organisms/Modal/contents/Import/ImportModalGuide.tsx
index 3aab1b31ca..e6937ab3da 100644
--- a/src/cloud/components/organisms/Modal/contents/Import/ImportModalGuide.tsx
+++ b/src/cloud/components/organisms/Modal/contents/Import/ImportModalGuide.tsx
@@ -65,9 +65,7 @@ const ImportModalGuide = ({
                 , Go to Settings &amp; Members in the left-hand menu and open
                 Settings
               </li>
-              <li>
-                Scroll down to Export, and click Export all workspace content
-              </li>
+              <li>Scroll down to Export, and click Export all space content</li>
               <li>Export file as Markdown or HTML</li>
               <li>Upload files in Boost Note for Teams</li>
             </ol>
diff --git a/src/cloud/components/organisms/Modal/contents/SmartFolder/SmartFolderForm.tsx b/src/cloud/components/organisms/Modal/contents/SmartFolder/SmartFolderForm.tsx
index 030a988954..2a5ac4763e 100644
--- a/src/cloud/components/organisms/Modal/contents/SmartFolder/SmartFolderForm.tsx
+++ b/src/cloud/components/organisms/Modal/contents/SmartFolder/SmartFolderForm.tsx
@@ -198,8 +198,8 @@ const SmartFolderForm = ({
                   </>
                 ) : (
                   <>
-                    The smart folder will become public. Every member on
-                    workspace can see it.
+                    The smart folder will become public. Every member on space
+                    can see it.
                   </>
                 )}
               </p>
diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx
index 4b7c5b5bb3..23efafecf5 100644
--- a/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx
+++ b/src/cloud/components/organisms/Modal/contents/Workspace/CreateWorkspaceModal.tsx
@@ -5,7 +5,7 @@ import WorkspaceModalForm from './WorkspaceModalForm'
 const CreateWorkspaceModal = () => {
   return (
     <ModalContainer style={{ overflow: 'auto' }}>
-      <h2 style={{ margin: 0 }}>Create a Workspace</h2>
+      <h2 style={{ margin: 0 }}>Create a Folder</h2>
       <WorkspaceModalForm />
     </ModalContainer>
   )
diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx
index a0d2a077f7..f43d38b1cb 100644
--- a/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx
+++ b/src/cloud/components/organisms/Modal/contents/Workspace/EditWorkspaceModal.tsx
@@ -9,7 +9,7 @@ interface EditWorkspaceModalProps {
 const EditWorkspaceModal = ({ workspace }: EditWorkspaceModalProps) => {
   return (
     <ModalContainer style={{ overflow: 'auto ' }}>
-      <h2 style={{ margin: 0 }}>Edit your Workspace</h2>
+      <h2 style={{ margin: 0 }}>Edit your Folder</h2>
       <WorkspaceModalForm workspace={workspace} />
     </ModalContainer>
   )
diff --git a/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx b/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx
index 7f5a795142..5dfa408cfc 100644
--- a/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx
+++ b/src/cloud/components/organisms/Modal/contents/Workspace/WorkspaceModalForm.tsx
@@ -141,13 +141,13 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => {
       setSending(true)
       try {
         if (body.name.trim() === '') {
-          throw new Error('Workspace name has to be filled.')
+          throw new Error('Folder name has to be filled.')
         }
         if (workspace != null) {
           await submitEditWorkSpaceHandler(team, workspace, body)
           pushMessage({
             title: 'Success',
-            description: 'Your workspace has been updated',
+            description: 'Your folder has been updated',
             type: 'success',
           })
         } else {
@@ -189,7 +189,7 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => {
         </ModalLine>
         <ModalLine className='svg-initial-style' style={{ marginBottom: 30 }}>
           <StyledModalFormInput
-            placeholder='Workspace name'
+            placeholder='Folder name'
             value={name}
             onChange={onChangeWorkspaceNameHandler}
           />
@@ -202,7 +202,7 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => {
             </ModalLine>
             <ModalLine style={{ marginBottom: 30 }}>
               <span>
-                This default workspace is public and can&apos;t have its access
+                This default folder is public and can&apos;t have its access
                 modified.
               </span>
             </ModalLine>
@@ -216,11 +216,11 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => {
               <Flexbox justifyContent='space-between'>
                 {isPublic ? (
                   <span>
-                    This workspace is public. Anyone from the team can access it
+                    This folder is public. Anyone from the team can access it
                   </span>
                 ) : (
                   <span>
-                    This workspace is private.{' '}
+                    This folder is private.{' '}
                     {isOwner && 'You can set individual member access below.'}
                   </span>
                 )}
@@ -242,7 +242,7 @@ const WorkspaceModalForm = ({ workspace }: WorkspaceModalFormProps) => {
         )}
 
         {!isOwner && (
-          <small>Only the workspace owner can change its access.</small>
+          <small>Only the folder owner can change its access.</small>
         )}
 
         {!isPublic && (
diff --git a/src/cloud/components/organisms/error/ErrorPage.tsx b/src/cloud/components/organisms/error/ErrorPage.tsx
index 724f4c89fb..aa88f845ed 100644
--- a/src/cloud/components/organisms/error/ErrorPage.tsx
+++ b/src/cloud/components/organisms/error/ErrorPage.tsx
@@ -77,7 +77,9 @@ const ErrorPage = ({ error }: ErrorPageProps) => {
                 width: 200,
               }}
             >
-              {currentUser == null ? 'Go to homepage' : 'Go to workspace'}
+              {currentUser == null
+                ? 'Go to homepage'
+                : 'Go back to your default space'}
             </ButtonLink>
           )}
           {currentUser == null && statusCode === 401 && (
diff --git a/src/cloud/components/organisms/settings/TeamSubLimit.tsx b/src/cloud/components/organisms/settings/TeamSubLimit.tsx
index 126987b56e..fa4e702604 100644
--- a/src/cloud/components/organisms/settings/TeamSubLimit.tsx
+++ b/src/cloud/components/organisms/settings/TeamSubLimit.tsx
@@ -41,7 +41,7 @@ const TeamSubLimit = ({
         >
           <h6>Upgrade to go unlimited</h6>
           <p className='note-limit'>
-            Your workspace&apos;s trial of the Pro plan lasts through{' '}
+            Your space&apos;s trial of the Pro plan lasts through{' '}
             {currentSubInfo.info.formattedEndDate}
           </p>
           <p className='note-limit'>
diff --git a/src/cloud/lib/hooks/sidebar/useCloudSidebarDnd.ts b/src/cloud/lib/hooks/sidebar/useCloudSidebarDnd.ts
index 061fee1598..a502a2f777 100644
--- a/src/cloud/lib/hooks/sidebar/useCloudSidebarDnd.ts
+++ b/src/cloud/lib/hooks/sidebar/useCloudSidebarDnd.ts
@@ -43,7 +43,7 @@ export function useCloudSidebarDnd() {
       if (draggedResource.current.result.workspaceId === workspaceId) {
         pushMessage({
           title: 'Oops',
-          description: 'Resource is already present in this workspace',
+          description: 'Resource is already present in this space',
         })
         return
       }
diff --git a/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx b/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx
index a965ba81ee..dd56e18334 100644
--- a/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx
+++ b/src/cloud/lib/hooks/sidebar/useCloudSidebarTree.tsx
@@ -591,7 +591,7 @@ export function useCloudSidebarTree() {
     })
 
     tree.push({
-      label: 'Workspaces',
+      label: 'Folders',
       rows: navTree,
       controls: currentUserIsCoreMember
         ? [
diff --git a/src/cloud/lib/hooks/useCloudResourceModals.tsx b/src/cloud/lib/hooks/useCloudResourceModals.tsx
index 753ec99351..b21154528f 100644
--- a/src/cloud/lib/hooks/useCloudResourceModals.tsx
+++ b/src/cloud/lib/hooks/useCloudResourceModals.tsx
@@ -195,8 +195,8 @@ export function useCloudResourceModals() {
         return
       }
       messageBox({
-        title: `Delete the workspace?`,
-        message: `Are you sure to delete this workspace? You will not be able to revert this action.`,
+        title: `Delete the folder?`,
+        message: `Are you sure to delete this folder? You will not be able to revert this action.`,
         buttons: [
           {
             variant: 'secondary',
diff --git a/src/cloud/lib/hooks/useWorkspaceDelete.ts b/src/cloud/lib/hooks/useWorkspaceDelete.ts
index 2cdc554496..0b45c86f0d 100644
--- a/src/cloud/lib/hooks/useWorkspaceDelete.ts
+++ b/src/cloud/lib/hooks/useWorkspaceDelete.ts
@@ -32,7 +32,7 @@ export function useWorkspaceDelete() {
       pushMessage({
         title: 'Success',
         type: 'success',
-        description: 'Your workspace has been deleted',
+        description: 'Your folder has been deleted',
       })
 
       const workspaceDocs = [...docsMap.values()].filter(
@@ -69,8 +69,8 @@ export function useWorkspaceDelete() {
           return
         }
         messageBox({
-          title: `Delete the workspace?`,
-          message: `Are you sure to delete this workspace? You will not be able to revert this action.`,
+          title: `Delete the folder?`,
+          message: `Are you sure to delete this folder? You will not be able to revert this action.`,
           buttons: [
             {
               variant: 'secondary',
diff --git a/src/cloud/lib/sidebar.ts b/src/cloud/lib/sidebar.ts
index 07a1402db3..cdc1ff9bcd 100644
--- a/src/cloud/lib/sidebar.ts
+++ b/src/cloud/lib/sidebar.ts
@@ -1,7 +1,7 @@
 export const cloudSidebaCategoryLabels = [
   'Bookmarks',
   'Smart Folders',
-  'Workspaces',
+  'Folders',
   'Private',
   'Labels',
   'More',
diff --git a/src/cloud/pages/[teamId]/workspaces/[workspaceId].tsx b/src/cloud/pages/[teamId]/workspaces/[workspaceId].tsx
index 36008e356b..df6d3c1c27 100644
--- a/src/cloud/pages/[teamId]/workspaces/[workspaceId].tsx
+++ b/src/cloud/pages/[teamId]/workspaces/[workspaceId].tsx
@@ -23,7 +23,7 @@ const WorkspaceShowPage = ({
       <Application content={{}}>
         <ColoredBlock variant='danger' style={{ marginTop: '40px' }}>
           <h3>Oops...</h3>
-          <p>The workspace has been deleted.</p>
+          <p>The folder has been deleted.</p>
         </ColoredBlock>
       </Application>
     )
diff --git a/src/components/PreferencesModal/MigrationTab.tsx b/src/components/PreferencesModal/MigrationTab.tsx
index 66aa1d2aa4..e55dc4e79d 100644
--- a/src/components/PreferencesModal/MigrationTab.tsx
+++ b/src/components/PreferencesModal/MigrationTab.tsx
@@ -147,7 +147,7 @@ const MigrationPage = ({ storage }: MigrationPageProps) => {
             </FormSelect>
           </Flexbox>
           <Flexbox justifyContent='space-between'>
-            <p>Workspace</p>
+            <p>Folder</p>
             <div>
               <CloudWorkspaceSelect
                 onChange={selectWorkspace}
diff --git a/src/components/molecules/Export/ExportProgressItem.tsx b/src/components/molecules/Export/ExportProgressItem.tsx
index cae5ef487d..119d4b3d71 100644
--- a/src/components/molecules/Export/ExportProgressItem.tsx
+++ b/src/components/molecules/Export/ExportProgressItem.tsx
@@ -359,10 +359,10 @@ const ExportProgressItem = ({
     const storage = storageMap[workspaceId]
     if (!storage) {
       pushMessage({
-        title: 'Cannot find workspace',
-        description: 'Please check workspace exists and try again later.',
+        title: 'Cannot find folder',
+        description: 'Please check folder exists and try again later.',
       })
-      console.warn('Workspace ID cannot be found: ' + workspaceId)
+      console.warn('Folder ID cannot be found: ' + workspaceId)
       return
     }
 
diff --git a/src/components/organisms/AppNavigator.tsx b/src/components/organisms/AppNavigator.tsx
index d521267ef3..a5b394d875 100644
--- a/src/components/organisms/AppNavigator.tsx
+++ b/src/components/organisms/AppNavigator.tsx
@@ -174,15 +174,15 @@ const TopLevelNavigator = () => {
                       inputRef={inputRef}
                       defaultIcon={mdiMessageQuestion}
                       defaultInputValue={workspace.name}
-                      placeholder='Workspace name'
+                      placeholder='Folder name'
                       submitButtonProps={{
                         label: t('storage.rename'),
                       }}
                       onSubmit={async (workspaceName: string | null) => {
                         if (workspaceName == '' || workspaceName == null) {
                           pushMessage({
-                            title: 'Cannot rename workspace',
-                            description: 'Workspace name should not be empty.',
+                            title: 'Cannot rename folder',
+                            description: 'Folder name should not be empty.',
                           })
                           return
                         }
diff --git a/src/components/organisms/SidebarContainer.tsx b/src/components/organisms/SidebarContainer.tsx
index 708edaabbb..3ef2dfe612 100644
--- a/src/components/organisms/SidebarContainer.tsx
+++ b/src/components/organisms/SidebarContainer.tsx
@@ -153,7 +153,7 @@ const SidebarContainer = ({
           },
           {
             type: 'normal',
-            label: 'Export Workspace',
+            label: 'Export Folder',
             click: () =>
               exportDocuments(workspace, {
                 folderName: workspace.name,
diff --git a/src/components/pages/PouchDbDeprecationPage.tsx b/src/components/pages/PouchDbDeprecationPage.tsx
index 72b83e4571..b4a56c93a0 100644
--- a/src/components/pages/PouchDbDeprecationPage.tsx
+++ b/src/components/pages/PouchDbDeprecationPage.tsx
@@ -29,7 +29,7 @@ const PouchDbDeprecationPage = () => {
               {
                 type: 'button',
                 props: {
-                  label: 'Convert to File System Workspace',
+                  label: 'Convert to File System based Local Space',
                   onClick: () => openTab('storage'),
                 },
               },
@@ -48,7 +48,7 @@ const PouchDbDeprecationPage = () => {
           },
           {
             title:
-              'You can also export the storage by selecting an app navigator tree, clicking on the context menu of workspace item and selecting "Export Workspace".',
+              'You can also export the storage by selecting an app navigator tree, clicking on the context menu of folder item and selecting "Export Folder".',
             description:
               'Follow further export options and instructions to export all of your notes in desired format. Modify export options in Preferences | Export Settings tab.',
           },
diff --git a/src/components/pages/StorageCreatePage.tsx b/src/components/pages/StorageCreatePage.tsx
index c89b8a68c2..5dbf2b4c81 100644
--- a/src/components/pages/StorageCreatePage.tsx
+++ b/src/components/pages/StorageCreatePage.tsx
@@ -17,7 +17,7 @@ const StorageCreatePage = () => {
               style={{ marginRight: 10 }}
               size={16}
             />
-            <span style={{ marginRight: 10 }}>Create Local Workspace</span>
+            <span style={{ marginRight: 10 }}>Create Local Space</span>
           </>
         ),
       }}
diff --git a/src/electron/menu.ts b/src/electron/menu.ts
index f923e5a230..417d4234d4 100644
--- a/src/electron/menu.ts
+++ b/src/electron/menu.ts
@@ -195,59 +195,59 @@ export function getTemplateFromKeymap(
       submenu: [
         {
           type: 'submenu',
-          label: 'Switch Workspace',
+          label: 'Switch Space',
           submenu: [
             {
               type: 'normal',
-              label: 'Switch to First Workspace',
+              label: 'Switch to First Space',
               accelerator: mac ? 'Cmd + 1' : 'Ctrl + 1',
               click: createSwitchWorkspaceHandler(0),
             },
             {
               type: 'normal',
-              label: 'Switch to Second Workspace',
+              label: 'Switch to Second Space',
               accelerator: mac ? 'Cmd + 2' : 'Ctrl + 2',
               click: createSwitchWorkspaceHandler(1),
             },
             {
               type: 'normal',
-              label: 'Switch to Third Workspace',
+              label: 'Switch to Third Space',
               accelerator: mac ? 'Cmd + 3' : 'Ctrl + 3',
               click: createSwitchWorkspaceHandler(2),
             },
             {
               type: 'normal',
-              label: 'Switch to 4th Workspace',
+              label: 'Switch to 4th Space',
               accelerator: mac ? 'Cmd + 4' : 'Ctrl + 4',
               click: createSwitchWorkspaceHandler(3),
             },
             {
               type: 'normal',
-              label: 'Switch to 5th Workspace',
+              label: 'Switch to 5th Space',
               accelerator: mac ? 'Cmd + 5' : 'Ctrl + 5',
               click: createSwitchWorkspaceHandler(4),
             },
             {
               type: 'normal',
-              label: 'Switch to 6th Workspace',
+              label: 'Switch to 6th Space',
               accelerator: mac ? 'Cmd + 6' : 'Ctrl + 6',
               click: createSwitchWorkspaceHandler(5),
             },
             {
               type: 'normal',
-              label: 'Switch to 7th Workspace',
+              label: 'Switch to 7th Space',
               accelerator: mac ? 'Cmd + 7' : 'Ctrl + 7',
               click: createSwitchWorkspaceHandler(6),
             },
             {
               type: 'normal',
-              label: 'Switch to 8th Workspace',
+              label: 'Switch to 8th Space',
               accelerator: mac ? 'Cmd + 8' : 'Ctrl + 8',
               click: createSwitchWorkspaceHandler(7),
             },
             {
               type: 'normal',
-              label: 'Switch to 9th Workspace',
+              label: 'Switch to 9th Space',
               accelerator: mac ? 'Cmd + 9' : 'Ctrl + 9',
               click: createSwitchWorkspaceHandler(8),
             },
diff --git a/src/lib/preferences.ts b/src/lib/preferences.ts
index 467a2fe7fd..1f858de72d 100644
--- a/src/lib/preferences.ts
+++ b/src/lib/preferences.ts
@@ -55,7 +55,7 @@ export interface Preferences {
   'general.noteSorting': NoteSortingOptions
   'general.enableAnalytics': boolean
 
-  // Cloud Workspace
+  // Cloud Space
   'cloud.user': {
     id: string
     uniqueName: string
diff --git a/src/lib/v2/hooks/local/useLocalDnd.ts b/src/lib/v2/hooks/local/useLocalDnd.ts
index 1d1e8179de..3df42bdc6b 100644
--- a/src/lib/v2/hooks/local/useLocalDnd.ts
+++ b/src/lib/v2/hooks/local/useLocalDnd.ts
@@ -30,7 +30,7 @@ export function useLocalDnd() {
       if (draggedResource.current.result._id === workspaceId) {
         pushMessage({
           title: 'Oops',
-          description: 'Resource is already present in this workspace',
+          description: 'Resource is already present in this space',
         })
         return
       }
diff --git a/src/lib/v2/hooks/local/useLocalUI.tsx b/src/lib/v2/hooks/local/useLocalUI.tsx
index 42004180d7..8f1133556c 100644
--- a/src/lib/v2/hooks/local/useLocalUI.tsx
+++ b/src/lib/v2/hooks/local/useLocalUI.tsx
@@ -74,8 +74,8 @@ export function useLocalUI() {
           onSubmit={async (workspaceName: string) => {
             if (workspaceName == '') {
               pushMessage({
-                title: 'Cannot rename workspace',
-                description: 'Workspace name should not be empty.',
+                title: 'Cannot rename folder',
+                description: 'Folder name should not be empty.',
               })
               closeModalAndUpdateState()
               return
diff --git a/src/lib/v2/mappers/local/sidebarTree.tsx b/src/lib/v2/mappers/local/sidebarTree.tsx
index d4cb26c9da..16a733b384 100644
--- a/src/lib/v2/mappers/local/sidebarTree.tsx
+++ b/src/lib/v2/mappers/local/sidebarTree.tsx
@@ -136,7 +136,7 @@ export function mapTreeControls(
   return [
     {
       type: MenuTypes.Normal,
-      label: 'Export Workspace',
+      label: 'Export Folder',
       icon: mdiExport,
       onClick: () =>
         exportDocuments(workspace, {
@@ -447,7 +447,7 @@ export function mapTree(
     })
   }
   tree.push({
-    label: 'Workspace',
+    label: 'Folder',
     rows: navTree,
     controls: [
       {