diff --git a/src/app/common/modals/settings.tsx b/src/app/common/modals/settings.tsx
index 3811718b..586a8fd8 100644
--- a/src/app/common/modals/settings.tsx
+++ b/src/app/common/modals/settings.tsx
@@ -33,9 +33,9 @@ All commands and output will be deleted, and removed from history.  To hide the
 `.trim();
 
 const SessionDeleteMessage = `
-Are you sure you want to delete this session?
+Are you sure you want to delete this workspace?
 
-All commands and output will be deleted, and removed from history.  To hide the session, and retain the commands in history, use 'archive'.
+All commands and output will be deleted, and removed from history.  To hide the workspace, and retain the commands in history, use 'archive'.
 `.trim();
 
 const WebShareConfirmMarkdown = `
@@ -427,7 +427,7 @@ class SessionSettingsModal extends React.Component<{ sessionId: string }, {}> {
                             <div className="settings-label">
                                 <div>Archived</div>
                                 <InfoMessage width={400}>
-                                    Archive will hide the session from the active menu. Commands and output will be
+                                    Archive will hide the workspace from the active menu. Commands and output will be
                                     retained in history.
                                 </InfoMessage>
                             </div>
@@ -439,7 +439,7 @@ class SessionSettingsModal extends React.Component<{ sessionId: string }, {}> {
                             <div className="settings-label">
                                 <div>Actions</div>
                                 <InfoMessage width={400}>
-                                    Delete will remove the session, removing all commands and output from history.
+                                    Delete will remove the workspace, removing all commands and output from history.
                                 </InfoMessage>
                             </div>
                             <div className="settings-input">
@@ -447,7 +447,7 @@ class SessionSettingsModal extends React.Component<{ sessionId: string }, {}> {
                                     onClick={this.handleDeleteSession}
                                     className="button is-prompt-danger is-outlined is-small"
                                 >
-                                    Delete Session
+                                    Delete Workspace
                                 </div>
                             </div>
                         </div>
diff --git a/src/app/history/history.less b/src/app/history/history.less
index 5b22b414..d71a4365 100644
--- a/src/app/history/history.less
+++ b/src/app/history/history.less
@@ -323,7 +323,7 @@
                 margin-right: 1em;
             }
 
-            td.session {
+            td.workspace {
                 flex: 0 0 auto;
                 flex-basis: 120px;
                 text-overflow: ellipsis;
diff --git a/src/app/history/history.tsx b/src/app/history/history.tsx
index 2d7bf397..3f19cde5 100644
--- a/src/app/history/history.tsx
+++ b/src/app/history/history.tsx
@@ -376,7 +376,7 @@ class HistoryView extends React.Component<{}, {}> {
                                 <div onClick={this.toggleSessionDropdown}>
                                     <span className="label">
                                         {hvm.searchSessionId.get() == null
-                                            ? "Limit Session"
+                                            ? "Limit Workspace"
                                             : formatSessionName(snames, hvm.searchSessionId.get())}
                                     </span>
                                     <AngleDownIcon className="icon" />
@@ -388,7 +388,7 @@ class HistoryView extends React.Component<{}, {}> {
                                             key="all"
                                             className="dropdown-item"
                                         >
-                                            (all sessions)
+                                            (all workspaces)
                                         </div>
                                         <For each="sessionId" of={sessionIds}>
                                             <div
@@ -538,7 +538,7 @@ class HistoryView extends React.Component<{}, {}> {
                                     <FavoritesIcon className="icon" />
                                 </td>
                                 <td className="ts">{getHistoryViewTs(nowDate, item.ts)}</td>
-                                <td className="session">{formatSSName(snames, scrnames, item)}</td>
+                                <td className="workspace">{formatSSName(snames, scrnames, item)}</td>
                                 <td className="remote">{formatRemoteName(rnames, item.remote)}</td>
                                 <td className="cmdstr" onClick={() => this.activateItem(item.historyid)}>
                                     <CmdStrCode
diff --git a/src/model/model.ts b/src/model/model.ts
index 61fbe9d7..fc8f73b3 100644
--- a/src/model/model.ts
+++ b/src/model/model.ts
@@ -1981,7 +1981,7 @@ class HistoryViewModel {
             return;
         }
         let prtn = GlobalModel.showAlert({
-            message: "Deleting lines from history also deletes their content from your sessions.",
+            message: "Deleting lines from history also deletes their content from your workspaces.",
             confirm: true,
         });
         prtn.then((result) => {
@@ -3846,13 +3846,7 @@ class CommandRunner {
     }
 
     openCreateRemote(): void {
-        GlobalModel.submitCommand(
-            "remote",
-            "new",
-            null,
-            { nohist: "1", visual: "1" },
-            true
-        );
+        GlobalModel.submitCommand("remote", "new", null, { nohist: "1", visual: "1" }, true);
     }
 
     screenSetRemote(remoteArg: string, nohist: boolean, interactive: boolean): Promise<CommandRtnType> {