diff --git a/packages/frontend-core/src/components/sheet/lib/websocket.js b/packages/frontend-core/src/components/sheet/lib/websocket.js
index d71cfb0290..fe9b1c05e6 100644
--- a/packages/frontend-core/src/components/sheet/lib/websocket.js
+++ b/packages/frontend-core/src/components/sheet/lib/websocket.js
@@ -10,7 +10,7 @@ export const createWebsocket = context => {
   const host = location.hostname
   const port = location.port || (tls ? 443 : 80)
   const socket = io(`${proto}//${host}:${port}`, {
-    path: "/socket/dataspace",
+    path: "/socket/spreadsheet",
     // Cap reconnection attempts to 3 (total of 15 seconds before giving up)
     reconnectionAttempts: 3,
     // Delay reconnection attempt by 5 seconds
@@ -20,12 +20,12 @@ export const createWebsocket = context => {
     timeout: 4000,
   })
 
-  const connectToDataspace = tableId => {
+  const connectToTable = tableId => {
     if (!socket.connected) {
       return
     }
-    // Identify which dataspace we are editing
-    socket.emit("select-dataspace", tableId, response => {
+    // Identify which table we are editing
+    socket.emit("select-table", tableId, response => {
       // handle initial connection info
       users.set(response.users)
       userId.set(response.id)
@@ -34,7 +34,7 @@ export const createWebsocket = context => {
 
   // Event handlers
   socket.on("connect", () => {
-    connectToDataspace(get(tableId))
+    connectToTable(get(tableId))
   })
   socket.on("row-update", data => {
     if (data.id) {
@@ -52,7 +52,7 @@ export const createWebsocket = context => {
   })
 
   // Change websocket connection when dataspace changes
-  tableId.subscribe(connectToDataspace)
+  tableId.subscribe(connectToTable)
 
   // Notify selected cell changes
   focusedCellId.subscribe($focusedCellId => {
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 21737d975a..1801bcd208 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -2,7 +2,7 @@ import { quotas } from "@budibase/pro"
 import * as internal from "./internal"
 import * as external from "./external"
 import { isExternalTable } from "../../../integrations/utils"
-import { dataspaceSocket } from "../../../websockets"
+import { spreadsheetSocket } from "../../../websockets"
 import { Ctx } from "@budibase/types"
 import * as utils from "./utils"
 
@@ -50,7 +50,7 @@ export async function patch(ctx: any): Promise<any> {
     ctx.body = row
 
     // Notify websocket change
-    dataspaceSocket.emit("row-update", { id: row._id })
+    spreadsheetSocket.emit("row-update", { id: row._id })
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -75,7 +75,7 @@ export const save = async (ctx: any) => {
   ctx.body = row
 
   // Notify websocket change
-  dataspaceSocket.emit("row-update", { id: row._id })
+  spreadsheetSocket.emit("row-update", { id: row._id })
 }
 export async function fetchView(ctx: any) {
   const tableId = getTableId(ctx)
@@ -115,7 +115,7 @@ export async function destroy(ctx: any) {
     for (let row of rows) {
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
       // Notify websocket change
-      dataspaceSocket.emit("row-update", { id: row._id })
+      spreadsheetSocket.emit("row-update", { id: row._id })
     }
   } else {
     let resp = await quotas.addQuery(() => pickApi(tableId).destroy(ctx), {
@@ -126,7 +126,7 @@ export async function destroy(ctx: any) {
     row = resp.row
     ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:delete`, appId, row)
     // Notify websocket change
-    dataspaceSocket.emit("row-update", { id: row._id })
+    spreadsheetSocket.emit("row-update", { id: row._id })
   }
   ctx.status = 200
   // for automations include the row that was deleted
diff --git a/packages/server/src/websockets/index.ts b/packages/server/src/websockets/index.ts
index 551044ef8e..6995989151 100644
--- a/packages/server/src/websockets/index.ts
+++ b/packages/server/src/websockets/index.ts
@@ -1,14 +1,14 @@
 import http from "http"
 import Koa from "koa"
-import DataspaceSocket from "./dataspace"
+import SpreadsheetSocket from "./spreadsheet"
 import ClientAppSocket from "./client"
 
 let clientAppSocket: ClientAppSocket
-let dataspaceSocket: DataspaceSocket
+let spreadsheetSocket: SpreadsheetSocket
 
 export const initialise = (app: Koa, server: http.Server) => {
   clientAppSocket = new ClientAppSocket(app, server)
-  dataspaceSocket = new DataspaceSocket(app, server)
+  spreadsheetSocket = new SpreadsheetSocket(app, server)
 }
 
-export { clientAppSocket, dataspaceSocket }
+export { clientAppSocket, spreadsheetSocket }
diff --git a/packages/server/src/websockets/dataspace.ts b/packages/server/src/websockets/spreadsheet.ts
similarity index 81%
rename from packages/server/src/websockets/dataspace.ts
rename to packages/server/src/websockets/spreadsheet.ts
index ca245f7c06..1372f194a6 100644
--- a/packages/server/src/websockets/dataspace.ts
+++ b/packages/server/src/websockets/spreadsheet.ts
@@ -4,19 +4,19 @@ import { permissions } from "@budibase/backend-core"
 import http from "http"
 import Koa from "koa"
 
-export default class DataspaceSocket extends Socket {
+export default class SpreadsheetSocket extends Socket {
   constructor(app: Koa, server: http.Server) {
-    super(app, server, "/socket/dataspace", [authorized(permissions.BUILDER)])
+    super(app, server, "/socket/spreadsheet", [authorized(permissions.BUILDER)])
 
     this.io.on("connection", socket => {
       const user = socket.data.user
-      console.log(`Dataspace user connected: ${user?.id}`)
+      console.log(`Spreadsheet user connected: ${user?.id}`)
 
       // Socket state
       let currentRoom: string
 
-      // Initial identification of connected dataspace
-      socket.on("select-dataspace", async (tableId, callback) => {
+      // Initial identification of connected spreadsheet
+      socket.on("select-table", async (tableId, callback) => {
         // Leave current room
         if (currentRoom) {
           socket.to(currentRoom).emit("user-disconnect", socket.data.user)