diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 8b95d9c2f3..f596b60101 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -38,7 +38,7 @@ export async function handleRequest<T extends Operation>(
 }
 
 export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
 
   const { _id, ...rowData } = ctx.request.body
   const table = await sdk.tables.getTable(tableId)
@@ -93,7 +93,7 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
 }
 
 export async function destroy(ctx: UserCtx) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const _id = ctx.request.body._id
   const { row } = await handleRequest(Operation.DELETE, tableId, {
     id: breakRowIdField(_id),
@@ -104,7 +104,7 @@ export async function destroy(ctx: UserCtx) {
 
 export async function bulkDestroy(ctx: UserCtx) {
   const { rows } = ctx.request.body
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   let promises: Promise<{ row: Row; table: Table }>[] = []
   for (let row of rows) {
     promises.push(
@@ -123,7 +123,7 @@ export async function bulkDestroy(ctx: UserCtx) {
 
 export async function fetchEnrichedRow(ctx: UserCtx) {
   const id = ctx.params.rowId
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const { datasourceId, tableName } = breakExternalTableId(tableId)
   const datasource: Datasource = await sdk.datasources.get(datasourceId)
   if (!datasource || !datasource.entities) {
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 237c30cc88..17cc9dc339 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -47,7 +47,7 @@ export async function patch(
   ctx: UserCtx<PatchRowRequest, PatchRowResponse>
 ): Promise<any> {
   const appId = ctx.appId
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const body = ctx.request.body
 
   // if it doesn't have an _id then its save
@@ -72,7 +72,7 @@ export async function patch(
 
 export const save = async (ctx: UserCtx<Row, Row>) => {
   const appId = ctx.appId
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const body = ctx.request.body
 
   // user metadata doesn't exist yet - don't allow creation
@@ -98,7 +98,7 @@ export const save = async (ctx: UserCtx<Row, Row>) => {
 }
 
 export async function fetchView(ctx: any) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const viewName = decodeURIComponent(ctx.params.viewName)
 
   const { calculation, group, field } = ctx.query
@@ -111,12 +111,12 @@ export async function fetchView(ctx: any) {
 }
 
 export async function fetch(ctx: any) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   ctx.body = await sdk.rows.fetch(tableId)
 }
 
 export async function find(ctx: UserCtx<void, GetRowResponse>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const rowId = ctx.params.rowId
 
   ctx.body = await sdk.rows.find(tableId, rowId)
@@ -132,7 +132,7 @@ function isDeleteRow(input: any): input is DeleteRow {
 
 async function processDeleteRowsRequest(ctx: UserCtx<DeleteRowRequest>) {
   let request = ctx.request.body as DeleteRows
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
 
   const processedRows = request.rows.map(row => {
     let processedRow: Row = typeof row == "string" ? { _id: row } : row
@@ -148,7 +148,7 @@ async function processDeleteRowsRequest(ctx: UserCtx<DeleteRowRequest>) {
 }
 
 async function deleteRows(ctx: UserCtx<DeleteRowRequest>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const appId = ctx.appId
 
   let deleteRequest = ctx.request.body as DeleteRows
@@ -170,7 +170,7 @@ async function deleteRows(ctx: UserCtx<DeleteRowRequest>) {
 
 async function deleteRow(ctx: UserCtx<DeleteRowRequest>) {
   const appId = ctx.appId
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
 
   const resp = await pickApi(tableId).destroy(ctx)
   if (!tableId.includes("datasource_plus")) {
@@ -204,7 +204,7 @@ export async function destroy(ctx: UserCtx<DeleteRowRequest>) {
 }
 
 export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
 
   await context.ensureSnippetContext(true)
 
@@ -226,7 +226,7 @@ export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
 }
 
 export async function validate(ctx: Ctx<Row, ValidateResponse>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   // external tables are hard to validate currently
   if (isExternalTableID(tableId)) {
     ctx.body = { valid: true, errors: {} }
@@ -239,14 +239,14 @@ export async function validate(ctx: Ctx<Row, ValidateResponse>) {
 }
 
 export async function fetchEnrichedRow(ctx: UserCtx<void, Row>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx)
 }
 
 export const exportRows = async (
   ctx: Ctx<ExportRowsRequest, ExportRowsResponse>
 ) => {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
 
   const format = ctx.query.format
 
@@ -279,7 +279,7 @@ export const exportRows = async (
 export async function downloadAttachment(ctx: UserCtx) {
   const { columnName } = ctx.params
 
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const rowId = ctx.params.rowId
   const row = await sdk.rows.find(tableId, rowId)
 
diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts
index 6b9d03f4ef..47540baca3 100644
--- a/packages/server/src/api/controllers/row/internal.ts
+++ b/packages/server/src/api/controllers/row/internal.ts
@@ -23,7 +23,7 @@ import { getLinkedTableIDs } from "../../../db/linkedRows/linkUtils"
 import { flatten } from "lodash"
 
 export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const inputs = ctx.request.body
   const isUserTable = tableId === InternalTables.USER_METADATA
   let oldRow
@@ -97,7 +97,7 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
 
 export async function destroy(ctx: UserCtx) {
   const db = context.getAppDB()
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const { _id } = ctx.request.body
   let row = await db.get<Row>(_id)
   let _rev = ctx.request.body._rev || row._rev
@@ -136,7 +136,7 @@ export async function destroy(ctx: UserCtx) {
 }
 
 export async function bulkDestroy(ctx: UserCtx) {
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const table = await sdk.tables.getTable(tableId)
   let { rows } = ctx.request.body
 
@@ -178,7 +178,7 @@ export async function bulkDestroy(ctx: UserCtx) {
 export async function fetchEnrichedRow(ctx: UserCtx) {
   const fieldName = ctx.request.query.field as string | undefined
   const db = context.getAppDB()
-  const tableId = utils.getTableId(ctx)
+  const tableId = utils.getSourceId(ctx)
   const rowId = ctx.params.rowId as string
   // need table to work out where links go in row, as well as the link docs
   const [table, links] = await Promise.all([
diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index 911cfe8d5b..f52385c73c 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -78,7 +78,7 @@ export async function findRow(tableId: string, rowId: string) {
   return row
 }
 
-export function getTableId(ctx: Ctx): string {
+export function getSourceId(ctx: Ctx): string {
   // top priority, use the URL first
   if (ctx.params?.sourceId) {
     return ctx.params.sourceId
diff --git a/packages/server/src/middleware/trimViewRowInfo.ts b/packages/server/src/middleware/trimViewRowInfo.ts
index 4c382e6123..cdcddf2cc9 100644
--- a/packages/server/src/middleware/trimViewRowInfo.ts
+++ b/packages/server/src/middleware/trimViewRowInfo.ts
@@ -2,13 +2,13 @@ import { Ctx, Row } from "@budibase/types"
 import * as utils from "../db/utils"
 import sdk from "../sdk"
 import { Next } from "koa"
-import { getTableId } from "../api/controllers/row/utils"
+import { getSourceId } from "../api/controllers/row/utils"
 
 export default async (ctx: Ctx<Row>, next: Next) => {
   const { body } = ctx.request
   let { _viewId: viewId } = body
 
-  const possibleViewId = getTableId(ctx)
+  const possibleViewId = getSourceId(ctx)
   if (utils.isViewID(possibleViewId)) {
     viewId = possibleViewId
   }
diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts
index 979a0bf125..a36413454e 100644
--- a/packages/server/src/websockets/grid.ts
+++ b/packages/server/src/websockets/grid.ts
@@ -4,7 +4,7 @@ import { BaseSocket } from "./websocket"
 import { auth, permissions } from "@budibase/backend-core"
 import http from "http"
 import Koa from "koa"
-import { getTableId } from "../api/controllers/row/utils"
+import { getSourceId } from "../api/controllers/row/utils"
 import { Row, Table, View, ViewV2 } from "@budibase/types"
 import { Socket } from "socket.io"
 import { GridSocketEvent } from "@budibase/shared-core"
@@ -80,7 +80,7 @@ export default class GridSocket extends BaseSocket {
   }
 
   emitRowUpdate(ctx: any, row: Row) {
-    const resourceId = ctx.params?.viewId || getTableId(ctx)
+    const resourceId = ctx.params?.viewId || getSourceId(ctx)
     const room = `${ctx.appId}-${resourceId}`
     this.emitToRoom(ctx, room, GridSocketEvent.RowChange, {
       id: row._id,
@@ -89,7 +89,7 @@ export default class GridSocket extends BaseSocket {
   }
 
   emitRowDeletion(ctx: any, row: Row) {
-    const resourceId = ctx.params?.viewId || getTableId(ctx)
+    const resourceId = ctx.params?.viewId || getSourceId(ctx)
     const room = `${ctx.appId}-${resourceId}`
     this.emitToRoom(ctx, room, GridSocketEvent.RowChange, {
       id: row._id,