diff --git a/package.json b/package.json
index ec3f7fb81..2e205104f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289",
+        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1b689ea46..4d925c43a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
         specifier: ^1.1.24
         version: 1.1.24(svelte@5.25.3)(zod@3.24.3)
       '@appwrite.io/console':
-        specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289
-        version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289
+        specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d
+        version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d
       '@appwrite.io/pink-icons':
         specifier: 0.25.0
         version: 0.25.0
@@ -260,8 +260,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289':
-    resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289}
+  '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d':
+    resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d}
     version: 1.9.0
 
   '@appwrite.io/pink-icons-svelte@2.0.0-RC.1':
@@ -2551,8 +2551,8 @@ packages:
   loupe@3.1.3:
     resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
 
-  loupe@3.2.0:
-    resolution: {integrity: sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==}
+  loupe@3.1.4:
+    resolution: {integrity: sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==}
 
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
@@ -3653,7 +3653,7 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289': {}
+  '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@7813f3d': {}
 
   '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)':
     dependencies:
@@ -5046,7 +5046,7 @@ snapshots:
   '@vitest/utils@3.2.4':
     dependencies:
       '@vitest/pretty-format': 3.2.4
-      loupe: 3.2.0
+      loupe: 3.1.4
       tinyrainbow: 2.0.0
 
   '@vue/compiler-core@3.5.13':
@@ -6186,7 +6186,7 @@ snapshots:
 
   loupe@3.1.3: {}
 
-  loupe@3.2.0: {}
+  loupe@3.1.4: {}
 
   lru-cache@10.4.3: {}
 
diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index d9c86e0d9..e3ac82596 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -148,9 +148,9 @@ export enum Click {
     ConnectRepositoryClick = 'click_connect_repository',
     CreditsRedeemClick = 'click_credits_redeem',
     CloudSignupClick = 'click_cloud_signup',
-    DatabaseAttributeDelete = 'click_attribute_delete',
+    DatabaseColumnDelete = 'click_column_delete',
     DatabaseIndexDelete = 'click_index_delete',
-    DatabaseCollectionDelete = 'click_collection_delete',
+    DatabaseTableDelete = 'click_table_delete',
     DatabaseDatabaseDelete = 'click_database_delete',
     DatabaseImportCsv = 'click_database_import_csv',
     DomainCreateClick = 'click_domain_create',
@@ -273,22 +273,22 @@ export enum Submit {
     DatabaseDelete = 'submit_database_delete',
     DatabaseUpdateName = 'submit_database_update_name',
     DatabaseImportCsv = 'submit_database_import_csv',
-    AttributeCreate = 'submit_attribute_create',
-    AttributeUpdate = 'submit_attribute_update',
-    AttributeDelete = 'submit_attribute_delete',
-    DocumentCreate = 'submit_document_create',
-    DocumentDelete = 'submit_document_delete',
-    DocumentUpdate = 'submit_document_update',
-    DocumentUpdatePermissions = 'submit_document_update_permissions',
+    ColumnCreate = 'submit_column_create',
+    ColumnUpdate = 'submit_column_update',
+    ColumnDelete = 'submit_column_delete',
+    RowCreate = 'submit_row_create',
+    RowDelete = 'submit_row_delete',
+    RowUpdate = 'submit_row_update',
+    RowUpdatePermissions = 'submit_row_update_permissions',
     IndexCreate = 'submit_index_create',
     IndexDelete = 'submit_index_delete',
-    CollectionCreate = 'submit_collection_create',
-    CollectionDelete = 'submit_collection_delete',
-    CollectionUpdateName = 'submit_collection_update_name',
-    CollectionUpdatePermissions = 'submit_collection_update_permissions',
-    CollectionUpdateSecurity = 'submit_collection_update_security',
-    CollectionUpdateEnabled = 'submit_collection_update_enabled',
-    CollectionUpdateDisplayNames = 'submit_collection_update_display_names',
+    TableCreate = 'submit_row_create',
+    TableDelete = 'submit_row_delete',
+    TableUpdateName = 'submit_row_update_name',
+    TableUpdatePermissions = 'submit_row_update_permissions',
+    TableUpdateSecurity = 'submit_row_update_security',
+    TableUpdateEnabled = 'submit_row_update_enabled',
+    TableUpdateDisplayNames = 'submit_row_update_display_names',
     FunctionCreate = 'submit_function_create',
     FunctionDelete = 'submit_function_delete',
     FunctionUpdateName = 'submit_function_update_name',
diff --git a/src/lib/commandCenter/commands.ts b/src/lib/commandCenter/commands.ts
index b191b892f..fa8427d30 100644
--- a/src/lib/commandCenter/commands.ts
+++ b/src/lib/commandCenter/commands.ts
@@ -28,10 +28,10 @@ const groups = [
     'integrations',
     'migrations',
     'users',
-    'collections',
-    'attributes',
+    'tables',
+    'columns',
     'indexes',
-    'documents',
+    'rows',
     'teams',
     'security',
     'buckets',
diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte
index 58407c678..5181a99a2 100644
--- a/src/lib/commandCenter/panels/ai.svelte
+++ b/src/lib/commandCenter/panels/ai.svelte
@@ -27,7 +27,7 @@
     const examples = [
         'How to add platform in the console?',
         'How can I manage users, permissions, and access control in Appwrite?',
-        'How can I set up database collections and documents in Appwrite?',
+        'How can I set up database tables and rows in Appwrite?',
         'How do I configure and manage server-side functions in Appwrite?',
         'How to add custom domain in the console?'
     ];
diff --git a/src/lib/commandCenter/panels/createAttribute.svelte b/src/lib/commandCenter/panels/createColumn.svelte
similarity index 58%
rename from src/lib/commandCenter/panels/createAttribute.svelte
rename to src/lib/commandCenter/panels/createColumn.svelte
index 98d312698..3a3cea77f 100644
--- a/src/lib/commandCenter/panels/createAttribute.svelte
+++ b/src/lib/commandCenter/panels/createColumn.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-    import { initCreateAttribute } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
-    import { attributeOptions } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store';
+    import { initCreateColumn } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte';
+    import { columnOptions } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store';
     import Template from './template.svelte';
 
     let search = '';
 
-    let options = attributeOptions.map((option) => {
+    let options = columnOptions.map((option) => {
         return {
             label: option.name,
             icon: option.icon,
             callback() {
-                initCreateAttribute(option.name);
+                initCreateColumn(option.name);
             }
         };
     });
diff --git a/src/lib/commandCenter/panels/index.ts b/src/lib/commandCenter/panels/index.ts
index a3a139fb3..8d5aebfc6 100644
--- a/src/lib/commandCenter/panels/index.ts
+++ b/src/lib/commandCenter/panels/index.ts
@@ -37,16 +37,16 @@ export const DatabasesPanel: SubPanel = {
     component: Databases
 };
 
-import Collections from './collections.svelte';
-export const CollectionsPanel: SubPanel = {
-    name: 'Collections',
-    component: Collections
+import Tables from './tables.svelte';
+export const TablesPanel: SubPanel = {
+    name: 'Tables',
+    component: Tables
 };
 
-import CreateAttribute from './createAttribute.svelte';
-export const CreateAttributePanel: SubPanel = {
-    name: 'Create Attribute',
-    component: CreateAttribute
+import CreateColumn from './createColumn.svelte';
+export const CreateColumnPanel: SubPanel = {
+    name: 'Create Column',
+    component: CreateColumn
 };
 
 import Users from './users.svelte';
diff --git a/src/lib/commandCenter/panels/collections.svelte b/src/lib/commandCenter/panels/tables.svelte
similarity index 59%
rename from src/lib/commandCenter/panels/collections.svelte
rename to src/lib/commandCenter/panels/tables.svelte
index 140d2e6ba..8fb86e37b 100644
--- a/src/lib/commandCenter/panels/collections.svelte
+++ b/src/lib/commandCenter/panels/tables.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { initSearcher } from '../commands';
-    import { collectionsSearcher } from '../searchers';
+    import { tablesSearcher } from '../searchers';
     import Template from './template.svelte';
 
-    const { search, results } = initSearcher(collectionsSearcher);
+    const { search, results } = initSearcher(tablesSearcher);
 </script>
 
 <Template options={$results} bind:search={$search} />
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
deleted file mode 100644
index c3ffaebe9..000000000
--- a/src/lib/commandCenter/searchers/collections.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { goto } from '$app/navigation';
-import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store';
-import { get } from 'svelte/store';
-import type { Searcher } from '../commands';
-import { sdk } from '$lib/stores/sdk';
-import { base } from '$app/paths';
-import { page } from '$app/state';
-
-export const collectionsSearcher = (async (query: string) => {
-    const databaseId = get(database).$id;
-    const { collections } = await sdk
-        .forProject(page.params.region, page.params.project)
-        .databases.listCollections(databaseId);
-
-    return collections
-        .filter((col) => col.name.toLowerCase().includes(query.toLowerCase()))
-        .map(
-            (col) =>
-                ({
-                    group: 'collections',
-                    label: col.name,
-                    callback: () => {
-                        goto(
-                            `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${col.$id}`
-                        );
-                    }
-                }) as const
-        );
-}) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index f50a1474d..6775bfd4a 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -8,7 +8,7 @@ import { page } from '$app/state';
 export const dbSearcher = (async (query: string) => {
     const { databases } = await sdk
         .forProject(page.params.region, page.params.project)
-        .databases.list();
+        .grids.listDatabases();
 
     return databases
         .filter((db) => db.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/commandCenter/searchers/index.ts b/src/lib/commandCenter/searchers/index.ts
index 0f78e8c90..d4461c2a1 100644
--- a/src/lib/commandCenter/searchers/index.ts
+++ b/src/lib/commandCenter/searchers/index.ts
@@ -1,7 +1,7 @@
 export * from './databases';
 export * from './users';
 export * from './organizations';
-export * from './collections';
+export * from './tables';
 export * from './projects';
 export * from './teams';
 export * from './functions';
diff --git a/src/lib/commandCenter/searchers/tables.ts b/src/lib/commandCenter/searchers/tables.ts
new file mode 100644
index 000000000..8beff8e05
--- /dev/null
+++ b/src/lib/commandCenter/searchers/tables.ts
@@ -0,0 +1,27 @@
+import { goto } from '$app/navigation';
+import type { Searcher } from '../commands';
+import { sdk } from '$lib/stores/sdk';
+import { base } from '$app/paths';
+import { page } from '$app/state';
+
+export const tablesSearcher = (async (query: string) => {
+    const databaseId = page.params.database;
+    const { tables } = await sdk
+        .forProject(page.params.region, page.params.project)
+        .grids.listTables(databaseId);
+
+    return tables
+        .filter((table) => table.name.toLowerCase().includes(query.toLowerCase()))
+        .map(
+            (table) =>
+                ({
+                    group: 'tables',
+                    label: table.name,
+                    callback: () => {
+                        goto(
+                            `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${table.$id}`
+                        );
+                    }
+                }) as const
+        );
+}) satisfies Searcher;
diff --git a/src/lib/components/backupRestoreBox.svelte b/src/lib/components/backupRestoreBox.svelte
index 1598341f7..2f660985e 100644
--- a/src/lib/components/backupRestoreBox.svelte
+++ b/src/lib/components/backupRestoreBox.svelte
@@ -57,6 +57,7 @@
     }
 
     function updateOrAddItem(payload: Payload) {
+        // todo: @itznotabug - might need a change to $table?
         const { $id, status, $collection, policyId } = payload;
         if ($collection === 'archives' && policyId !== null) {
             return;
@@ -117,9 +118,9 @@
     }
 
     function backupName(item: BackupArchive | BackupRestoration, key: string) {
-        const attribute = key === 'archives' ? '$createdAt' : 'startedAt';
+        const column = key === 'archives' ? '$createdAt' : 'startedAt';
 
-        return toLocaleDate(item[attribute]);
+        return toLocaleDate(item[column]);
     }
 
     onMount(() => {
diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte
index 43dbbeebd..a93ee23bf 100644
--- a/src/lib/components/columnSelector.svelte
+++ b/src/lib/components/columnSelector.svelte
@@ -16,14 +16,14 @@
 
     let {
         columns,
-        isCustomCollection = false,
+        isCustomTable = false,
         ui = 'legacy',
         allowNoColumns = false,
         showAnyway = false,
         children
     }: {
         columns: Writable<Column[]>;
-        isCustomCollection?: boolean;
+        isCustomTable?: boolean;
         allowNoColumns?: boolean;
         ui?: 'legacy' | 'new';
         showAnyway?: boolean;
@@ -44,7 +44,6 @@
 
     let maxHeight = $state('none');
     let containerRef = $state<HTMLElement>(null);
-    const collectionId = $derived(page.params.collection);
     const isNewStyle = ui === 'new';
 
     const calcMaxHeight = () => {
@@ -60,16 +59,16 @@
     const saveColumnPreferences = () => {
         const shownColumns = $columns.filter((n) => n.hide === true).map((n) => n.id);
 
-        if (isCustomCollection) {
-            preferences.setCustomCollectionColumns(collectionId, shownColumns);
+        if (isCustomTable) {
+            preferences.setCustomTableColumns(page.params.table, shownColumns);
         } else {
             preferences.setColumns(shownColumns);
         }
     };
 
     onMount(() => {
-        if (isCustomCollection) {
-            const shownColumns = preferences.getCustomCollectionColumns(collectionId);
+        if (isCustomTable) {
+            const shownColumns = preferences.getCustomTableColumns(page.params.table);
 
             columns.update((n) =>
                 n.map((column) => {
@@ -244,8 +243,9 @@
     </Popover>
 {/if}
 
+<!-- svelte-ignore css_unused_selector -->
 <style lang="scss">
-     /* global because its on a tooltip slot, nested */
+    /* global because its on a tooltip slot, nested */
     :global(.actions-menu-wrapper) {
         overflow: scroll;
         margin-bottom: -0.35rem;
diff --git a/src/lib/components/csvImportBox.svelte b/src/lib/components/csvImportBox.svelte
index 26a70c4c8..a92553e89 100644
--- a/src/lib/components/csvImportBox.svelte
+++ b/src/lib/components/csvImportBox.svelte
@@ -13,7 +13,7 @@
 
     type ImportItem = {
         status: string;
-        collection?: string;
+        table?: string;
     };
 
     type ImportItemsMap = Map<string, ImportItem>;
@@ -22,15 +22,11 @@
      * Keeps a track of the active and ongoing csv migrations.
      *
      * The structure is as follows -
-     * `{ migrationId: { status: status, collection: collection } }`
+     * `{ migrationId: { status: status, table: table } }`
      */
     const importItems: Writable<ImportItemsMap> = writable(new Map());
 
-    async function showCompletionNotification(
-        database: string,
-        collection: string,
-        payload: Payload
-    ) {
+    async function showCompletionNotification(database: string, table: string, payload: Payload) {
         const isSuccess = payload.status === 'completed';
         const isError = !isSuccess && !!payload.errors;
 
@@ -48,20 +44,20 @@
 
         const type = isSuccess ? 'success' : 'error';
         const message = isError ? errorMessage : 'CSV import finished successfully.';
-        const url = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${database}/collection-${collection}`;
+        const url = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${database}/table-${table}`;
 
         addNotification({
             type,
             message,
             isHtml: true,
             buttons:
-                isSuccess && collection !== page.params.collection
-                    ? [{ name: 'View documents', method: () => goto(url) }]
+                isSuccess && table !== page.params.table
+                    ? [{ name: 'View rows', method: () => goto(url) }]
                     : undefined
         });
 
         if (isSuccess) {
-            await invalidate(Dependencies.DOCUMENTS);
+            await invalidate(Dependencies.ROWS);
         }
     }
 
@@ -70,19 +66,19 @@
 
         const status = importData.status;
         const resourceId = importData.resourceId ?? '';
-        const [databaseId, collectionId] = resourceId.split(':') ?? [];
+        const [databaseId, tableId] = resourceId.split(':') ?? [];
 
         const current = $importItems.get(importData.$id);
-        let collectionName = current?.collection ?? null;
+        let tableName = current?.table ?? null;
 
-        if (!collectionName && collectionId) {
+        if (!tableName && tableId) {
             try {
-                const collection = await sdk
+                const table = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .databases.getCollection(databaseId, collectionId);
-                collectionName = collection.name;
+                    .grids.getTable(databaseId, tableId);
+                tableName = table.name;
             } catch {
-                collectionName = null;
+                tableName = null;
             }
         }
 
@@ -99,12 +95,12 @@
             if (shouldSkip) return items;
 
             const next = new Map(items);
-            next.set(importData.$id, { status, collection: collectionName ?? undefined });
+            next.set(importData.$id, { status, table: tableName ?? undefined });
             return next;
         });
 
         if (status === 'completed' || status === 'failed') {
-            await showCompletionNotification(databaseId, collectionId, importData);
+            await showCompletionNotification(databaseId, tableId, importData);
         }
     }
 
@@ -172,7 +168,7 @@
             <header class="upload-box-header">
                 <h4 class="upload-box-title">
                     <Typography.Text variant="m-500">
-                        Importing documents ({$importItems.size})
+                        Importing rows ({$importItems.size})
                     </Typography.Text>
                 </h4>
                 <button
@@ -198,7 +194,7 @@
                                 <div
                                     class="progress-bar-top-line u-flex u-gap-8 u-main-space-between">
                                     <Typography.Text>
-                                        {@html text(value.status, value.collection)}
+                                        {@html text(value.status, value.table)}
                                     </Typography.Text>
                                 </div>
                                 <div
diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte
index db94a7142..a96f47467 100644
--- a/src/lib/components/eventModal.svelte
+++ b/src/lib/components/eventModal.svelte
@@ -26,10 +26,10 @@
         ...services.flatMap((s) => s.actions.map((a) => a.name)),
         ...services.flatMap((s) => s.resources.flatMap((r) => r.actions.map((a) => a.name)))
     ];
-    const attributeNames = [
-        ...services.flatMap((s) => s.actions.flatMap((a) => a.attributes ?? [])),
+    const columnNames = [
+        ...services.flatMap((s) => s.actions.flatMap((a) => a.columns ?? [])),
         ...services.flatMap((s) =>
-            s.resources.flatMap((r) => r.actions.flatMap((a) => a.attributes ?? []))
+            s.resources.flatMap((r) => r.actions.flatMap((a) => a.columns ?? []))
         )
     ];
 
@@ -37,7 +37,7 @@
     const isService = (s: string) => serviceNames.includes(s);
     const isResource = (s: string) => resourceNames.includes(s);
     const isAction = (s: string) => actionNames.includes(s);
-    const isAttribute = (s: string) => attributeNames.includes(s);
+    const isColumn = (s: string) => columnNames.includes(s);
 
     const dispatch = createEventDispatcher();
 
@@ -69,7 +69,7 @@
             case 'service': {
                 selected.resource = null;
                 selected.action = null;
-                selected.attribute = null;
+                selected.column = null;
                 break;
             }
             case 'resource': {
@@ -79,25 +79,25 @@
 
                 // We need to check if the selected action name is still
                 // on the available list, and if so, change the action to the
-                // appropriate one, as it may contain different attributes
+                // appropriate one, as it may contain different attributes/columns.
                 const availableAction = availableActions.find(
                     (a) => a.name === selected.action?.name
                 );
 
                 if (!availableAction) {
                     selected.action = null;
-                    selected.attribute = null;
+                    selected.column = null;
                 } else {
                     selected.action = availableAction;
 
-                    if (!selected?.action?.attributes?.includes(selected.attribute)) {
-                        selected.attribute = null;
+                    if (!selected?.action?.columns?.includes(selected.column)) {
+                        selected.column = null;
                     }
                 }
                 break;
             }
             case 'action': {
-                selected.attribute = null;
+                selected.column = null;
                 break;
             }
         }
@@ -113,16 +113,13 @@
             if (isService(field)) {
                 selected.service = services.find((s) => s.name === field);
             } else if (isResource(field)) {
-                const resource = selected.service?.resources.find((r) => r.name === field);
-                selected.resource = resource;
+                selected.resource = selected.service?.resources.find((r) => r.name === field);
             } else if (isAction(field)) {
-                const action =
+                selected.action =
                     selected.resource?.actions.find((a) => a.name === field) ||
                     selected.service?.actions.find((a) => a.name === field);
-                selected.action = action;
-            } else if (isAttribute(field)) {
-                const attribute = selected.action?.attributes?.find((a) => a === field);
-                selected.attribute = attribute;
+            } else if (isColumn(field)) {
+                selected.column = selected.action?.columns?.find((a) => a === field);
             }
         }
     }
@@ -143,7 +140,7 @@
         const secondToLastField = at(fields, index - 2);
 
         if (index === 0 || isService(currField)) return 'service';
-        if (isAttribute(currField) || isAction(prevField)) return 'attribute';
+        if (isColumn(currField) || isAction(prevField)) return 'attribute';
         if (isAction(currField)) return 'action';
         if (isResource(currField)) return 'resource';
         if (isService(prevField) || isResource(prevField) || index === 1) {
@@ -182,7 +179,7 @@
         service: null as EventService | null,
         resource: null as EventResource | null,
         action: null as EventAction | null,
-        attribute: null as string | null
+        column: null as string | null
     };
     let helper: string = null;
     let customInput: string = null;
@@ -198,7 +195,7 @@
         services: services,
         resources: selected.service?.resources || [],
         actions: (selected.resource ? selected.resource?.actions : selected.service?.actions) || [],
-        attributes: selected.action?.attributes || []
+        columns: selected.action?.columns || []
     };
 
     $: eventString = (function createEventString(): Array<{ value: string; description: string }> {
@@ -212,8 +209,8 @@
             if (selected.service) {
                 fields.push(selected.service.name, '*');
             }
-            if (selected.resource?.name === 'documents') {
-                fields.push('collections', '*');
+            if (selected.resource?.name === 'rows') {
+                fields.push('tables', '*');
             }
             if (selected.resource) {
                 fields.push(selected.resource.name, '*');
@@ -221,8 +218,8 @@
             if (selected.action) {
                 fields.push(selected.action.name);
             }
-            if (selected.attribute) {
-                fields.push(selected.attribute);
+            if (selected.column) {
+                fields.push(selected.column);
             }
         }
 
@@ -290,14 +287,14 @@
         </Layout.Stack>
     {/if}
 
-    {#if !empty(available.attributes)}
+    {#if !empty(available.columns)}
         <Layout.Stack gap="s">
             <Typography.Text variant="m-500">Choose an attribute (optional)</Typography.Text>
             <Layout.Stack gap="s" wrap="wrap" direction="row">
-                {#each available.attributes as attribute}
+                {#each available.columns as attribute}
                     <Pill
                         disabled={showInput}
-                        selected={selected.attribute === attribute}
+                        selected={selected.column === attribute}
                         button
                         on:click={() => select('attribute', attribute)}>
                         {attribute}
diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte
index df2d78f78..bcb681cdd 100644
--- a/src/lib/components/filePicker.svelte
+++ b/src/lib/components/filePicker.svelte
@@ -499,7 +499,7 @@
                                                             size="s"
                                                             event="empty_documentation"
                                                             href="https://appwrite.io/docs/products/storage/upload-download"
-                                                            ariaLabel="create document"
+                                                            ariaLabel="upload download"
                                                             >Documentation</Button>
                                                         <Button
                                                             secondary
@@ -526,7 +526,7 @@
                                             size="s"
                                             event="empty_documentation"
                                             href="https://appwrite.io/docs/products/storage/buckets"
-                                            ariaLabel="create document">Documentation</Button>
+                                            ariaLabel="create buckets">Documentation</Button>
 
                                         <Button
                                             secondary
diff --git a/src/lib/components/filters/store.ts b/src/lib/components/filters/store.ts
index d3df550ce..0ea1a603b 100644
--- a/src/lib/components/filters/store.ts
+++ b/src/lib/components/filters/store.ts
@@ -12,8 +12,8 @@ export type TagValue = {
 };
 
 export type Operator = {
-    toTag: (attribute: string, input?: string | number | string[], type?: string) => TagValue;
-    toQuery: (attribute: string, input?: string | number | string[]) => string;
+    toTag: (column: string, input?: string | number | string[], type?: string) => TagValue;
+    toQuery: (column: string, input?: string | number | string[]) => string;
     types: ColumnType[];
     hideInput?: boolean;
 };
@@ -134,7 +134,7 @@ export enum ValidTypes {
 const operatorsDefault = new Map<
     ValidOperators,
     {
-        query: (attr: string, input: string | number | string[]) => string;
+        query: (col: string, input: string | number | string[]) => string;
         types: ColumnType[];
         hideInput?: boolean;
     }
@@ -249,8 +249,8 @@ export function generateDefaultOperators() {
     operatorsDefault.forEach((operator, operatorName) => {
         operators[operatorName] = {
             toQuery: operator.query,
-            toTag: (attribute, input = null, type = null) => {
-                return generateTag(attribute, operatorName, input, type);
+            toTag: (column, input = null, type = null) => {
+                return generateTag(column, operatorName, input, type);
             },
             types: operator.types,
             hideInput: operator.hideInput
@@ -259,24 +259,24 @@ export function generateDefaultOperators() {
     return operators;
 }
 
-export function generateTag(attribute: string, operatorName: string, input = null, type = null) {
+export function generateTag(column: string, operatorName: string, input = null, type = null) {
     if (input === null) {
         return {
             value: '',
-            tag: `**${attribute}** ${operatorName}`
+            tag: `**${column}** ${operatorName}`
         };
     } else if (Array.isArray(input) && input.length > 2) {
         return {
             value: input,
-            tag: `**${attribute}** ${operatorName} **${formatArray(input)}** `
+            tag: `**${column}** ${operatorName} **${formatArray(input)}** `
         };
     } else if (type === ValidTypes.Datetime) {
         return {
             value: input,
-            tag: `**${attribute}** ${operatorName} **${toLocaleDateTime(input.toString())}**`
+            tag: `**${column}** ${operatorName} **${toLocaleDateTime(input.toString())}**`
         };
     } else {
-        return { value: input, tag: `**${attribute}** ${operatorName} **${input}**` };
+        return { value: input, tag: `**${column}** ${operatorName} **${input}**` };
     }
 }
 
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index 166165cff..acc49851c 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -84,4 +84,4 @@ export { default as UsageCard } from './usageCard.svelte';
 export { default as ViewToggle } from './viewToggle.svelte';
 export { default as RegionEndpoint } from './regionEndpoint.svelte';
 export { default as ExpirationInput } from './expirationInput.svelte';
-export { default as SortButton } from './sortButton.svelte';
+export { default as SortButton, type SortDirection } from './sortButton.svelte';
diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte
index 26fe7670c..cb3c0053a 100644
--- a/src/lib/components/viewSelector.svelte
+++ b/src/lib/components/viewSelector.svelte
@@ -11,7 +11,7 @@
     export let ui: 'legacy' | 'new' = 'legacy';
     export let columns: Writable<Column[]>;
     export let view: View;
-    export let isCustomCollection = false;
+    export let isCustomTable = false;
     export let hideView = false;
     export let hideColumns = false;
     export let allowNoColumns = false;
@@ -19,7 +19,7 @@
 </script>
 
 {#if !hideColumns && view === View.Table}
-    <ColumnSelector {columns} {isCustomCollection} {allowNoColumns} {ui} {showAnyway}>
+    <ColumnSelector {columns} {isCustomTable} {allowNoColumns} {ui} {showAnyway}>
         {#snippet children(toggle, selectedColumnsNumber)}
             <Button.Button
                 size="s"
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 7414a2ffa..52775197c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -38,9 +38,9 @@ export enum Dependencies {
     MEMBERSHIPS = 'dependency:memberships',
     DATABASE = 'dependency:database',
     DATABASES = 'dependency:databases',
-    COLLECTION = 'dependency:collection',
-    DOCUMENT = 'dependency:document',
-    DOCUMENTS = 'dependency:documents',
+    TABLE = 'dependency:table',
+    ROW = 'dependency:row',
+    ROWS = 'dependency:rows',
     BUCKET = 'dependency:bucket',
     FILE = 'dependency:file',
     FILE_TOKENS = 'dependency:file_tokens',
@@ -64,7 +64,7 @@ export enum Dependencies {
     WEBHOOK = 'dependency:webhook',
     WEBHOOKS = 'dependency:webhooks',
     MIGRATIONS = 'dependency:migrations',
-    COLLECTIONS = 'dependency:collections',
+    TABLES = 'dependency:tables',
     BACKUPS = 'dependency:backups',
     RUNTIMES = 'dependency:runtimes',
     CONSOLE_VARIABLES = 'dependency:console_variables',
@@ -92,6 +92,8 @@ export const defaultScopes: string[] = [
     'teams.write',
     'documents.read',
     'documents.write',
+    'rows.read',
+    'rows.write',
     'files.read',
     'files.write',
     'projects.read',
@@ -111,6 +113,8 @@ export const defaultScopes: string[] = [
     'databases.write',
     'collections.read',
     'collections.write',
+    'tables.read',
+    'tables.write',
     'buckets.read',
     'buckets.write',
     'functions.read',
@@ -141,6 +145,8 @@ export const defaultScopes: string[] = [
 
 export const defaultRoles: string[] = ['owner'];
 
+// these are kept for backwards compatibility with keys and events that already exists.
+// for the new ones, we use the new terminology.
 export const scopes: {
     scope: string;
     description: string;
@@ -201,6 +207,18 @@ export const scopes: {
         category: 'Database',
         icon: 'database'
     },
+    {
+        scope: 'tables.read',
+        description: "Access to read your project's database tables",
+        category: 'Database',
+        icon: 'database'
+    },
+    {
+        scope: 'tables.write',
+        description: "Access to create, update, and delete your project's database tables",
+        category: 'Database',
+        icon: 'database'
+    },
     {
         scope: 'attributes.read',
         description: "Access to read your project's database collection's attributes",
@@ -214,6 +232,18 @@ export const scopes: {
         category: 'Database',
         icon: 'database'
     },
+    {
+        scope: 'columns.read',
+        description: "Access to read your project's database table's columns",
+        category: 'Database',
+        icon: 'database'
+    },
+    {
+        scope: 'columns.write',
+        description: "Access to create, update, and delete your project's database table's columns",
+        category: 'Database',
+        icon: 'database'
+    },
     {
         scope: 'indexes.read',
         description: "Access to read your project's database collection's indexes",
@@ -239,6 +269,18 @@ export const scopes: {
         category: 'Database',
         icon: 'database'
     },
+    {
+        scope: 'rows.read',
+        description: "Access to read your project's database rows",
+        category: 'Database',
+        icon: 'database'
+    },
+    {
+        scope: 'rows.write',
+        description: "Access to create, update, and delete your project's database rows",
+        category: 'Database',
+        icon: 'database'
+    },
     {
         scope: 'files.read',
         description: "Access to read your project's storage files and preview images",
@@ -430,7 +472,7 @@ export type EventResource = {
 
 export type EventAction = {
     name: string;
-    attributes?: string[];
+    columns?: string[];
 };
 
 export const eventServices: Array<EventService> = [
@@ -448,11 +490,11 @@ export const eventServices: Array<EventService> = [
         name: 'databases',
         resources: [
             {
-                name: 'collections',
+                name: 'tables',
                 actions: [{ name: 'create' }, { name: 'update' }, { name: 'delete' }]
             },
             {
-                name: 'documents',
+                name: 'rows',
                 actions: [{ name: 'create' }, { name: 'update' }, { name: 'delete' }]
             }
         ],
@@ -479,7 +521,7 @@ export const eventServices: Array<EventService> = [
                 name: 'memberships',
                 actions: [
                     { name: 'create' },
-                    { name: 'update', attributes: ['status'] },
+                    { name: 'update', columns: ['status'] },
                     { name: 'delete' }
                 ]
             }
@@ -495,7 +537,7 @@ export const eventServices: Array<EventService> = [
         ],
         actions: [
             { name: 'create' },
-            { name: 'update', attributes: ['email', 'name', 'password', 'status', 'prefs'] },
+            { name: 'update', columns: ['email', 'name', 'password', 'status', 'prefs'] },
             { name: 'delete' }
         ]
     },
diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts
index 33d624a0b..64de355f8 100644
--- a/src/lib/helpers/faker.ts
+++ b/src/lib/helpers/faker.ts
@@ -1,32 +1,26 @@
 import { faker } from '@faker-js/faker';
-import type { Attributes } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store';
+import type { Columns } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store';
 import type { Models } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 
-export async function generateAttributes(
+export async function generateColumns(
     project: Models.Project,
     databaseId: string,
     collectionId: string
-): Promise<Attributes[]> {
+): Promise<Columns[]> {
     const client = sdk.forProject(project.region, project.$id);
 
     return await Promise.all([
-        client.databases.createStringAttribute(databaseId, collectionId, 'name', 255, false),
-        client.databases.createEmailAttribute(databaseId, collectionId, 'email', false),
-        client.databases.createIntegerAttribute(databaseId, collectionId, 'age', false, 0, 150),
-        client.databases.createStringAttribute(databaseId, collectionId, 'city', 100, false),
-        client.databases.createStringAttribute(
-            databaseId,
-            collectionId,
-            'description',
-            1000,
-            false
-        ),
-        client.databases.createBooleanAttribute(databaseId, collectionId, 'active', false)
+        client.grids.createStringColumn(databaseId, collectionId, 'name', 255, false),
+        client.grids.createEmailColumn(databaseId, collectionId, 'email', false),
+        client.grids.createIntegerColumn(databaseId, collectionId, 'age', false, 0, 150),
+        client.grids.createStringColumn(databaseId, collectionId, 'city', 100, false),
+        client.grids.createStringColumn(databaseId, collectionId, 'description', 1000, false),
+        client.grids.createBooleanColumn(databaseId, collectionId, 'active', false)
     ]);
 }
 
-export function generateFakeDocuments(columns: Attributes[], count: number): object[] {
+export function generateFakeRecords(columns: Columns[], count: number): object[] {
     if (count <= 0) return [];
 
     const filteredColumns = columns.filter((col) => col.type !== 'relationship');
@@ -46,7 +40,7 @@ export function generateFakeDocuments(columns: Attributes[], count: number): obj
         const document: object = {};
 
         for (const column of filteredColumns) {
-            document[column.key] = generateValueForAttribute(column);
+            document[column.key] = generateValueForColumn(column);
         }
 
         return document;
@@ -75,23 +69,23 @@ function generateStringValue(key: string, maxLength: number): string {
     return text.length <= maxLength ? text : text.substring(0, maxLength);
 }
 
-function generateValueForAttribute(attribute: Attributes): string | number | boolean | null {
+function generateValueForColumn(attribute: Columns): string | number | boolean | null {
     switch (attribute.type) {
         case 'string': {
-            const stringAttr = attribute as Models.AttributeString;
+            const stringAttr = attribute as Models.ColumnString;
             const maxLength = Math.min(stringAttr.size ?? 255, 1000);
             return generateStringValue(attribute.key, maxLength);
         }
 
         case 'integer': {
-            const intAttr = attribute as Models.AttributeInteger;
+            const intAttr = attribute as Models.ColumnInteger;
             const min = intAttr.min ?? 0;
             const max = intAttr.max ?? 1000000;
             return faker.number.int({ min, max });
         }
 
         case 'float': {
-            const floatAttr = attribute as Models.AttributeFloat;
+            const floatAttr = attribute as Models.ColumnFloat;
             const min = floatAttr.min ?? 0;
             const max = floatAttr.max ?? 1000000;
             const precision = 2;
@@ -121,7 +115,7 @@ function generateValueForAttribute(attribute: Attributes): string | number | boo
         }
 
         case 'enum': {
-            const enumAttr = attribute as Models.AttributeEnum;
+            const enumAttr = attribute as Models.ColumnEnum;
             if (enumAttr.elements && enumAttr.elements.length > 0) {
                 return faker.helpers.arrayElement(enumAttr.elements);
             }
diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index c33adf668..9498cadd7 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -43,6 +43,8 @@
         users: 1,
         executions: 1
     };
+
+    // TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
     const limitedServices = [
         { name: 'bandwidth', value: bandwidth },
         { name: 'documents', value: documents },
diff --git a/src/lib/layout/displaySettingsModal.svelte b/src/lib/layout/displaySettingsModal.svelte
index 7d6004deb..77f2568e3 100644
--- a/src/lib/layout/displaySettingsModal.svelte
+++ b/src/lib/layout/displaySettingsModal.svelte
@@ -13,14 +13,14 @@
         view = $bindable(),
         columns,
         hideColumns = false,
-        isCustomCollection = false
+        isCustomTable = false
     }: {
         show?: boolean;
         hideView?: boolean;
         view?: View;
         columns?: Writable<Column[]>;
         hideColumns?: boolean;
-        isCustomCollection?: boolean;
+        isCustomTable?: boolean;
     } = $props();
 </script>
 
@@ -35,7 +35,7 @@
         {#if !hideColumns && $columns?.length}
             <Layout.Stack gap="xs">
                 <Typography.Text>Columns</Typography.Text>
-                <ColumnSelector {columns} {isCustomCollection}>
+                <ColumnSelector {columns} {isCustomTable}>
                     {#snippet children(toggle, selectedColumnsNumber)}
                         <Button.Button
                             size="s"
diff --git a/src/lib/layout/gridHeader.svelte b/src/lib/layout/gridHeader.svelte
index 9b66018bb..c3532f1e0 100644
--- a/src/lib/layout/gridHeader.svelte
+++ b/src/lib/layout/gridHeader.svelte
@@ -8,7 +8,7 @@
     export let title: string;
     export let columns: Writable<Column[]>;
     export let view: View;
-    export let isCustomCollection = false;
+    export let isCustomTable = false;
     export let hideView = false;
     export let hideColumns = false;
     export let allowNoColumns = false;
@@ -17,13 +17,7 @@
 <header class="grid-header">
     <Typography.Title size="m">{title}</Typography.Title>
     <div class="u-flex u-gap-16 u-contents-mobile">
-        <ViewSelector
-            {view}
-            {columns}
-            {isCustomCollection}
-            {hideView}
-            {hideColumns}
-            {allowNoColumns} />
+        <ViewSelector {view} {columns} {isCustomTable} {hideView} {hideColumns} {allowNoColumns} />
         <div class="grid-header-col-2">
             <slot />
         </div>
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index a0fb2013f..2159ab768 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -366,6 +366,8 @@ export async function checkForUsageLimit(org: Organization) {
             return;
         }
     }
+
+    // TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
     const { bandwidth, documents, executions, storage, users } = org?.billingLimits ?? {};
     const resources = [
         { value: bandwidth, name: 'bandwidth' },
@@ -378,6 +380,7 @@ export async function checkForUsageLimit(org: Organization) {
     const members = org.total;
     const plan = get(currentPlan);
     const membersOverflow =
+        // `plan` can be null on `onboarding/create-organization` route.
         // nested null checks needed: GitHub Education plan have empty addons.
         members > plan?.addons?.seats?.limit
             ? members - (plan?.addons?.seats?.limit || members)
diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts
index dcb4a6088..2164ab2a1 100644
--- a/src/lib/stores/migration.ts
+++ b/src/lib/stores/migration.ts
@@ -9,7 +9,7 @@ const initialFormData = {
     },
     databases: {
         root: false,
-        documents: false
+        rows: false
     },
     functions: {
         root: false,
@@ -45,18 +45,19 @@ export const ResourcesFriendly = {
     'environment-variable': { singular: 'Environment Variable', plural: 'Environment Variables' },
     deployment: { singular: 'Deployment', plural: 'Deployments' },
     database: { singular: 'Database', plural: 'Databases' },
-    collection: { singular: 'Collection', plural: 'Collections' },
+    table: { singular: 'Table', plural: 'Tables' },
     index: { singular: 'Index', plural: 'Indexes' },
-    attribute: { singular: 'Attribute', plural: 'Attributes' },
-    document: { singular: 'Document', plural: 'Documents' }
+    column: { singular: 'Column', plural: 'Columns' },
+    row: { singular: 'Row', plural: 'Rows' }
 };
 
 const resources = Object.keys(ResourcesFriendly);
 
 type Resource = (typeof resources)[number];
 
+// @todo: @itznotabug - check if other resources are correct and work fine!
 export const providerResources: Record<Provider, Resource[]> = {
-    appwrite: [...resources],
+    appwrite: [...resources], // new terminology, others are ok?
     supabase: [
         'user',
         'database',
@@ -91,12 +92,12 @@ export const migrationFormToResources = (
     }
     if (formData.databases.root) {
         addResource('database');
-        addResource('collection');
-        addResource('attribute');
-        addResource('index');
+        addResource('table');
+        addResource('column');
+        addResource('columnIndex');
     }
-    if (formData.databases.documents) {
-        addResource('document');
+    if (formData.databases.rows) {
+        addResource('row');
     }
     if (formData.functions.root) {
         addResource('function');
@@ -150,8 +151,8 @@ export const resourcesToMigrationForm = (
     if (resources.includes('database')) {
         formData.databases.root = true;
     }
-    if (includesAll(resources, ['collection', 'attribute', 'document'])) {
-        formData.databases.documents = true;
+    if (includesAll(resources, ['table', 'column', 'row'])) {
+        formData.databases.rows = true;
     }
     if (resources.includes('function') && isVersionAtLeast(version, '1.4.0')) {
         formData.functions.root = true;
diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index 6a9550042..79f218d8f 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -42,6 +42,7 @@ export type OrganizationList = {
     total: number;
 };
 
+// TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
 export type BillingLimits = {
     bandwidth: number;
     documents: number;
diff --git a/src/lib/stores/preferences.ts b/src/lib/stores/preferences.ts
index eb4303102..975749a5d 100644
--- a/src/lib/stores/preferences.ts
+++ b/src/lib/stores/preferences.ts
@@ -22,9 +22,13 @@ type TeamPreferences = {
 
 type PreferencesStore = {
     [key: string]: Preferences;
+    // kept for backwards compatibility
     collections?: {
         [key: string]: Preferences['columns'];
     };
+    tables?: {
+        [key: string]: Preferences['columns'];
+    };
     displayNames?: {
         [key: string]: TeamPreferences['names'];
     };
@@ -126,8 +130,8 @@ function createPreferences() {
                 }
             );
         },
-        getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
-            return preferences?.collections?.[collectionId] ?? [];
+        getCustomTableColumns: (tableId: string): Preferences['columns'] => {
+            return preferences?.tables?.[tableId] ?? preferences?.collections?.[tableId] ?? [];
         },
         setLimit: (limit: Preferences['limit']) =>
             updateAndSync((n) => {
@@ -168,14 +172,14 @@ function createPreferences() {
 
                 return n;
             }),
-        setCustomCollectionColumns: (collectionId: string, columns: Preferences['columns']) =>
+        setCustomTableColumns: (tableId: string, columns: Preferences['columns']) =>
             updateAndSync((n) => {
-                if (!n?.collections?.[collectionId]) {
-                    n ??= {};
-                    n.collections ??= {};
-                }
+                n ??= {};
+                n.tables ??= {};
 
-                n.collections[collectionId] = Array.from(new Set(columns));
+                n.tables[tableId] = Array.from(new Set(columns));
+                // let's not double save
+                // n.collections[tableId] = Array.from(new Set(columns));
                 return n;
             }),
         loadTeamPrefs: loadTeamPreferences,
@@ -184,7 +188,7 @@ function createPreferences() {
         },
         setDisplayNames: async (
             orgId: string,
-            collectionId: string,
+            tableId: string,
             names: TeamPreferences['names']
         ) => {
             let teamPrefs: Models.Preferences;
@@ -195,7 +199,7 @@ function createPreferences() {
                 }
 
                 teamPrefs = n;
-                n.displayNames[collectionId] = names;
+                n.displayNames[tableId] = names;
 
                 return n;
             });
diff --git a/src/lib/stores/roles.ts b/src/lib/stores/roles.ts
index 99f4594d6..b3db98272 100644
--- a/src/lib/stores/roles.ts
+++ b/src/lib/stores/roles.ts
@@ -19,13 +19,15 @@ export const canWritePlatforms = derived(scopes, ($scopes) => $scopes.includes('
 export const canWriteTargets = derived(scopes, ($scopes) => $scopes.includes('targets.write'));
 export const canWriteUsers = derived(scopes, ($scopes) => $scopes.includes('users.write'));
 export const canWriteTeams = derived(scopes, ($scopes) => $scopes.includes('teams.write'));
-export const canWriteCollections = derived(scopes, ($scopes) =>
-    $scopes.includes('collections.write')
-);
+export const canWriteTables = derived(scopes, ($scopes) => {
+    return $scopes.includes('tables.write') || $scopes.includes('collections.write');
+});
 export const canWriteSites = derived(scopes, ($scopes) => $scopes.includes('sites.write'));
 export const canWriteDomains = derived(scopes, ($scopes) => $scopes.includes('domains.write')); //TODO: check if correct
 
-export const canWriteDocuments = derived(scopes, ($scopes) => $scopes.includes('documents.write'));
+export const canWriteRows = derived(scopes, ($scopes) => {
+    return $scopes.includes('rows.write') || $scopes.includes('documents.write');
+});
 export const canWriteExecutions = derived(scopes, ($scopes) =>
     $scopes.includes('executions.write')
 );
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 79f726cce..66352c8ad 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -5,7 +5,6 @@ import {
     Avatars,
     Client,
     Console,
-    Databases,
     Functions,
     Health,
     Locale,
@@ -21,6 +20,7 @@ import {
     Vcs,
     Sites,
     Tokens,
+    Grids,
     Domains
 } from '@appwrite.io/console';
 import { Billing } from '../sdk/billing';
@@ -108,7 +108,6 @@ const sdkForProject = {
     account: new Account(clientProject),
     avatars: new Avatars(clientProject),
     backups: new Backups(clientProject),
-    databases: new Databases(clientProject),
     functions: new Functions(clientProject),
     health: new Health(clientProject),
     locale: new Locale(clientProject),
@@ -122,7 +121,8 @@ const sdkForProject = {
     vcs: new Vcs(clientProject),
     proxy: new Proxy(clientProject),
     migrations: new Migrations(clientProject),
-    sites: new Sites(clientProject)
+    sites: new Sites(clientProject),
+    grids: new Grids(clientProject)
 };
 
 export const realtime = {
diff --git a/src/routes/(console)/organization-[organization]/members/+page.ts b/src/routes/(console)/organization-[organization]/members/+page.ts
index 6f03ce677..29ff1d5a6 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.ts
+++ b/src/routes/(console)/organization-[organization]/members/+page.ts
@@ -7,6 +7,7 @@ import type { PageLoad } from './$types';
 export const load: PageLoad = async ({ url, params, route, depends }) => {
     depends(Dependencies.ORGANIZATION);
     depends(Dependencies.MEMBERS);
+
     const page = getPage(url);
     const search = getSearch(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
diff --git a/src/routes/(console)/project-[region]-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte
index 3f5197414..047998b91 100644
--- a/src/routes/(console)/project-[region]-[project]/+error.svelte
+++ b/src/routes/(console)/project-[region]-[project]/+error.svelte
@@ -6,6 +6,7 @@
     import { capitalize } from '$lib/helpers/string';
     import { currentPlan } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
+
     function getResource(id: string) {
         id = id.replace('/(console)/project-[region]-[project]/', '');
         let parts = id.split('/');
@@ -39,6 +40,7 @@
             >{'status' in page.error
                 ? page.error.status || 'Invalid Argument'
                 : 'Invalid Argument'}</Typography.Title>
-        <p class="body-text-2 u-bold u-margin-block-start-4">{page.error.message}</p>
+
+        <Typography.Title>{page.error.message}</Typography.Title>
     {/if}
 </Container>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index 35841ef15..5be2d24b3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -50,7 +50,7 @@ async function fetchDatabasesAndBackups(
 
     const databases = await sdk
         .forProject(params.region, params.project)
-        .databases.list(
+        .grids.listDatabases(
             [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
             search || undefined
         );
diff --git a/src/routes/(console)/project-[region]-[project]/databases/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
index fbdb3d341..4582de8a6 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/create.svelte
@@ -81,7 +81,8 @@
             const databaseId = id ? id : ID.unique();
             const database = await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.create(databaseId, name);
+                .grids.createDatabase(databaseId, name);
+
             await createPolicies(databaseId);
 
             showCreate = false;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index d743680f2..5053513f9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -8,13 +8,13 @@
         registerSearchers,
         updateCommandGroupRanks
     } from '$lib/commandCenter';
-    import { collectionsSearcher } from '$lib/commandCenter/searchers';
+    import { tablesSearcher } from '$lib/commandCenter/searchers';
     import { Dependencies } from '$lib/constants';
     import type { Models } from '@appwrite.io/console';
-    import CreateCollection from './createCollection.svelte';
+    import CreateTable from './createTable.svelte';
     import { showCreate } from './store';
-    import { CollectionsPanel } from '$lib/commandCenter/panels';
-    import { canWriteCollections, canWriteDatabases } from '$lib/stores/roles';
+    import { TablesPanel } from '$lib/commandCenter/panels';
+    import { canWriteTables, canWriteDatabases } from '$lib/stores/roles';
     import { showCreateBackup, showCreatePolicy } from './backups/store';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import { currentPlan } from '$lib/stores/organization';
@@ -23,17 +23,17 @@
     const project = page.params.project;
     const databaseId = page.params.database;
 
-    async function handleCreate(event: CustomEvent<Models.Collection>) {
+    async function handleCreate(event: CustomEvent<Models.Table>) {
         $showCreate = false;
         await invalidate(Dependencies.DATABASE);
         await goto(
-            `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
+            `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/table-${event.detail.$id}`
         );
     }
 
     $: $registerCommands([
         {
-            label: 'Create collection',
+            label: 'Create table',
             callback() {
                 $showCreate = true;
                 if (!page.url.pathname.endsWith(databaseId)) {
@@ -43,7 +43,7 @@
                 }
             },
             keys: page.url.pathname.endsWith(databaseId) ? ['c'] : ['c', 'c'],
-            disabled: page.url.pathname.includes('collection-') || !$canWriteCollections,
+            disabled: page.url.pathname.includes('table-') || !$canWriteTables,
             group: 'databases',
             icon: IconPlus
         },
@@ -80,14 +80,14 @@
             disabled: !isCloud || !$currentPlan.backupsEnabled
         },
         {
-            label: 'Go to collections',
+            label: 'Go to tables',
             callback() {
                 goto(
                     `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}`
                 );
             },
             disabled:
-                page.url.pathname.endsWith(databaseId) || page.url.pathname.includes('collection-'),
+                page.url.pathname.endsWith(databaseId) || page.url.pathname.includes('table-'),
             keys: ['g', 'c'],
             group: 'databases'
         },
@@ -98,8 +98,7 @@
                     `${base}/project-${page.params.region}-${project}/databases/database-${databaseId}/usage`
                 );
             },
-            disabled:
-                page.url.pathname.includes('/usage') || page.url.pathname.includes('collection-'),
+            disabled: page.url.pathname.includes('/usage') || page.url.pathname.includes('table-'),
             keys: ['g', 'u'],
             group: 'databases'
         },
@@ -111,7 +110,7 @@
                 );
             },
             disabled:
-                page.url.pathname.includes('/backups') || page.url.pathname.includes('collection-'),
+                page.url.pathname.includes('/backups') || page.url.pathname.includes('table-'),
             keys: ['g', 'b'],
             group: 'databases'
         },
@@ -124,24 +123,24 @@
             },
             disabled:
                 page.url.pathname.includes('/settings') ||
-                page.url.pathname.includes('collection-') ||
+                page.url.pathname.includes('table-') ||
                 !$canWriteDatabases,
             keys: ['g', 's'],
             group: 'databases'
         },
         {
-            label: 'Find collections',
+            label: 'Find tables',
             callback: () => {
-                addSubPanel(CollectionsPanel);
+                addSubPanel(TablesPanel);
             },
             group: 'databases',
             rank: -1
         }
     ]);
 
-    $registerSearchers(collectionsSearcher);
+    $registerSearchers(tablesSearcher);
 
-    $: $updateCommandGroupRanks({ collections: 10 });
+    $: $updateCommandGroupRanks({ tables: 10 });
 </script>
 
 <svelte:head>
@@ -150,4 +149,4 @@
 
 <slot />
 
-<CreateCollection bind:showCreate={$showCreate} on:created={handleCreate} />
+<CreateTable bind:showCreate={$showCreate} on:created={handleCreate} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
index f62d323fd..132959068 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts
@@ -12,6 +12,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         header: Header,
         breadcrumbs: Breadcrumbs,
         subNavigation: SubNavigation,
-        database: await sdk.forProject(params.region, params.project).databases.get(params.database)
+        database: await sdk
+            .forProject(params.region, params.project)
+            .grids.getDatabase(params.database)
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
index 726438aca..657406dfd 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
@@ -9,13 +9,13 @@
     import { Card, Empty } from '@appwrite.io/pink-svelte';
     import { base } from '$app/paths';
     import { app } from '$lib/stores/app';
-    import { canWriteCollections } from '$lib/stores/roles';
+    import { canWriteTables } from '$lib/stores/roles';
 
     export let data: PageData;
 </script>
 
 <Container expanded slotSpacing paddingInlineEnd={false}>
-    {#if data.collections.total}
+    {#if data.tables.total}
         {#if data.view === 'grid'}
             <Grid {data} bind:showCreate={$showCreate} />
         {:else}
@@ -23,10 +23,10 @@
         {/if}
 
         <PaginationWithLimit
-            name="Collections"
+            name="Tables"
             limit={data.limit}
             offset={data.offset}
-            total={data.collections.total} />
+            total={data.tables.total} />
     {:else}
         <Card.Base padding="none">
             <Empty
@@ -38,19 +38,16 @@
                     Create, organize, and query structured data with Tables.
                 </span>
                 <span slot="actions">
-                    <Button
-                        external
-                        text
-                        event="empty_documentation"
-                        ariaLabel={`create collection`}>Documentation</Button>
+                    <Button external text event="empty_documentation" ariaLabel={`create table`}
+                        >Documentation</Button>
 
-                    {#if $canWriteCollections}
+                    {#if $canWriteTables}
                         <Button
                             secondary
                             on:click={() => {
                                 $showCreate = true;
                             }}>
-                            Create collection
+                            Create table
                         </Button>
                     {/if}
                 </span>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
index 05c23e830..5d99e96f3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts
@@ -5,15 +5,16 @@ import type { PageLoad } from './$types';
 import { CARD_LIMIT, Dependencies } from '$lib/constants';
 
 export const load: PageLoad = async ({ params, url, route, depends }) => {
-    depends(Dependencies.COLLECTIONS);
+    depends(Dependencies.TABLES);
     const page = getPage(url);
     const search = getSearch(url);
     const limit = getLimit(url, route, CARD_LIMIT);
     const view = getView(url, route, View.Grid);
     const offset = pageToOffset(page, limit);
-    const collections = await sdk
+
+    const tables = await sdk
         .forProject(params.region, params.project)
-        .databases.listCollections(
+        .grids.listTables(
             params.database,
             [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
             search || undefined
@@ -24,6 +25,6 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
         limit,
         search,
         view,
-        collections
+        tables
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createRecord.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createRecord.svelte
deleted file mode 100644
index 78f55bd06..000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createRecord.svelte
+++ /dev/null
@@ -1,149 +0,0 @@
-<script lang="ts">
-    import { page } from '$app/state';
-    import { sdk } from '$lib/stores/sdk';
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { addNotification } from '$lib/stores/notifications';
-    import { type Writable, writable } from 'svelte/store';
-    import AttributeForm from './document-[document]/attributeForm.svelte';
-    import { Permissions } from '$lib/components/permissions';
-    import type { Attributes } from './store';
-    import { ID, type Models } from '@appwrite.io/console';
-    import { Alert, Layout, Typography } from '@appwrite.io/pink-svelte';
-    import { invalidate } from '$app/navigation';
-    import { Dependencies } from '$lib/constants';
-    import SideSheet from './layout/sidesheet.svelte';
-
-    let {
-        collection,
-        showSheet = $bindable(false),
-        existingData = $bindable(null)
-    }: {
-        showSheet: boolean;
-        collection: Models.Collection;
-        existingData: Models.Document | null;
-    } = $props();
-
-    let isSubmitting = $state(false);
-
-    type CreateDocument = {
-        id?: string;
-        document: object;
-        permissions: string[];
-        attributes: Attributes[];
-    };
-
-    function createDocumentWritable() {
-        const availableAttributes = collection.attributes.filter((a) => a.status === 'available');
-        const initial = {
-            id: null,
-            document: availableAttributes.reduce((acc, attr) => {
-                if (existingData && existingData[attr.key]) {
-                    acc[attr.key] = attr.array
-                        ? Array.isArray(existingData[attr.key])
-                            ? [...existingData[attr.key]]
-                            : []
-                        : existingData[attr.key];
-                } else {
-                    acc[attr.key] = attr.array ? [] : null;
-                }
-                return acc;
-            }, {}),
-            permissions: [],
-            attributes: availableAttributes
-        };
-
-        return writable<CreateDocument>({ ...initial });
-    }
-
-    let createDocument: Writable<CreateDocument> = $state<Writable<CreateDocument> | null>(null);
-
-    $effect(() => {
-        if (showSheet) {
-            createDocument = createDocumentWritable();
-        }
-    });
-
-    async function create() {
-        isSubmitting = true;
-
-        try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .databases.createDocument(
-                    page.params.database,
-                    page.params.collection,
-                    $createDocument.id ?? ID.unique(),
-                    $createDocument.document,
-                    $createDocument.permissions
-                );
-
-            showSheet = false;
-            addNotification({
-                message: 'Document has been created',
-                type: 'success'
-            });
-            invalidate(Dependencies.DOCUMENTS);
-            trackEvent(Submit.DocumentCreate, {
-                customId: !!$createDocument.id
-            });
-
-            // post op clear.
-            existingData = null;
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.DocumentCreate);
-        } finally {
-            isSubmitting = false;
-        }
-    }
-</script>
-
-{#if $createDocument}
-    <div class="sheet-container">
-        <!-- TODO: add a ID badge-->
-        <SideSheet
-            spaced
-            title={`${existingData ? 'Duplicate' : 'Create'} record`}
-            bind:show={showSheet}
-            closeOnBlur={false}
-            submit={{
-                text: 'Create',
-                disabled: isSubmitting,
-                onClick: () => create()
-            }}>
-            <Layout.Stack gap="xxl">
-                <AttributeForm
-                    bind:formValues={$createDocument.document}
-                    attributes={$createDocument.attributes}
-                    bind:customId={$createDocument.id} />
-
-                <Layout.Stack gap="xl">
-                    <Typography.Text>
-                        Choose which permission scopes to grant your application. It is best
-                        practice to allow only the permissions you need to meet your project goals.
-                    </Typography.Text>
-                    {#if collection.documentSecurity}
-                        <Alert.Inline status="info">
-                            <svelte:fragment slot="title"
-                                >Document security is enabled</svelte:fragment>
-                            Users will be able to access this document if they have been granted
-                            <b>either document or collection permissions</b>.
-                        </Alert.Inline>
-                        <Permissions bind:permissions={$createDocument.permissions} />
-                    {:else}
-                        <Alert.Inline status="info">
-                            <svelte:fragment slot="title"
-                                >Document security is disabled</svelte:fragment>
-                            If you want to assign document permissions, navigate to Collection settings
-                            and enable document security. Otherwise, only collection permissions will
-                            be used.
-                        </Alert.Inline>
-                    {/if}
-                </Layout.Stack>
-            </Layout.Stack>
-        </SideSheet>
-    </div>
-{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
deleted file mode 100644
index 0c464a49a..000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
+++ /dev/null
@@ -1,63 +0,0 @@
-<script lang="ts">
-    import type { Models } from '@appwrite.io/console';
-    import Boolean from './attributes/boolean.svelte';
-    import Datetime from './attributes/datetime.svelte';
-    import Enum from './attributes/enum.svelte';
-    import Integer from './attributes/integer.svelte';
-    import Relationship from './attributes/relationship.svelte';
-    import String from './attributes/string.svelte';
-    import Url from './attributes/url.svelte';
-
-    export let id: string;
-    export let label: string;
-    export let optionalText: string | undefined = undefined;
-    export let value: string | number | boolean | null | string[];
-    export let editing = false;
-    export let attribute:
-        | Models.AttributeBoolean
-        | Models.AttributeEmail
-        | Models.AttributeEnum
-        | Models.AttributeFloat
-        | Models.AttributeInteger
-        | Models.AttributeIp
-        | Models.AttributeString
-        | Models.AttributeDatetime
-        | Models.AttributeUrl;
-
-    const attributesTypeMap = {
-        string: String,
-        integer: Integer,
-        double: Integer,
-        boolean: Boolean,
-        datetime: Datetime,
-        relationship: Relationship
-    };
-
-    const attributesFormatMap = {
-        ip: String,
-        url: Url,
-        email: String,
-        enum: Enum
-    };
-</script>
-
-{#if attribute.type in attributesTypeMap}
-    {#if 'format' in attribute && attribute.format}
-        <svelte:component
-            this={attributesFormatMap[attribute.format]}
-            {id}
-            {label}
-            {attribute}
-            {optionalText}
-            bind:value />
-    {:else}
-        <svelte:component
-            this={attributesTypeMap[attribute.type]}
-            {id}
-            {editing}
-            {label}
-            {attribute}
-            {optionalText}
-            bind:value />
-    {/if}
-{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
deleted file mode 100644
index a599246c4..000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { type Models, Query } from '@appwrite.io/console';
-import type { Attributes } from '../../store';
-
-export function isRelationshipToMany(attribute: Models.AttributeRelationship) {
-    if (!attribute) return false;
-    if (!attribute?.relationType) return false;
-    if (attribute?.side === 'child') {
-        return !['oneToOne', 'oneToMany'].includes(attribute?.relationType);
-    } else {
-        return !['oneToOne', 'manyToOne'].includes(attribute?.relationType);
-    }
-}
-
-export function isRelationship(attribute: Attributes): attribute is Models.AttributeRelationship {
-    if (!attribute) return false;
-    return attribute?.type === 'relationship';
-}
-
-export function isString(attribute: Attributes): attribute is Models.AttributeString {
-    if (!attribute) return false;
-    return attribute?.type === 'string';
-}
-
-/**
- * Returns select queries for all main and related fields in a collection.
- */
-export function buildWildcardAttributesQuery(
-    collection: Models.Collection | null = null
-): string[] {
-    return [
-        ...(collection?.attributes
-            ?.filter((attr) => isRelationship(attr))
-            ?.map((attr) => Query.select([`${attr.key}.*`])) ?? []),
-
-        Query.select(['*'])
-    ];
-}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/editDocument.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/editDocument.svelte
deleted file mode 100644
index aa1d01186..000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/editDocument.svelte
+++ /dev/null
@@ -1,132 +0,0 @@
-<script lang="ts">
-    import { symmetricDifference } from '$lib/helpers/array';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { page } from '$app/state';
-    import { sdk } from '$lib/stores/sdk';
-    import { addNotification } from '$lib/stores/notifications';
-    import { type Writable, writable } from 'svelte/store';
-    import type { Models } from '@appwrite.io/console';
-    import { Dependencies } from '$lib/constants';
-    import { invalidate } from '$app/navigation';
-    import { collection, type Attributes } from './store';
-    import AttributeItem from './document-[document]/attributeItem.svelte';
-    import { isRelationship, isRelationshipToMany } from './document-[document]/attributes/store';
-    import { deepClone } from '$lib/helpers/object';
-
-    const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-
-    let {
-        document = $bindable()
-    }: {
-        document: Models.Document;
-    } = $props();
-
-    let work = $state<Writable<Models.Document> | null>(null);
-
-    function initWork() {
-        const prohibitedKeys = [
-            '$id',
-            '$collection',
-            '$collectionId',
-            '$databaseId',
-            '$createdAt',
-            '$updatedAt'
-        ];
-
-        const filteredKeys = Object.keys(document).filter((key) => {
-            return !prohibitedKeys.includes(key);
-        });
-
-        const result = filteredKeys.reduce((obj, key) => {
-            obj[key] = document[key];
-            return obj;
-        }, {});
-
-        return writable(deepClone(result as Models.Document));
-    }
-
-    $effect(() => {
-        if (document) work = initWork();
-    });
-
-    function compareAttributes(
-        attribute: Attributes,
-        $work: Models.Document,
-        $doc: Models.Document
-    ) {
-        if (!attribute) {
-            return false;
-        }
-
-        const workAttribute = $work?.[attribute.key];
-        const docAttribute = $doc?.[attribute.key];
-
-        if (attribute.array) {
-            return !symmetricDifference(Array.from(workAttribute), Array.from(docAttribute)).length;
-        }
-
-        if (isRelationship(attribute)) {
-            if (isRelationshipToMany(attribute as Models.AttributeRelationship)) {
-                const workIds = workAttribute.map((doc: string | Record<string, unknown>) =>
-                    typeof doc === 'string' ? doc : doc.$id
-                );
-
-                const relatedIds = docAttribute.map((doc: string | Record<string, unknown>) =>
-                    typeof doc === 'string' ? doc : doc.$id
-                );
-                return !symmetricDifference(workIds, relatedIds).length;
-            } else {
-                const workId =
-                    typeof workAttribute === 'string' ? workAttribute : workAttribute?.$id;
-                const relatedId =
-                    typeof docAttribute === 'string' ? docAttribute : docAttribute?.$id;
-
-                return workId === relatedId;
-            }
-        }
-        return workAttribute === docAttribute;
-    }
-
-    export async function update() {
-        try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .databases.updateDocument(
-                    databaseId,
-                    collectionId,
-                    document.$id,
-                    $work,
-                    $work.$permissions
-                );
-
-            invalidate(Dependencies.DOCUMENT);
-            trackEvent(Submit.DocumentUpdate);
-            addNotification({
-                message: 'Document has been updated',
-                type: 'success'
-            });
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.DocumentUpdate);
-        }
-    }
-
-    export function isDisabled(): boolean {
-        if (!work || !$collection?.attributes?.length) return true;
-
-        return $collection.attributes.every((attribute) =>
-            compareAttributes(attribute, $work, document)
-        );
-    }
-</script>
-
-{#if $collection?.attributes?.length && work}
-    {#each $collection.attributes as attribute}
-        {@const label = attribute.key}
-        <AttributeItem {attribute} bind:formValues={$work} {label} editing />
-    {/each}
-{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
deleted file mode 100644
index 5b4e83244..000000000
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
+++ /dev/null
@@ -1,72 +0,0 @@
-<script lang="ts">
-    import { invalidate } from '$app/navigation';
-    import { page } from '$app/state';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { CardGrid } from '$lib/components';
-    import { Dependencies } from '$lib/constants';
-    import { Button, InputSwitch } from '$lib/elements/forms';
-    import { addNotification } from '$lib/stores/notifications';
-    import { sdk } from '$lib/stores/sdk';
-    import { onMount } from 'svelte';
-    import { collection } from '../store';
-
-    const databaseId = page.params.database;
-
-    let collectionDocumentSecurity: boolean = null;
-
-    onMount(() => {
-        collectionDocumentSecurity ??= $collection.documentSecurity;
-    });
-
-    async function updateSecurity() {
-        try {
-            await sdk
-                .forProject(page.params.region, page.params.project)
-                .databases.updateCollection(
-                    databaseId,
-                    $collection.$id,
-                    $collection.name,
-                    $collection.$permissions,
-                    collectionDocumentSecurity,
-                    $collection.enabled
-                );
-            await invalidate(Dependencies.COLLECTION);
-            addNotification({
-                message: 'Security has been updated',
-                type: 'success'
-            });
-            trackEvent(Submit.CollectionUpdateSecurity);
-        } catch (error) {
-            addNotification({
-                message: error.message,
-                type: 'error'
-            });
-            trackError(error, Submit.CollectionUpdateSecurity);
-        }
-    }
-</script>
-
-<CardGrid>
-    <svelte:fragment slot="title">Document security</svelte:fragment>
-    <svelte:fragment slot="aside">
-        <InputSwitch
-            bind:value={collectionDocumentSecurity}
-            id="security"
-            label="Document security" />
-
-        <p class="text">
-            When document security is enabled, users will be able to access documents for which they
-            have been granted <b>either document or collection permissions</b>.
-        </p>
-        <p class="text">
-            If document security is disabled, users can access documents <b
-                >only if they have collection permissions</b
-            >. Document permissions will be ignored.
-        </p>
-    </svelte:fragment>
-    <svelte:fragment slot="actions">
-        <Button
-            disabled={collectionDocumentSecurity === $collection.documentSecurity}
-            on:click={updateSecurity}>Update</Button>
-    </svelte:fragment>
-</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
similarity index 83%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
index 62ac56c52..222843bf7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createCollection.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte
@@ -26,24 +26,24 @@
     const create = async () => {
         error = null;
         try {
-            const collection = await sdk
+            const table = await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.createCollection(databaseId, id ? id : ID.unique(), name);
+                .grids.createTable(databaseId, id ? id : ID.unique(), name);
 
             showCreate = false;
 
-            dispatch('created', collection);
+            dispatch('created', table);
             addNotification({
                 type: 'success',
                 message: `${name} has been created`
             });
             name = id = null;
-            trackEvent(Submit.CollectionCreate, {
+            trackEvent(Submit.TableCreate, {
                 customId: !!id
             });
         } catch (e) {
             error = e.message;
-            trackError(e, Submit.CollectionCreate);
+            trackError(e, Submit.TableCreate);
         }
     };
 
@@ -72,16 +72,18 @@
     });
 </script>
 
-<Modal title="Create collection" size="m" bind:show={showCreate} onSubmit={create} bind:error>
+<Modal title="Create table" size="m" bind:show={showCreate} onSubmit={create} bind:error>
     <InputText
         id="name"
         label="Name"
-        placeholder="Enter collection name"
+        placeholder="Enter table name"
         bind:value={name}
         autofocus
         required
         on:input={() => {
-            if (!touchedId) id = toIdFormat(name);
+            if (!touchedId) {
+                id = toIdFormat(name);
+            }
         }} />
 
     <CustomId
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
index ef7661522..7fc4ebd8d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte
@@ -18,17 +18,17 @@
     let confirmedDeletion = false;
 
     let error = null;
-    let isLoadingDocumentsCount = false;
+    let isLoadingRowsCount = false;
 
-    $: collectionItems = [];
-    let collections: Models.CollectionList = null;
+    $: tableItems = [];
+    let tables: Models.TableList = null;
 
     function buildQueries(): string[] {
         const queries = [Query.orderDesc('$updatedAt')];
 
-        if (collectionItems.length > 0) {
+        if (tableItems.length > 0) {
             queries.push(Query.limit(25));
-            queries.push(Query.offset(collectionItems.length));
+            queries.push(Query.offset(tableItems.length));
         } else {
             queries.push(Query.limit(3));
         }
@@ -36,32 +36,32 @@
         return queries;
     }
 
-    async function listCollections() {
+    async function listTables() {
         // let's just wait...
-        if (isLoadingDocumentsCount) return;
+        if (isLoadingRowsCount) return;
 
-        isLoadingDocumentsCount = true;
+        isLoadingRowsCount = true;
 
         try {
             const queries = buildQueries();
 
-            collections = await sdk
+            tables = await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.listCollections(databaseId, queries);
+                .grids.listTables(databaseId, queries);
 
-            const collectionPromises = collections.collections.map(async (collection) => {
+            const tablePromises = tables.tables.map(async (table) => {
                 return {
-                    id: collection.$id,
-                    name: collection.name,
-                    updatedAt: collection.$updatedAt
+                    id: table.$id,
+                    name: table.name,
+                    updatedAt: table.$updatedAt
                 };
             });
 
-            collectionItems = [...collectionItems, ...(await Promise.all(collectionPromises))];
+            tableItems = [...tableItems, ...(await Promise.all(tablePromises))];
         } catch (err) {
             error = true;
         } finally {
-            isLoadingDocumentsCount = false;
+            isLoadingRowsCount = false;
         }
     }
 
@@ -69,7 +69,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.delete(databaseId);
+                .grids.deleteDatabase(databaseId);
             showDelete = false;
             addNotification({
                 type: 'success',
@@ -88,24 +88,24 @@
 
     /* reset data on modal close */
     $: if (!showDelete) {
-        collections = null;
-        collectionItems = [];
+        tables = null;
+        tableItems = [];
     } else {
-        listCollections();
+        listTables();
     }
 </script>
 
 <Modal title="Delete database" bind:show={showDelete} onSubmit={handleDelete}>
     <p class="text" slot="description">
-        {#if collectionItems.length > 0}
-            The following collections and all data associated with <b>{$database.name}</b>, will be
+        {#if tableItems.length > 0}
+            The following tables and all data associated with <b>{$database.name}</b>, will be
             permanently deleted.
         {:else}
             Are you sure you want to delete <b>{$database.name}</b>?
         {/if}
     </p>
 
-    {#if isLoadingDocumentsCount}
+    {#if isLoadingRowsCount}
         <div class="u-flex u-main-center">
             <Spinner />
         </div>
@@ -113,36 +113,36 @@
         <p class="text">
             Are you sure you want to delete <b>{$database.name}</b>?
         </p>
-    {:else if collectionItems.length > 0}
+    {:else if tableItems.length > 0}
         <div class="u-flex-vertical u-gap-16">
             <Table.Root columns={2} let:root>
                 <svelte:fragment slot="header" let:root>
-                    <Table.Header.Cell {root}>Collection</Table.Header.Cell>
+                    <Table.Header.Cell {root}>Table</Table.Header.Cell>
                     <Table.Header.Cell {root}>Last Updated</Table.Header.Cell>
                 </svelte:fragment>
-                {#each collectionItems as collection}
+                {#each tableItems as table}
                     <Table.Row.Base {root}>
-                        <Table.Cell {root}>{collection.name}</Table.Cell>
-                        <Table.Cell {root}>{toLocaleDate(collection.updatedAt)}</Table.Cell>
+                        <Table.Cell {root}>{table.name}</Table.Cell>
+                        <Table.Cell {root}>{toLocaleDate(table.updatedAt)}</Table.Cell>
                     </Table.Row.Base>
                 {/each}
             </Table.Root>
 
-            {#if collectionItems.length < collections.total}
+            {#if tableItems.length < tables.total}
                 <div class="u-flex u-gap-16 u-cross-center">
-                    <button class="u-underline" on:click={listCollections} type="button">
+                    <button class="u-underline" on:click={listTables} type="button">
                         Show more
                     </button>
 
-                    {#if isLoadingDocumentsCount}
+                    {#if isLoadingRowsCount}
                         <div class="loader is-small"></div>
                     {/if}
                 </div>
-            {:else if collectionItems.length > 25}
+            {:else if tableItems.length > 25}
                 <button
                     class="u-underline"
                     on:click={() => {
-                        collectionItems = collectionItems.slice(0, 3);
+                        tableItems = tableItems.slice(0, 3);
                     }}
                     type="button">
                     Show less
@@ -151,7 +151,7 @@
         </div>
     {/if}
 
-    {#if !isLoadingDocumentsCount}
+    {#if !isLoadingRowsCount}
         <p class="text" data-private>
             <b>
                 Once deleted, this database and its backups cannot be restored. This action is
@@ -162,7 +162,7 @@
         <div class="input-check-box-friction">
             <InputCheckbox
                 required
-                id="delete_policy"
+                id="delete_database"
                 bind:checked={confirmedDeletion}
                 label="I understand and confirm" />
         </div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
index 822203307..15fbb6c79 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/grid.svelte
@@ -2,9 +2,9 @@
     import { base } from '$app/paths';
     import { page } from '$app/state';
     import { CardContainer, GridItem1, Id } from '$lib/components';
-    import { Pill } from '$lib/elements';
-    import { canWriteCollections } from '$lib/stores/roles';
+    import { canWriteTables } from '$lib/stores/roles';
     import type { PageData } from './$types';
+    import { Badge } from '@appwrite.io/pink-svelte';
     export let data: PageData;
     export let showCreate = false;
     const projectId = page.params.project;
@@ -12,20 +12,20 @@
 </script>
 
 <CardContainer
-    disableEmpty={!$canWriteCollections}
-    total={data.collections.total}
+    disableEmpty={!$canWriteTables}
+    total={data.tables.total}
     on:click={() => (showCreate = true)}
-    event="collection">
-    {#each data.collections.collections as collection}
+    event="table">
+    {#each data.tables.tables as table}
         <GridItem1
-            href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
-            <svelte:fragment slot="title">{collection.name}</svelte:fragment>
+            href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/table-${table.$id}`}>
+            <svelte:fragment slot="title">{table.name}</svelte:fragment>
             <svelte:fragment slot="status">
-                {#if !collection.enabled}
-                    <Pill>disabled</Pill>
+                {#if !table.enabled}
+                    <Badge variant="secondary" content="disabled" />
                 {/if}</svelte:fragment>
 
-            <Id value={collection.$id}>{collection.$id}</Id>
+            <Id value={table.$id}>{table.$id}</Id>
         </GridItem1>
     {/each}
 </CardContainer>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
index bdfb8b4d2..7b18c985c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/header.svelte
@@ -13,8 +13,8 @@
     const tabs = [
         {
             href: path,
-            title: 'Collections',
-            event: 'collections',
+            title: 'Tables',
+            event: 'tables',
             hasChildren: true
         },
         {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
index fc6dd0cd0..acc93b8ad 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte
@@ -13,6 +13,7 @@
     import Delete from '../delete.svelte';
     import { database } from '../store';
     import { Query } from '@appwrite.io/console';
+    import { Layout, Skeleton } from '@appwrite.io/pink-svelte';
 
     let showDelete = false;
     let showError: false | 'name' | 'email' | 'password' = false;
@@ -24,10 +25,10 @@
         databaseName ??= $database.name;
     });
 
-    async function loadCollectionCount() {
+    async function loadTableCount() {
         const { total } = await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.listCollections($database.$id, [Query.limit(1)]);
+            .grids.listTables($database.$id, [Query.limit(1)]);
         return total;
     }
 
@@ -41,7 +42,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.update(page.params.database, databaseName);
+                .grids.updateDatabase(page.params.database, databaseName);
             await invalidate(Dependencies.DATABASE);
             addNotification({
                 message: 'Name has been updated',
@@ -95,21 +96,21 @@
 
         <CardGrid>
             <svelte:fragment slot="title">Delete database</svelte:fragment>
-            The database will be permanently deleted, including all collections within it. This action
-            is irreversible.
+            The database will be permanently deleted, including all tables within it. This action is
+            irreversible.
             <svelte:fragment slot="aside">
                 <BoxAvatar>
                     <svelte:fragment slot="title">
-                        <h6 class="u-bold u-trim-1">{$database.name}</h6>
-                        <span class="u-flex u-gap-8">
-                            {#await loadCollectionCount()}
-                                <div class="loader is-small"></div>
-                            {:then count}
-                                {count}
-                            {/await}
-
-                            Collections
-                        </span>
+                        <Layout.Stack direction="column" gap="xxs">
+                            <h6 class="u-bold u-trim-1">{$database.name}</h6>
+                            <Layout.Stack direction="row" gap="s">
+                                {#await loadTableCount()}
+                                    <Skeleton variant="line" width="100%" height={19.5} />
+                                {:then count}
+                                    {count} {count === 1 ? 'Table' : 'Tables'}
+                                {/await}
+                            </Layout.Stack>
+                        </Layout.Stack>
                     </svelte:fragment>
                 </BoxAvatar>
             </svelte:fragment>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
index d37acffdb..221122bd4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/store.ts
@@ -6,8 +6,8 @@ import { derived, writable } from 'svelte/store';
 export const database = derived(page, ($page) => $page.data.database as Models.Database);
 export const showCreate = writable(false);
 
-export const columns = writable<Column[]>([
-    { id: '$id', title: 'Collection ID', type: 'string', width: 200 },
+export const tableViewColumns = writable<Column[]>([
+    { id: '$id', title: 'Table ID', type: 'string', width: 200 },
     { id: 'name', title: 'Name', type: 'string', width: { min: 120 } },
     { id: '$createdAt', title: 'Created', type: 'datetime', width: { min: 120 } },
     { id: '$updatedAt', title: 'Updated', type: 'datetime', width: { min: 120 } }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
index 5f1f8c2b3..66677ff53 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte
@@ -5,15 +5,15 @@
 
     export async function submitString(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeString>
+        data: Partial<Models.ColumnString>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createStringAttribute(
+            .grids.createStringColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.size,
                 data.required,
@@ -23,15 +23,15 @@
     }
     export async function updateString(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeString>,
+        tableId: string,
+        data: Partial<Models.ColumnString>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateStringAttribute(
+            .grids.updateStringColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -42,10 +42,10 @@
 </script>
 
 <script lang="ts">
-    import { InputChoice, InputNumber, InputText, InputTextarea } from '$lib/elements/forms';
     import { createConservative } from '$lib/helpers/stores';
+    import { InputChoice, InputNumber, InputText, InputTextarea } from '$lib/elements/forms';
 
-    export let data: Partial<Models.AttributeString> = {
+    export let data: Partial<Models.ColumnString> = {
         required: false,
         size: 0,
         default: null,
@@ -67,7 +67,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeString>>({
+    } = createConservative<Partial<Models.ColumnString>>({
         required: false,
         array: false,
         ...data
@@ -104,9 +104,9 @@
         bind:value={data.default} />
 {/if}
 <InputChoice id="required" label="Required" bind:value={data.required} disabled={data.array}>
-    Indicate whether this is a required attribute
+    Indicate whether this is a required column
 </InputChoice>
 <InputChoice id="array" label="Array" bind:value={data.array} disabled={data.required || editing}>
-    Indicate whether this attribute should act as an array, with the default value set as an empty
+    Indicate whether this column should act as an array, with the default value set as an empty
     array.
 </InputChoice>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index b0a456b71..a829e7cb9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -17,19 +17,20 @@
     import type { Models } from '@appwrite.io/console';
 
     let data = $derived(page.data) as PageData;
+
     let region = $derived(page.params.region);
     let project = $derived(page.params.project);
+    let tableId = $derived(page.params.table);
     let databaseId = $derived(page.params.database);
-    let collectionId = $derived(page.params.collection);
 
-    const collections = $derived(data.collections);
+    const tables = $derived(data.tables);
 
-    const sortedCollections = $derived.by(() =>
-        collections?.collections?.slice().sort((a, b) => a.name.localeCompare(b.name))
+    const sortedTables = $derived.by(() =>
+        tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name))
     );
 
-    const selectedCollection = $derived.by(() =>
-        sortedCollections?.find((collection: Models.Collection) => collection.$id === collectionId)
+    const selectedTable = $derived.by(() =>
+        sortedTables?.find((table: Models.Table) => table.$id === tableId)
     );
 
     let openBottomSheet = $state(false);
@@ -53,11 +54,11 @@
                 {data.database?.name}
             </a>
             <div class="collection-content">
-                {#if collections?.total}
+                {#if tables?.total}
                     <ul class="drop-list u-margin-inline-start-8 u-margin-block-start-8">
-                        {#each sortedCollections as collection}
-                            {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
-                            {@const isSelected = collectionId === collection.$id}
+                        {#each sortedTables as table}
+                            {@const href = `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${table.$id}`}
+                            {@const isSelected = tableId === table.$id}
 
                             <Layout.Stack gap="m" direction="row" alignItems="center">
                                 <div
@@ -76,7 +77,7 @@
                                                 ? '--fgcolor-neutral-tertiary'
                                                 : '--fgcolor-neutral-weak'} />
                                         <span class="text collection-name" data-private
-                                            >{collection.name}</span>
+                                            >{table.name}</span>
                                     </a>
                                 </li>
                             </Layout.Stack>
@@ -106,7 +107,7 @@
                             $showCreate = true;
                             $showSubNavigation = false;
                         }}>
-                        Create collection
+                        Create table
                     </Button>
                 </Layout.Stack>
             </div>
@@ -128,7 +129,7 @@
                     onclick={() => {
                         openBottomSheet = !openBottomSheet;
                     }}>
-                    <span class="orgName">{selectedCollection?.name}</span>
+                    <span class="orgName">{selectedTable?.name}</span>
                     <Icon icon={IconChevronDown} size="s" />
                 </button>
             </Layout.Stack>
@@ -140,20 +141,20 @@
         bind:isOpen={openBottomSheet}
         menu={{
             top: {
-                items: sortedCollections.slice(0, 10).map((collection) => {
+                items: sortedTables.slice(0, 10).map((table) => {
                     return {
-                        name: collection.name,
+                        name: table.name,
                         leadingIcon: IconTable,
-                        href: `${base}/project-${region}-${project}/databases/database-${databaseId}/collection-${collection.$id}`
+                        href: `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${table.$id}`
                     };
                 })
             },
             bottom:
-                sortedCollections.length > 10
+                sortedTables.length > 10
                     ? {
                           items: [
                               {
-                                  name: 'All collections',
+                                  name: 'All tables',
                                   leadingIcon: IconTable,
                                   href: `${base}/project-${region}-${project}/databases/database-${databaseId}`
                               }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
similarity index 67%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index d617782de..20aadcbeb 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -1,13 +1,14 @@
 <script lang="ts" context="module">
     import { writable } from 'svelte/store';
+    import type { Option } from './columns/store';
 
-    const createAttributeArgs = writable({
+    const createColumnArgs = writable({
         showCreate: false,
         selectedOption: null as Option['name'] | null
     });
 
-    export const initCreateAttribute = (option: Option['name']) => {
-        createAttributeArgs.set({ showCreate: true, selectedOption: option });
+    export const initCreateColumn = (option: Option['name']) => {
+        createColumnArgs.set({ showCreate: true, selectedOption: option });
     };
 
     const showCreateIndex = writable(false);
@@ -22,7 +23,7 @@
     import { realtime, sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import {
-        collection,
+        table,
         columnsOrder,
         databaseColumnSheetOptions,
         databaseRowSheetOptions,
@@ -32,28 +33,27 @@
         spreadsheetLoading
     } from './store';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
-    import CreateAttribute from './createAttribute.svelte';
-    import type { Option } from './attributes/store';
-    import { CreateAttributePanel } from '$lib/commandCenter/panels';
+    import CreateColumn from './createColumn.svelte';
+    import { CreateColumnPanel } from '$lib/commandCenter/panels';
     import { database } from '../store';
     import { project } from '../../../store';
     import { page } from '$app/state';
     import { base } from '$app/paths';
-    import { canWriteCollections } from '$lib/stores/roles';
+    import { canWriteTables } from '$lib/stores/roles';
     import { IconEye, IconLockClosed, IconPlus, IconPuzzle } from '@appwrite.io/pink-icons-svelte';
     import SideSheet from './layout/sidesheet.svelte';
-    import EditDocument from './editDocument.svelte';
-    import EditAttribute from './attributes/edit.svelte';
+    import EditRow from './editRow.svelte';
+    import EditColumn from './columns/edit.svelte';
     import { Dialog, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { Button, Seekbar } from '$lib/elements/forms';
-    import { generateFakeDocuments, generateAttributes } from '$lib/helpers/faker';
+    import { generateFakeRecords, generateColumns } from '$lib/helpers/faker';
     import { addNotification } from '$lib/stores/notifications';
     import { sleep } from '$lib/helpers/promises';
     import CreateIndex from './indexes/createIndex.svelte';
 
     let createIndex: CreateIndex;
-    let editDocument: EditDocument;
-    let createAttribute: CreateAttribute;
+    let editRow: EditRow;
+    let createColumn: CreateColumn;
     let selectedOption: Option['name'] = 'String';
 
     onMount(() => {
@@ -61,142 +61,143 @@
             .forProject(page.params.region, page.params.project)
             .subscribe(['project', 'console'], (response) => {
                 if (
-                    response.events.includes('databases.*.collections.*.attributes.*') ||
-                    response.events.includes('databases.*.collections.*.indexes.*')
+                    response.events.includes('databases.*.tables.*.columns.*') ||
+                    response.events.includes('databases.*.tables.*.indexes.*')
                 ) {
-                    invalidate(Dependencies.COLLECTION);
+                    invalidate(Dependencies.TABLE);
                 }
             });
     });
 
+    // TODO: use route ids instead of pathname
     $: $registerCommands([
         {
-            label: 'Create document',
-            keys: page.url.pathname.endsWith($collection.$id) ? ['c'] : ['c', 'd'],
+            label: 'Create row',
+            keys: page.url.pathname.endsWith($table.$id) ? ['t'] : ['t', 'd'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/create`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/create`
                 );
             },
             icon: IconPlus,
-            group: 'documents'
+            group: 'rows'
         },
         {
-            label: 'Create attribute',
-            keys: page.url.pathname.endsWith('attributes') ? ['c'] : ['c', 'a'],
+            label: 'Create column',
+            keys: page.url.pathname.endsWith('columns') ? ['t'] : ['t', 'a'],
             callback() {
-                addSubPanel(CreateAttributePanel);
+                addSubPanel(CreateColumnPanel);
             },
             icon: IconPlus,
-            group: 'attributes',
-            disabled: !$canWriteCollections
+            group: 'columns',
+            disabled: !$canWriteTables
         },
         {
-            label: 'Go to documents',
+            label: 'Go to rows',
             keys: ['g', 'd'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}`
                 );
             },
-            disabled: page.url.pathname.endsWith($collection.$id),
-            group: 'collections'
+            disabled: page.url.pathname.endsWith($table.$id),
+            group: 'tables'
         },
         {
-            label: 'Go to attributes',
+            label: 'Go to columns',
             keys: ['g', 'a'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/attributes`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/columns`
                 );
             },
-            disabled: page.url.pathname.endsWith('attributes'),
-            group: 'collections'
+            disabled: page.url.pathname.endsWith('columns'),
+            group: 'tables'
         },
         {
             label: 'Go to indexes',
             keys: ['g', 'i'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/indexes`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/indexes`
                 );
             },
             disabled: page.url.pathname.endsWith('indexes'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to activity',
             keys: ['g', 'c'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/activity`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/activity`
                 );
             },
             disabled: page.url.pathname.endsWith('activity'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to usage',
             keys: ['g', 'u'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/usage`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/usage`
                 );
             },
             disabled: page.url.pathname.endsWith('usage'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to settings',
             keys: ['g', 's'],
             callback() {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/settings`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/settings`
                 );
             },
-            disabled: page.url.pathname.endsWith('settings') || !$canWriteCollections,
-            group: 'collections'
+            disabled: page.url.pathname.endsWith('settings') || !$canWriteTables,
+            group: 'tables'
         },
         {
             label: 'Display Name',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#display-name`
                 );
             },
-            group: 'collections',
+            group: 'tables',
             disabled:
                 page.url.pathname.endsWith('display-name') ||
                 page.url.pathname.endsWith('settings') ||
-                !$canWriteCollections,
+                !$canWriteTables,
             icon: IconEye
         },
         {
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#permissions`
                 );
             },
-            group: 'collections',
+            group: 'tables',
             disabled:
                 page.url.pathname.endsWith('permissions') ||
                 page.url.pathname.endsWith('settings') ||
-                !$canWriteCollections,
+                !$canWriteTables,
             icon: IconPuzzle
         },
         {
-            label: 'Document security',
+            label: 'Row security',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
+                    `${base}/project-${$project.region}-${$project.$id}/databases/database-${$database.$id}/table-${$table.$id}/settings#row-security`
                 );
             },
-            group: 'collections',
+            group: 'tables',
             disabled:
-                page.url.pathname.endsWith('document-security') ||
+                page.url.pathname.endsWith('row-security') ||
                 page.url.pathname.endsWith('settings') ||
-                !$canWriteCollections,
+                !$canWriteTables,
             icon: IconLockClosed
         },
         {
@@ -207,14 +208,14 @@
             },
             icon: IconPlus,
             group: 'indexes',
-            disabled: !$canWriteCollections
+            disabled: !$canWriteTables
         }
     ]);
 
     $updateCommandGroupRanks({
-        attributes: 1000,
-        documents: 900,
-        collections: 800,
+        columns: 1000,
+        rows: 900,
+        tables: 800,
         indexes: 700
     });
 
@@ -222,16 +223,16 @@
         $spreadsheetLoading = true;
         $randomDataModalState.show = false;
 
-        let attributes = $collection.attributes;
+        let attributes = $table.columns;
         if (!attributes.length) {
             try {
-                attributes = await generateAttributes(
+                attributes = await generateColumns(
                     $project,
                     page.params.database,
-                    page.params.collection
+                    page.params.table
                 );
 
-                await invalidate(Dependencies.COLLECTION);
+                await invalidate(Dependencies.TABLE);
             } catch (e) {
                 addNotification({
                     type: 'error',
@@ -246,17 +247,17 @@
         await sleep(1250);
 
         try {
-            const documents = generateFakeDocuments(attributes, $randomDataModalState.value);
+            const records = generateFakeRecords(attributes, $randomDataModalState.value);
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.createDocuments(page.params.database, page.params.collection, documents);
+                .grids.createRows(page.params.database, page.params.table, records);
 
             addNotification({
                 type: 'success',
                 message: 'Random data added successfully'
             });
 
-            await invalidate(Dependencies.DOCUMENTS);
+            await invalidate(Dependencies.ROWS);
         } catch (e) {
             addNotification({
                 type: 'error',
@@ -271,7 +272,7 @@
 </script>
 
 <svelte:head>
-    <title>{$collection?.name ?? 'Collection'} - Appwrite</title>
+    <title>{$table?.name ?? 'Table'} - Appwrite</title>
 </svelte:head>
 
 <slot />
@@ -282,13 +283,13 @@
     submit={{
         text: 'Insert',
         onClick: async () => {
-            await createAttribute?.submit();
+            await createColumn?.submit();
         },
         disabled: !selectedOption
     }}>
-    <CreateAttribute
+    <CreateColumn
         bind:selectedOption
-        bind:this={createAttribute}
+        bind:this={createColumn}
         column={$showCreateAttributeSheet.column}
         showCreate={$showCreateAttributeSheet.show}
         direction={$showCreateAttributeSheet.direction}
@@ -308,10 +309,10 @@
         disabled: $databaseColumnSheetOptions.disableSubmit,
         onClick: () => $databaseColumnSheetOptions.submitAction()
     }}>
-    <EditAttribute
+    <EditColumn
         isModal={false}
         showEdit={$databaseColumnSheetOptions.isEdit}
-        selectedAttribute={$databaseColumnSheetOptions.column} />
+        selectedColumn={$databaseColumnSheetOptions.column} />
 </SideSheet>
 
 <SideSheet
@@ -319,10 +320,10 @@
     bind:show={$databaseRowSheetOptions.show}
     submit={{
         text: 'Update',
-        disabled: editDocument?.isDisabled(),
-        onClick: async () => await editDocument?.update()
+        disabled: editRow?.isDisabled(),
+        onClick: async () => await editRow?.update()
     }}>
-    <EditDocument bind:document={$databaseRowSheetOptions.document} bind:this={editDocument} />
+    <EditRow bind:row={$databaseRowSheetOptions.row} bind:this={editRow} />
 </SideSheet>
 
 <SideSheet
@@ -335,7 +336,7 @@
     <CreateIndex
         bind:this={createIndex}
         bind:showCreateIndex={$showCreateIndexSheet.show}
-        externalAttributeKey={$showCreateIndexSheet.column} />
+        externalColumnKey={$showCreateIndexSheet.column} />
 </SideSheet>
 
 <Dialog title="Generate random data" bind:open={$randomDataModalState.show}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
similarity index 56%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
index 045ad8cfb..f8b8e626d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts
@@ -6,21 +6,20 @@ import Header from './header.svelte';
 import { Query } from '@appwrite.io/console';
 
 export const load: LayoutLoad = async ({ params, depends }) => {
-    depends(Dependencies.COLLECTION);
+    depends(Dependencies.TABLE);
+
+    const [table, tables] = await Promise.all([
+        sdk.forProject(params.region, params.project).grids.getTable(params.database, params.table),
 
-    const [collection, collections] = await Promise.all([
         sdk
             .forProject(params.region, params.project)
-            .databases.getCollection(params.database, params.collection),
-        sdk
-            .forProject(params.region, params.project)
-            .databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)])
+            .grids.listTables(params.database, [Query.orderDesc(''), Query.limit(100)])
     ]);
 
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        collection,
-        collections
+        table,
+        tables
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
similarity index 74%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
index 431133cb3..5dacc053c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -6,16 +6,16 @@
     import type { Column, ColumnType } from '$lib/helpers/types';
     import { Container } from '$lib/layout';
     import { preferences } from '$lib/stores/preferences';
-    import { canWriteCollections, canWriteDocuments } from '$lib/stores/roles';
+    import { canWriteTables, canWriteRows } from '$lib/stores/roles';
     import { Icon, Layout, Divider } from '@appwrite.io/pink-svelte';
     import type { PageData } from './$types';
     import {
-        collection,
-        columns,
+        table,
+        tableColumns,
         isCsvImportInProgress,
         showRecordsCreateSheet,
         showCreateAttributeSheet,
-        type Attributes,
+        type Columns,
         randomDataModalState
     } from './store';
     import SpreadSheet from './spreadsheet.svelte';
@@ -35,33 +35,32 @@
     export let data: PageData;
 
     let showImportCSV = false;
+
+    // todo: might need a type fix here.
     const filterColumns = writable<Column[]>([]);
 
-    function createColumnsFromAttributes(
-        attributes: Attributes[],
-        selected: string[] = []
-    ): Column[] {
-        return attributes.map((attribute) => ({
-            id: attribute.key,
-            title: attribute.key,
-            type: attribute.type as ColumnType,
-            hide: !!selected?.includes(attribute.key),
-            array: attribute?.array,
-            format: 'format' in attribute && attribute?.format === 'enum' ? attribute.format : null,
-            elements: 'elements' in attribute ? attribute.elements : null
+    function createTableColumns(columns: Columns[], selected: string[] = []): Column[] {
+        return columns.map((column) => ({
+            id: column.key,
+            title: column.key,
+            type: column.type as ColumnType,
+            hide: !!selected?.includes(column.key),
+            array: column?.array,
+            format: 'format' in column && column?.format === 'enum' ? column.format : null,
+            elements: 'elements' in column ? column.elements : null
         }));
     }
 
-    $: selected = preferences.getCustomCollectionColumns(page.params.collection);
+    $: selected = preferences.getCustomTableColumns(page.params.table);
 
-    $: if ($collection.attributes) {
-        const freshColumns = createColumnsFromAttributes($collection.attributes, selected);
-        columns.set(freshColumns);
+    $: if ($table.columns) {
+        const freshColumns = createTableColumns($table.columns, selected);
+        tableColumns.set(freshColumns);
         filterColumns.set(freshColumns.filter((column) => !column.isAction));
     }
 
-    $: hasAttributes = !!$collection.attributes.length;
-    $: hasValidAttributes = $collection?.attributes?.some((attr) => attr.status === 'available');
+    $: hasColumns = !!$table.columns.length;
+    $: hasValidColumns = $table?.columns?.some((col) => col.status === 'available');
 
     async function onSelect(file: Models.File) {
         $isCsvImportInProgress = true;
@@ -72,12 +71,12 @@
                 .migrations.createCsvMigration(
                     file.bucketId,
                     file.$id,
-                    `${page.params.database}:${page.params.collection}`
+                    `${page.params.database}:${page.params.table}`
                 );
 
             addNotification({
                 type: 'success',
-                message: 'Documents import from csv has started'
+                message: 'Rows import from csv has started'
             });
 
             trackEvent(Submit.DatabaseImportCsv);
@@ -95,26 +94,27 @@
     onDestroy(() => ($showCreateAttributeSheet.show = false));
 </script>
 
-{#key page.params.collection}
+{#key page.params.table}
     <Container expanded style="background: var(--bgcolor-neutral-primary)">
         <Layout.Stack direction="column" gap="xl">
             <Layout.Stack direction="row" justifyContent="space-between">
+                <!-- TODO: verify later - columns={tableColumns} -->
                 <Layout.Stack direction="row" gap="s">
                     <ViewSelector
                         onlyIcon
                         ui="new"
                         view={data.view}
-                        {columns}
+                        columns={tableColumns}
                         hideView
                         showAnyway
-                        isCustomCollection />
+                        isCustomTable />
 
                     <Filters
                         onlyIcon
                         query={data.query}
                         columns={filterColumns}
-                        disabled={!(hasAttributes && hasValidAttributes)}
-                        analyticsSource="database_documents" />
+                        disabled={!(hasColumns && hasValidColumns)}
+                        analyticsSource="database_rows" />
 
                     <!-- TODO: not yet implemented -->
                     <!--                    <Button icon secondary>-->
@@ -122,21 +122,22 @@
                     <!--                    </Button>-->
                 </Layout.Stack>
                 <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
+                    <ViewSelector view={data.view} columns={tableColumns} hideView isCustomTable />
                     <Button
                         secondary
                         event={Click.DatabaseImportCsv}
-                        disabled={!(hasAttributes && hasValidAttributes)}
+                        disabled={!(hasColumns && hasValidColumns)}
                         on:click={() => (showImportCSV = true)}>
                         Import CSV
                     </Button>
                     {#if !$isSmallViewport}
                         <Button
                             secondary
-                            disabled={!(hasAttributes && hasValidAttributes)}
+                            disabled={!(hasColumns && hasValidColumns)}
                             on:click={() => ($showRecordsCreateSheet.show = true)}
-                            event="create_document">
+                            event="create_row">
                             <Icon icon={IconPlus} slot="start" size="s" />
-                            Create document
+                            Create row
                         </Button>
                     {/if}
                 </Layout.Stack>
@@ -144,27 +145,27 @@
             {#if $isSmallViewport}
                 <Button
                     secondary
-                    disabled={!(hasAttributes && hasValidAttributes)}
+                    disabled={!(hasColumns && hasValidColumns)}
                     on:click={() => ($showRecordsCreateSheet.show = true)}
-                    event="create_document">
+                    event="create_row">
                     <Icon icon={IconPlus} slot="start" size="s" />
-                    Create document
+                    Create row
                 </Button>
             {/if}
         </Layout.Stack>
     </Container>
 
     <div class="databases-spreadsheet">
-        {#if hasAttributes && hasValidAttributes}
-            {#if data.documents.total}
+        {#if hasColumns && hasValidColumns}
+            {#if data.rows.total}
                 <Divider />
                 <SpreadSheet {data} bind:showRecordsCreateSheet={$showRecordsCreateSheet} />
             {:else if $hasPageQueries}
                 <EmptySearch hidePages>
                     <div class="common-section">
                         <div class="u-text-center common-section">
-                            <b class="body-text-2 u-bold">Sorry, we couldn't find any documents.</b>
-                            <p>There are no documents that match your filters.</p>
+                            <b class="body-text-2 u-bold">Sorry, we couldn't find any rows.</b>
+                            <p>There are no rows that match your filters.</p>
                         </div>
                         <div class="u-flex common-section u-main-center">
                             <Button
@@ -173,7 +174,7 @@
                                     queries.clearAll();
                                     queries.apply();
                                     trackEvent(Submit.FilterClear, {
-                                        source: 'database_documents'
+                                        source: 'database_rows'
                                     });
                                 }}>
                                 Clear filters
@@ -184,8 +185,8 @@
             {:else}
                 <EmptySheet
                     mode="records"
-                    customColumns={createColumnsFromAttributes($collection.attributes, selected)}
-                    showActions={$canWriteDocuments}
+                    customColumns={createTableColumns($table.columns, selected)}
+                    showActions={$canWriteRows}
                     actions={{
                         primary: {
                             onClick: () => {
@@ -203,7 +204,7 @@
             <EmptySheet
                 mode="records"
                 title="You have no columns yet"
-                showActions={$canWriteCollections}
+                showActions={$canWriteTables}
                 actions={{
                     primary: {
                         text: 'Create column',
@@ -235,6 +236,6 @@
 {/if}
 
 <CreateRecord
-    collection={$collection}
+    table={$table}
     bind:showSheet={$showRecordsCreateSheet.show}
-    bind:existingData={$showRecordsCreateSheet.document} />
+    bind:existingData={$showRecordsCreateSheet.row} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
similarity index 72%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
index 0bf7018c2..54ed3191a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts
@@ -4,12 +4,12 @@ import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 import { queries, queryParamToMap } from '$lib/components/filters';
-import { buildWildcardAttributesQuery } from './document-[document]/attributes/store';
+import { buildWildcardColumnsQuery } from './row-[row]/columns/store';
 
 export const load: PageLoad = async ({ params, depends, url, route, parent }) => {
-    const { collection } = await parent();
-    depends(Dependencies.DOCUMENT); /* TODO: we could just invalidate the documents maybe*/
-    depends(Dependencies.DOCUMENTS);
+    const { table } = await parent();
+    depends(Dependencies.ROW); /* TODO: we could just invalidate the rows maybe? */
+    depends(Dependencies.ROWS);
 
     const page = getPage(url);
     // TODO: apply pagination
@@ -20,7 +20,6 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
 
     const paramQueries = url.searchParams.get('query');
     const parsedQueries = queryParamToMap(paramQueries || '[]');
-
     queries.set(parsedQueries);
 
     return {
@@ -28,14 +27,14 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
         limit,
         view,
         query,
-        documents: await sdk
+        rows: await sdk
             .forProject(params.region, params.project)
-            .databases.listDocuments(params.database, params.collection, [
+            .grids.listRows(params.database, params.table, [
                 Query.limit(limit),
                 Query.offset(offset),
                 Query.orderDesc(''),
                 ...parsedQueries.values(),
-                ...buildWildcardAttributesQuery(collection)
+                ...buildWildcardColumnsQuery(table)
             ])
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
similarity index 89%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
index 955c1796c..160286a61 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts
@@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk
             .forProject(params.region, params.project)
-            .databases.listCollectionLogs(params.database, params.collection, [
+            .grids.listTableLogs(params.database, params.table, [
                 Query.limit(limit),
                 Query.offset(offset)
             ])
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
similarity index 81%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
index 2419b882b..0b27f2fd0 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
@@ -3,7 +3,7 @@
     import { page } from '$app/state';
     import { Breadcrumbs } from '$lib/layout';
     import { database } from '../store';
-    import { collection } from './store';
+    import { table } from './store';
 
     $: breadcrumbs = [
         {
@@ -18,8 +18,8 @@
             title: $database?.name
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
-            title: $collection?.name
+            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}`,
+            title: $table?.name
         }
     ];
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
similarity index 77%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index 683ecaa19..41bb7a950 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
-    import { canWriteCollections } from '$lib/stores/roles';
     import {
         ActionMenu,
         Badge,
@@ -15,19 +14,19 @@
         Tooltip,
         Typography
     } from '@appwrite.io/pink-svelte';
-    import { isRelationship, isString } from '../document-[document]/attributes/store';
+    import { isRelationship, isString } from '../row-[row]/columns/store';
     import FailedModal from '../failedModal.svelte';
     import {
-        attributes,
-        type Attributes,
+        columns,
+        type Columns,
         indexes,
         isCsvImportInProgress,
         reorderItems,
         showCreateIndexSheet
     } from '../store';
-    import Delete from './deleteAttribute.svelte';
-    import EditAttribute from './edit.svelte';
-    import { attributeOptions } from './store';
+    import EditColumn from './edit.svelte';
+    import DeleteColumn from './deleteColumn.svelte';
+    import { columnOptions } from './store';
     import {
         IconArrowSmRight,
         IconDotsHorizontal,
@@ -52,7 +51,7 @@
     import { preferences } from '$lib/stores/preferences';
     import { page } from '$app/state';
 
-    const updatedAttributes = $derived.by(() => {
+    const updatedColumnsForSheet = $derived.by(() => {
         const baseAttrs = [
             {
                 key: '$id',
@@ -66,7 +65,7 @@
                 selectable: boolean;
                 system: boolean;
             },
-            ...$attributes,
+            ...$columns,
             {
                 key: '$createdAt',
                 type: 'datetime',
@@ -100,23 +99,23 @@
     let showDropdown = $state([]);
     let showFailed = $state(false);
     let showDelete = $state(false);
-    let selectedAttributes = $state([]);
-    let selectedAttribute: Attributes = $state(null);
+    let selectedColumns = $state([]);
+    let selectedColumn: Columns = $state(null);
 
     let columnsOrder = $state([]);
-    const collectionId = page.params.collection;
+    const tableId = page.params.table;
 
     let showEdit = $state(false);
-    let editAttribute: EditAttribute;
+    let editColumn: EditColumn;
 
-    const attributeFormatIcon = {
+    const columnFormatIcon = {
         ip: IconLocationMarker,
         url: IconLink,
         email: IconLink,
         enum: IconViewList
     };
 
-    function getAttributeStatusBadge(status: string): ComponentProps<Badge>['type'] {
+    function getColumnStatusBadge(status: string): ComponentProps<Badge>['type'] {
         switch (status) {
             case 'processing':
                 return 'warning';
@@ -131,11 +130,11 @@
 
     const emptyCellsLimit = $derived($isSmallViewport ? 14 : 16);
     const emptyCellsCount = $derived(
-        $attributes.length >= emptyCellsLimit ? 0 : emptyCellsLimit - $attributes.length
+        $columns.length >= emptyCellsLimit ? 0 : emptyCellsLimit - $columns.length
     );
 
     onMount(() => {
-        columnsOrder = preferences.getColumnOrder(collectionId);
+        columnsOrder = preferences.getColumnOrder(tableId);
     });
 
     onDestroy(() => ($showCreateAttributeSheet.show = false));
@@ -143,7 +142,7 @@
 
 <Container expanded style="background: var(--bgcolor-neutral-primary)">
     <Layout.Stack direction="row" justifyContent="flex-end">
-        {#if $canWriteCollections}
+        {#if updatedColumnsForSheet}
             <Button
                 size="s"
                 secondary
@@ -166,7 +165,7 @@
             allowSelection
             height="100%"
             emptyCells={emptyCellsCount}
-            bind:selectedRows={selectedAttributes}
+            bind:selectedRows={selectedColumns}
             columns={[
                 { id: 'key', width: { min: 200 } },
                 { id: 'indexed', width: { min: 150 } },
@@ -181,23 +180,24 @@
                 <Spreadsheet.Header.Cell column="actions" {root} />
             </svelte:fragment>
 
-            {#each updatedAttributes as attribute, index}
-                {@const option = attributeOptions.find((option) => option.type === attribute.type)}
+            <!-- TODO: variable and terminology changes -->
+            {#each updatedColumnsForSheet as column, index}
+                {@const option = columnOptions.find((option) => option.type === column.type)}
                 {@const isSelectable =
-                    attribute['system'] || attribute.type === 'relationship' ? 'disabled' : true}
-                <Spreadsheet.Row.Base {root} select={isSelectable} id={attribute.key}>
+                    column['system'] || column.type === 'relationship' ? 'disabled' : true}
+                <Spreadsheet.Row.Base {root} select={isSelectable} id={column.key}>
                     <Spreadsheet.Cell column="key" {root} isEditable={false}>
                         <Layout.Stack direction="row" alignItems="center">
-                            {#if isRelationship(attribute)}
+                            {#if isRelationship(column)}
                                 <Icon
                                     size="s"
-                                    icon={attribute?.twoWay
+                                    icon={column?.twoWay
                                         ? IconSwitchHorizontal
                                         : IconArrowSmRight} />
-                            {:else if 'format' in attribute && attribute.format}
-                                {@const icon = attributeFormatIcon[attribute?.format]}
+                            {:else if 'format' in column && column.format}
+                                {@const icon = columnFormatIcon[column?.format]}
                                 <Icon {icon} size="s" />
-                            {:else if attribute.key === '$id'}
+                            {:else if column.key === '$id'}
                                 <Icon icon={IconFingerPrint} size="s" />
                             {:else}
                                 <Icon icon={option.icon} size="s" />
@@ -206,19 +206,19 @@
                             <Layout.Stack direction="row" alignItems="center" gap="s">
                                 <Layout.Stack inline direction="row" alignItems="center" gap="xxs">
                                     <span class="text u-trim-1" data-private>
-                                        {#if attribute.key === '$id' || attribute.key === '$createdAt' || attribute.key === '$updatedAt'}
-                                            {attribute['name']}
-                                            {#if attribute.key === '$id'}
+                                        {#if column.key === '$id' || column.key === '$createdAt' || column.key === '$updatedAt'}
+                                            {column['name']}
+                                            {#if column.key === '$id'}
                                                 <Badge
                                                     size="xs"
                                                     variant="secondary"
                                                     content="Primary key" />
                                             {/if}
                                         {:else}
-                                            {attribute.key}
+                                            {column.key}
                                         {/if}
                                     </span>
-                                    {#if isString(attribute) && attribute.encrypt}
+                                    {#if isString(column) && column.encrypt}
                                         <Tooltip>
                                             <Icon
                                                 size="s"
@@ -228,22 +228,22 @@
                                         </Tooltip>
                                     {/if}
                                 </Layout.Stack>
-                                {#if attribute.status !== 'available'}
+                                {#if column.status !== 'available'}
                                     <Badge
                                         size="s"
                                         variant="secondary"
-                                        content={attribute.status}
-                                        type={getAttributeStatusBadge(attribute.status)} />
-                                    {#if attribute.error}
+                                        content={column.status}
+                                        type={getColumnStatusBadge(column.status)} />
+                                    {#if column.error}
                                         <Link.Button
                                             variant="muted"
                                             on:click={(e) => {
                                                 e.preventDefault();
-                                                error = attribute.error;
+                                                error = column.error;
                                                 showFailed = true;
                                             }}>Details</Link.Button>
                                     {/if}
-                                {:else if attribute.required}
+                                {:else if column.required}
                                     <Badge size="xs" variant="secondary" content="required" />
                                 {/if}
                             </Layout.Stack>
@@ -251,14 +251,14 @@
                     </Spreadsheet.Cell>
                     <Spreadsheet.Cell column="indexed" {root} isEditable={false}>
                         {@const isIndexed = $indexes.some((index) =>
-                            index.attributes.includes(attribute.key)
+                            index.columns.includes(column.key)
                         )}
                         <Selector.Checkbox size="s" checked={isIndexed} disabled />
                     </Spreadsheet.Cell>
                     <Spreadsheet.Cell column="default" {root} isEditable={false}>
                         {@const _default =
-                            attribute?.default !== null && attribute?.default !== undefined
-                                ? attribute?.default
+                            column?.default !== null && column?.default !== undefined
+                                ? column?.default
                                 : null}
 
                         {#if _default === null}
@@ -281,31 +281,31 @@
                                     <Icon icon={IconDotsHorizontal} size="s" />
                                 </Button>
                                 <ActionMenu.Root slot="tooltip" let:toggle>
-                                    {#if !attribute['system']}
+                                    {#if !column['system']}
                                         <ActionMenu.Item.Button
                                             leadingIcon={IconPencil}
                                             on:click={(event) => {
                                                 toggle(event);
                                                 showEdit = true;
-                                                selectedAttribute = attribute;
+                                                selectedColumn = column;
                                                 showDropdown[index] = false;
                                             }}>
                                             Update
                                         </ActionMenu.Item.Button>
                                     {/if}
-                                    {#if !isRelationship(attribute)}
+                                    {#if !isRelationship(column)}
                                         <ActionMenu.Item.Button
                                             leadingIcon={IconPlus}
                                             on:click={(event) => {
                                                 toggle(event);
                                                 showDropdown[index] = false;
                                                 $showCreateIndexSheet.show = true;
-                                                $showCreateIndexSheet.column = attribute.key;
+                                                $showCreateIndexSheet.column = column.key;
                                             }}>
                                             Create index
                                         </ActionMenu.Item.Button>
                                     {/if}
-                                    {#if attribute.status !== 'processing' && !attribute['system']}
+                                    {#if column.status !== 'processing' && !column['system']}
                                         <ActionMenu.Item.Button
                                             status="danger"
                                             leadingIcon={IconTrash}
@@ -313,8 +313,8 @@
                                                 toggle(event);
                                                 showDelete = true;
                                                 showDropdown[index] = false;
-                                                selectedAttribute = attribute;
-                                                trackEvent(Click.DatabaseAttributeDelete);
+                                                selectedColumn = column;
+                                                trackEvent(Click.DatabaseColumnDelete);
                                             }}>
                                             Delete
                                         </ActionMenu.Item.Button>
@@ -333,29 +333,30 @@
                     alignItems="center"
                     justifyContent="space-between">
                     <Typography.Text variant="m-400" color="--fgcolor-neutral-secondary">
-                        {updatedAttributes.length} columns
+                        {updatedColumnsForSheet.length} columns
                     </Typography.Text>
                 </Layout.Stack>
             </svelte:fragment>
         </Spreadsheet.Root>
     </SpreadsheetContainer>
 
-    {#if selectedAttributes.length > 0}
+    <!-- TODO: terminologies -->
+    {#if selectedColumns.length > 0}
         <div class="floating-action-bar">
             <FloatingActionBar>
                 <svelte:fragment slot="start">
                     <div style:width="max-content">
                         <Layout.Stack direction="row" alignItems="center" gap="m">
-                            <Badge content={selectedAttributes.length.toString()} />
+                            <Badge content={selectedColumns.length.toString()} />
                             <span style:font-size="14px">
-                                {selectedAttributes.length > 1 ? 'attributes' : 'attribute'}
+                                {selectedColumns.length > 1 ? 'attributes' : 'attribute'}
                                 selected
                             </span>
                         </Layout.Stack>
                     </div>
                 </svelte:fragment>
                 <svelte:fragment slot="end">
-                    <Button text on:click={() => (selectedAttributes = [])}>Cancel</Button>
+                    <Button text on:click={() => (selectedColumns = [])}>Cancel</Button>
                     <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
                 </svelte:fragment>
             </FloatingActionBar>
@@ -363,10 +364,10 @@
     {/if}
 </div>
 
-{#if selectedAttribute}
-    <Delete bind:showDelete {selectedAttribute} />
-{:else if selectedAttributes && selectedAttributes.length}
-    <Delete bind:showDelete bind:selectedAttribute={selectedAttributes} />
+{#if selectedColumn}
+    <DeleteColumn bind:showDelete {selectedColumn} />
+{:else if selectedColumns && selectedColumns.length}
+    <DeleteColumn bind:showDelete bind:selectedColumn />
 {/if}
 
 <SideSheet
@@ -374,9 +375,9 @@
     bind:show={showEdit}
     submit={{
         text: 'Update',
-        onClick: async () => await editAttribute.submit()
+        onClick: async () => await editColumn.submit()
     }}>
-    <EditAttribute showEdit isModal={false} {selectedAttribute} bind:this={editAttribute} />
+    <EditColumn showEdit isModal={false} {selectedColumn} bind:this={editColumn} />
 </SideSheet>
 
 {#if showFailed}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/arrow-one.svg
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/arrow-one.svg
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/arrow-two.svg
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/arrow-two.svg
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
similarity index 79%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
index 911154864..480d18517 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
@@ -5,15 +5,15 @@
 
     export async function submitBoolean(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeBoolean>
+        data: Partial<Models.ColumnBoolean>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createBooleanAttribute(
+            .grids.createBooleanColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.default,
@@ -22,15 +22,15 @@
     }
     export async function updateBoolean(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeBoolean>,
+        tableId: string,
+        data: Partial<Models.ColumnBoolean>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateBooleanAttribute(
+            .grids.updateBooleanColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -43,7 +43,7 @@
     import { InputSelect } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeBoolean> = {
+    export let data: Partial<Models.ColumnBoolean> = {
         required: false,
         array: false,
         default: null
@@ -66,7 +66,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeBoolean>>({
+    } = createConservative<Partial<Models.ColumnBoolean>>({
         required: false,
         array: false,
         ...data
@@ -93,11 +93,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
similarity index 75%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
index 06a15f7ce..172d5f42c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button } from '$lib/elements/forms';
     import { ActionMenu, Icon, Popover } from '@appwrite.io/pink-svelte';
-    import { attributeOptions, type Option } from './store';
+    import { columnOptions, type Option } from './store';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import CsvDisabled from '../csvDisabled.svelte';
     import { isCsvImportInProgress } from '../store';
@@ -14,26 +14,26 @@
     <CsvDisabled>
         <Button size="s" disabled>
             <Icon icon={IconPlus} slot="start" size="s" />
-            Create attribute
+            Create column
         </Button>
     </CsvDisabled>
 {:else}
     <Popover let:toggle padding="none" placement="bottom-start">
         <slot {toggle}>
-            <Button secondary on:click={toggle} event="create_attribute">
+            <Button secondary on:click={toggle} event="create_column">
                 <Icon icon={IconPlus} slot="start" size="s" />
                 Create column
             </Button>
         </slot>
         <ActionMenu.Root slot="tooltip">
-            {#each attributeOptions as attribute}
+            {#each columnOptions as column}
                 <ActionMenu.Item.Button
-                    leadingIcon={attribute.icon}
+                    leadingIcon={column.icon}
                     on:click={() => {
-                        selectedOption = attribute.name;
+                        selectedOption = column.name;
                         showCreate = true;
                     }}>
-                    {attribute.name}
+                    {column.name}
                 </ActionMenu.Item.Button>
             {/each}
         </ActionMenu.Root>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
similarity index 77%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
index 1464c8c12..3de345435 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
@@ -5,15 +5,15 @@
 
     export async function submitDatetime(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeDatetime>
+        data: Partial<Models.ColumnDatetime>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createDatetimeAttribute(
+            .grids.createDatetimeColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.default,
@@ -23,15 +23,15 @@
 
     export async function updateDatetime(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeDatetime>,
+        tableId: string,
+        data: Partial<Models.ColumnDatetime>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateDatetimeAttribute(
+            .grids.updateDatetimeColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -44,7 +44,7 @@
     import { InputDateTime } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeDatetime>;
+    export let data: Partial<Models.ColumnDatetime>;
 
     import { createConservative } from '$lib/helpers/stores';
     import { Selector } from '@appwrite.io/pink-svelte';
@@ -63,7 +63,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeDatetime>>({
+    } = createConservative<Partial<Models.ColumnDatetime>>({
         required: false,
         array: false,
         ...data
@@ -85,11 +85,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
similarity index 63%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
index 95b1a4148..e4f6bbca7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte
@@ -3,41 +3,41 @@
     import { page } from '$app/state';
     import { InputChoice } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { collection } from '../store';
-    import type { Attributes } from '../store';
+    import { table } from '../store';
+    import type { Columns } from '../store';
     import { sdk } from '$lib/stores/sdk';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { isRelationship } from '../document-[document]/attributes/store';
+    import { isRelationship } from '../row-[row]/columns/store';
     import Confirm from '$lib/components/confirm.svelte';
     import { Layout } from '@appwrite.io/pink-svelte';
     import { Dependencies } from '$lib/constants';
 
     let {
         showDelete = $bindable(false),
-        selectedAttribute = $bindable(null)
+        selectedColumn = $bindable(null)
     }: {
         showDelete: boolean;
-        selectedAttribute: Attributes | string[];
+        selectedColumn: Columns | string[];
     } = $props();
 
     let checked = $state(false);
     let error = $state<string | null>(null);
 
-    const selectedAttributes = $derived(
-        Array.isArray(selectedAttribute) ? selectedAttribute : [selectedAttribute]
+    const selectedColumns = $derived(
+        Array.isArray(selectedColumn) ? selectedColumn : [selectedColumn]
     );
 
-    const selectedKeys = $derived(getKeys(selectedAttribute));
+    const selectedKeys = $derived(getKeys(selectedColumn));
 
     const requiresTwoWayConfirm = $derived(
-        selectedAttributes.some((attr: string | Attributes) => {
-            typeof attr === 'string' ? false : isRelationship(attr) && attr.twoWay;
+        selectedColumns.some((column: string | Columns) => {
+            typeof column === 'string' ? false : isRelationship(column) && column.twoWay;
         })
     );
 
     const isDeleteBtnDisabled = $derived(requiresTwoWayConfirm && !checked);
 
-    function getKeys(selected: Attributes | string[]): string[] {
+    function getKeys(selected: Columns | string[]): string[] {
         return Array.isArray(selected) ? selected : [selected.key];
     }
 
@@ -46,26 +46,27 @@
             const client = sdk.forProject(page.params.region, page.params.project);
 
             await Promise.all(
-                selectedAttributes.map((key) =>
-                    client.databases.deleteAttribute(page.params.database, $collection.$id, key)
+                // TODO: check the type here
+                selectedColumns.map((key) =>
+                    client.grids.deleteColumn(page.params.database, page.params.table, key)
                 )
             );
 
-            trackEvent(Submit.AttributeDelete);
+            trackEvent(Submit.ColumnDelete);
             addNotification({
                 type: 'success',
                 message:
-                    selectedAttributes.length === 1
-                        ? 'Attribute has been deleted'
-                        : `${selectedAttributes.length} attributes have been deleted`
+                    selectedColumns.length === 1
+                        ? 'Column has been deleted'
+                        : `${selectedColumns.length} columns have been deleted`
             });
 
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
             showDelete = false;
-            selectedAttribute = [];
+            selectedColumn = [];
         } catch (e) {
             error = e.message;
-            trackError(e, Submit.AttributeDelete);
+            trackError(e, Submit.ColumnDelete);
         }
     }
 </script>
@@ -73,24 +74,24 @@
 <Confirm
     bind:open={showDelete}
     onSubmit={handleDelete}
-    title="Delete attribute"
+    title="Delete column"
     bind:error
     disabled={isDeleteBtnDisabled}>
-    {#if selectedAttributes.length === 1}
+    {#if selectedColumns.length === 1}
         <p>
             Are you sure you want to delete <b data-private>{selectedKeys[0]}</b> from
-            <b data-private>{$collection?.name}</b>?
+            <b data-private>{$table?.name}</b>?
         </p>
     {:else}
         <p>
             Are you sure you want to delete <b data-private>{selectedKeys.join(', ')}</b> from
-            <b data-private>{$collection?.name}</b>?
+            <b data-private>{$table?.name}</b>?
         </p>
     {/if}
 
     {#if requiresTwoWayConfirm}
         <!-- not allowed on multi selections, safe to assume that this isn't a string! -->
-        {@const attribute = selectedAttribute[0]}
+        {@const attribute = selectedColumn[0]}
         <Layout.Stack direction="column" gap="xl">
             <p>
                 This is a two way relationship and the corresponding relationship will also be
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
similarity index 66%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
index 4535e79cf..aedbaa2e9 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
@@ -8,22 +8,22 @@
     import { Button, InputText } from '$lib/elements/forms';
     import deepEqual from 'deep-equal';
     import { addNotification } from '$lib/stores/notifications';
-    import { type Attributes, columnsOrder, databaseColumnSheetOptions } from '../store';
-    import { attributeOptions, type Option } from './store';
+    import { type Columns, columnsOrder, databaseColumnSheetOptions } from '../store';
+    import { columnOptions, type Option } from './store';
     import { onMount } from 'svelte';
     import { Layout } from '@appwrite.io/pink-svelte';
     import { preferences } from '$lib/stores/preferences';
 
     export let isModal = true;
     export let showEdit = false;
-    export let selectedAttribute: Attributes;
+    export let selectedColumn: Columns;
 
     let originalKey = '';
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
+    const tableId = page.params.table;
 
     let error: string;
-    let currentAttr: Attributes;
+    let currentColumn: Columns;
 
     onMount(() => {
         if (!isModal) {
@@ -34,56 +34,57 @@
         }
     });
 
-    $: option = attributeOptions.find((option) => {
-        if (selectedAttribute) {
-            if ('format' in selectedAttribute && selectedAttribute.format) {
-                return option?.format === selectedAttribute?.format;
+    $: option = columnOptions.find((option) => {
+        if (selectedColumn) {
+            if ('format' in selectedColumn && selectedColumn.format) {
+                return option?.format === selectedColumn?.format;
             } else {
-                return option?.type === selectedAttribute?.type;
+                return option?.type === selectedColumn?.type;
             }
         }
     }) as Option;
 
     export async function submit() {
         try {
-            await option.update(databaseId, collectionId, selectedAttribute, originalKey);
-            await invalidate(Dependencies.COLLECTION);
+            await option.update(databaseId, tableId, selectedColumn, originalKey);
+            await invalidate(Dependencies.TABLE);
 
-            if (isModal && !page.url.pathname.includes('attributes')) {
+            if (isModal && !page.url.pathname.includes('columns')) {
                 await goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${tableId}/columns`
                 );
             }
 
             addNotification({
                 type: 'success',
-                message: `Attribute ${selectedAttribute.key} has been updated`
+                message: `Column ${selectedColumn.key} has been updated`
             });
 
             showEdit = false;
             const oldKey = originalKey;
-            const newKey = selectedAttribute.key;
+            const newKey = selectedColumn.key;
 
+            // TODO: these stores need to be added.
             if (oldKey !== newKey && $columnsOrder.includes(oldKey)) {
                 const updatedOrder = $columnsOrder.map((id) => (id === oldKey ? newKey : id));
                 columnsOrder.set(updatedOrder);
 
                 await preferences.saveColumnOrder(
                     page.data.organization.$id ?? page.data.project.teamId,
-                    page.params.collection,
+                    page.params.table,
                     updatedOrder
                 );
             }
 
-            trackEvent(Submit.AttributeUpdate);
+            trackEvent(Submit.ColumnUpdate);
 
             if (!isModal) {
-                invalidate(Dependencies.DOCUMENTS);
+                invalidate(Dependencies.ROWS);
                 $databaseColumnSheetOptions.show = false;
             }
         } catch (e) {
             error = e.message;
-            trackError(e, Submit.AttributeUpdate);
+            trackError(e, Submit.ColumnUpdate);
             if (!isModal) {
                 addNotification({
                     type: 'error',
@@ -93,20 +94,21 @@
         }
     }
 
+    // TODO: @itznotabug - runes?
     $: onShow(showEdit);
-    $: title = `Update ${attributeOptions.find((v) => v.name === option.name)?.sentenceName ?? ''} attribute`;
+    $: title = `Update ${columnOptions.find((v) => v.name === option.name)?.sentenceName ?? ''} column`;
 
     function onShow(show: boolean) {
         if (show) {
-            currentAttr ??= { ...selectedAttribute };
-            originalKey = currentAttr.key;
+            currentColumn ??= { ...selectedColumn };
+            originalKey = currentColumn.key;
             error = null;
         } else {
-            currentAttr = null;
+            currentColumn = null;
         }
     }
 
-    $: $databaseColumnSheetOptions.disableSubmit = deepEqual(currentAttr, selectedAttribute);
+    $: $databaseColumnSheetOptions.disableSubmit = deepEqual(currentColumn, selectedColumn);
 </script>
 
 {#if isModal}
@@ -122,45 +124,45 @@
             </div>
         </svelte:fragment>
 
-        {#if selectedAttribute}
-            {#if selectedAttribute?.type !== 'relationship'}
+        {#if selectedColumn}
+            {#if selectedColumn?.type !== 'relationship'}
                 <InputText
                     id="key"
-                    label="Attribute Key"
+                    label="Column Key"
                     placeholder="Enter Key"
-                    bind:value={selectedAttribute.key}
+                    bind:value={selectedColumn.key}
                     autofocus />
             {/if}
             {#if option}
                 <svelte:component
                     this={option.component}
                     editing
-                    bind:data={selectedAttribute}
+                    bind:data={selectedColumn}
                     onclose={() => (option = null)} />
             {/if}
         {/if}
 
         <svelte:fragment slot="footer">
             <Button secondary on:click={() => (showEdit = false)}>Cancel</Button>
-            <Button submit disabled={deepEqual(currentAttr, selectedAttribute)}>Update</Button>
+            <Button submit disabled={deepEqual(currentColumn, selectedColumn)}>Update</Button>
         </svelte:fragment>
     </Modal>
-{:else if selectedAttribute}
+{:else if selectedColumn}
     <Layout.Stack gap="xxxl">
         <Layout.Stack gap="l">
-            {#if selectedAttribute?.type !== 'relationship'}
+            {#if selectedColumn?.type !== 'relationship'}
                 <InputText
                     id="key"
                     label="Attribute Key"
                     placeholder="Enter Key"
-                    bind:value={selectedAttribute.key}
+                    bind:value={selectedColumn.key}
                     autofocus />
             {/if}
             {#if option}
                 <svelte:component
                     this={option.component}
                     editing
-                    bind:data={selectedAttribute}
+                    bind:data={selectedColumn}
                     onclose={() => (option = null)} />
             {/if}
         </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
similarity index 78%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
index 9aa79bfc5..4e2cea63c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte
@@ -5,15 +5,15 @@
 
     export async function submitEmail(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeEmail>
+        data: Partial<Models.ColumnEmail>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createEmailAttribute(
+            .grids.createEmailColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.default,
@@ -23,15 +23,15 @@
 
     export async function updateEmail(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeEmail>,
+        tableId: string,
+        data: Partial<Models.ColumnEmail>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateEmailAttribute(
+            .grids.updateEmailColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -44,7 +44,7 @@
     import { InputEmail } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeEmail>;
+    export let data: Partial<Models.ColumnEmail>;
 
     import { createConservative } from '$lib/helpers/stores';
     import { Selector } from '@appwrite.io/pink-svelte';
@@ -63,7 +63,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeEmail>>({
+    } = createConservative<Partial<Models.ColumnEmail>>({
         required: false,
         array: false,
         ...data
@@ -86,11 +86,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
similarity index 84%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
index b617dc82c..0301326a7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
@@ -5,15 +5,15 @@
 
     export async function submitEnum(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeEnum>
+        data: Partial<Models.ColumnEnum>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createEnumAttribute(
+            .grids.createEnumColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.elements,
                 data.required,
@@ -24,15 +24,15 @@
 
     export async function updateEnum(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeEnum>,
+        tableId: string,
+        data: Partial<Models.ColumnEnum>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateEnumAttribute(
+            .grids.updateEnumColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.elements,
                 data.required,
@@ -46,7 +46,7 @@
     import { InputSelect, InputTags } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeEnum>;
+    export let data: Partial<Models.ColumnEnum>;
 
     import { createConservative } from '$lib/helpers/stores';
     import { Icon, Selector, Tooltip, Typography } from '@appwrite.io/pink-svelte';
@@ -66,7 +66,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeEnum>>({
+    } = createConservative<Partial<Models.ColumnEnum>>({
         required: false,
         array: false,
         ...data
@@ -117,11 +117,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
similarity index 82%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
index 5c8646605..a984dc1f8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte
@@ -5,15 +5,15 @@
 
     export async function submitFloat(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeFloat>
+        data: Partial<Models.ColumnFloat>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createFloatAttribute(
+            .grids.createFloatColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.min,
@@ -25,15 +25,15 @@
 
     export async function updateFloat(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeFloat>,
+        tableId: string,
+        data: Partial<Models.ColumnFloat>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateFloatAttribute(
+            .grids.updateFloatColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -48,7 +48,7 @@
     import { InputNumber } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeFloat> = {
+    export let data: Partial<Models.ColumnFloat> = {
         required: false,
         min: 0,
         max: 0,
@@ -73,7 +73,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeFloat>>({
+    } = createConservative<Partial<Models.ColumnFloat>>({
         required: false,
         array: false,
         ...data
@@ -115,11 +115,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
similarity index 82%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
index faa220fa0..b28e5cde8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
@@ -5,15 +5,15 @@
 
     export async function submitInteger(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeInteger>
+        data: Partial<Models.ColumnInteger>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createIntegerAttribute(
+            .grids.createIntegerColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.min,
@@ -25,15 +25,15 @@
 
     export async function updateInteger(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeInteger>,
+        tableId: string,
+        data: Partial<Models.ColumnInteger>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateIntegerAttribute(
+            .grids.updateIntegerColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -49,7 +49,7 @@
 
     export let editing = false;
 
-    export let data: Partial<Models.AttributeInteger> = {
+    export let data: Partial<Models.ColumnInteger> = {
         required: false,
         min: 0,
         max: 0,
@@ -74,7 +74,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeInteger>>({
+    } = createConservative<Partial<Models.ColumnInteger>>({
         required: false,
         array: false,
         ...data
@@ -113,11 +113,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
similarity index 78%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
index 5ae8043d9..5688637a5 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
@@ -5,15 +5,15 @@
 
     export async function submitIp(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeIp>
+        data: Partial<Models.ColumnIp>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createIpAttribute(
+            .grids.createIpColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.default,
@@ -22,15 +22,15 @@
     }
     export async function updateIp(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeIp>,
+        tableId: string,
+        data: Partial<Models.ColumnIp>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateIpAttribute(
+            .grids.updateIpColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -43,7 +43,7 @@
     import { InputText } from '$lib/elements/forms';
 
     export let editing = false;
-    export let data: Partial<Models.AttributeIp>;
+    export let data: Partial<Models.ColumnIp>;
 
     import { createConservative } from '$lib/helpers/stores';
     import { Selector } from '@appwrite.io/pink-svelte';
@@ -62,7 +62,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeIp>>({
+    } = createConservative<Partial<Models.ColumnIp>>({
         required: false,
         array: false,
         ...data
@@ -85,11 +85,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
similarity index 71%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
index da920f4e7..9026ce851 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
@@ -6,9 +6,9 @@
 
     export async function submitRelationship(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         _key: string,
-        data: Partial<Models.AttributeRelationship>
+        data: Partial<Models.ColumnRelationship>
     ) {
         if (!isValueOfStringEnum(RelationshipType, data.relationType)) {
             throw new Error(
@@ -21,10 +21,10 @@
 
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createRelationshipAttribute(
+            .grids.createRelationshipColumn(
                 databaseId,
-                collectionId,
-                data.relatedCollection,
+                tableId,
+                data.relatedTable,
                 data.relationType,
                 data.twoWay,
                 data.key,
@@ -35,8 +35,8 @@
 
     export async function updateRelationship(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeRelationship>,
+        tableId: string,
+        data: Partial<Models.ColumnRelationship>,
         originalKey?: string
     ) {
         if (!isValueOfStringEnum(RelationMutate, data.onDelete)) {
@@ -45,9 +45,9 @@
 
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateRelationshipAttribute(
+            .grids.updateRelationshipColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.onDelete,
                 data.key !== originalKey ? data.key : undefined
@@ -59,7 +59,7 @@
     import { InputText, InputSelect } from '$lib/elements/forms';
     import { onMount } from 'svelte';
     import { Box } from '$lib/components';
-    import { collection } from '../store';
+    import { table } from '../store';
     import arrowOne from './arrow-one.svg';
     import arrowTwo from './arrow-two.svg';
     import { camelize } from '$lib/helpers/string';
@@ -69,7 +69,7 @@
 
     // Props
     export let editing = false;
-    export let data: Models.AttributeRelationship;
+    export let data: Models.ColumnRelationship;
 
     // Constants
     const databaseId = page.params.database;
@@ -81,47 +81,45 @@
     ];
 
     const deleteOptions = [
-        { value: 'setNull', label: 'Set NULL - set document ID as NULL in all related documents' },
-        { value: 'cascade', label: 'Cascade - delete all related documents' },
-        { value: 'restrict', label: 'Restrict - document can not be deleted' }
+        { value: 'setNull', label: 'Set NULL - set row ID as NULL in all related rows' },
+        { value: 'cascade', label: 'Cascade - delete all related rows' },
+        { value: 'restrict', label: 'Restrict - row can not be deleted' }
     ];
 
     // Variables
     let way = 'one';
     let search = undefined;
-    let collectionList: Models.CollectionList;
-    let originalCollectionList: Models.CollectionList;
+    let tableList: Models.TableList;
+    let originalTableList: Models.TableList;
 
     // Lifecycle hooks
-    async function getCollections() {
+    async function getTables() {
         const queries = [Query.limit(100)];
         return sdk
             .forProject(page.params.region, page.params.project)
-            .databases.listCollections(databaseId, queries, search);
+            .grids.listTables(databaseId, queries, search);
     }
 
-    const debouncedFetchCollections = debounce(async () => {
-        collectionList = await getCollections();
+    const debouncedFetchTables = debounce(async () => {
+        tableList = await getTables();
         // reset search
         search = undefined;
     }, 500);
 
     function updateKeyName() {
         if (!editing) {
-            const collection = collectionList.collections.find(
-                (n) => n.$id === data.relatedCollection
-            );
-            data.key = camelize(collection.name);
+            const table = tableList.tables.find((n) => n.$id === data.relatedTable);
+            data.key = camelize(table.name);
         }
     }
 
     onMount(async () => {
-        collectionList = await getCollections();
-        originalCollectionList = collectionList;
+        tableList = await getTables();
+        originalTableList = tableList;
     });
 
     // Reactive statements
-    $: collections = collectionList?.collections?.filter((n) => n.$id !== $collection.$id) ?? [];
+    $: tables = tableList?.tables?.filter((n) => n.$id !== $table.$id) ?? [];
 
     $: if (editing) {
         way = data.twoWay ? 'two' : 'one';
@@ -129,26 +127,26 @@
         if (way === 'two') {
             data.twoWay = true;
             if (!data.twoWayKey) {
-                data.twoWayKey = camelize($collection.name);
+                data.twoWayKey = camelize($table.name);
             }
         } else {
             data.twoWay = false;
         }
     }
 
-    $: search = data.relatedCollection || undefined;
+    $: search = data.relatedTable || undefined;
 
     $: if (search) {
-        const exists = collectionList?.collections?.some((c) =>
+        const exists = tableList?.tables?.some((c) =>
             c.$id.toLocaleLowerCase().includes(search.toLocaleLowerCase())
         );
 
         if (!exists) {
-            debouncedFetchCollections();
+            debouncedFetchTables();
         }
-    } else if (!collectionList?.total) {
+    } else if (!tableList?.total) {
         // reset to original list!
-        collectionList = originalCollectionList;
+        tableList = originalTableList;
     }
 </script>
 
@@ -159,7 +157,7 @@
         name="one"
         value="one"
         icon={IconArrowSmRight}>
-        One Relation attribute within this collection
+        One Relation column within this table
     </Card.Selector>
     <Card.Selector
         title="Two-way relationship"
@@ -167,23 +165,23 @@
         name="two"
         value="two"
         icon={IconSwitchHorizontal}>
-        One Relation attribute within this collection and another within the related collection
+        One Relation column within this table and another within the related table
     </Card.Selector>
 </Layout.Stack>
 
 <Input.ComboBox
     required
     id="related"
-    label="Related collection"
-    placeholder="Select a collection"
-    bind:value={data.relatedCollection}
+    label="Related table"
+    placeholder="Select a table"
+    bind:value={data.relatedTable}
     on:change={updateKeyName}
-    options={collections?.map((n) => ({ value: n.$id, label: `${n.name} (${n.$id})` })) ?? []} />
+    options={tables?.map((n) => ({ value: n.$id, label: `${n.name} (${n.$id})` })) ?? []} />
 
-{#if data?.relatedCollection}
+{#if data?.relatedTable}
     <InputText
         id="key"
-        label="Attribute key"
+        label="Column key"
         placeholder="Enter key"
         bind:value={data.key}
         helper="Allowed characters: a-z, A-Z, 0-9, -, ."
@@ -191,11 +189,11 @@
     {#if way === 'two'}
         <InputText
             id="keyRelated"
-            label="Attribute key (related collection)"
+            label="Column key (related table)"
             placeholder="Enter key"
             bind:value={data.twoWayKey}
             required
-            helper="Allowed characters: a-z, A-Z, 0-9, -, . Once created, attribute key cannot be
+            helper="Allowed characters: a-z, A-Z, 0-9, -, . Once created, column key cannot be
                 adjusted to maintain data integrity."
             readonly={editing} />
     {/if}
@@ -212,7 +210,7 @@
     <div class="u-flex u-flex-vertical u-gap-16">
         <Box>
             <div class="u-flex u-align u-cross-center u-main-center u-gap-32">
-                <span data-private>{camelize($collection.name)}</span>
+                <span data-private>{camelize($table.name)}</span>
                 {#if data.twoWay}
                     <img src={arrowTwo} alt={'Two way relationship'} />
                 {:else}
@@ -224,7 +222,7 @@
         {#if data.relationType}
             <div>
                 <p class="u-text-center">
-                    <b data-private>{camelize($collection.name)}</b> can contain {[
+                    <b data-private>{camelize($table.name)}</b> can contain {[
                         'oneToOne',
                         'manyToOne'
                     ].includes(data.relationType)
@@ -237,14 +235,14 @@
                     can belong to {['oneToOne', 'oneToMany'].includes(data.relationType)
                         ? 'one'
                         : 'many'}
-                    <b data-private>{camelize($collection.name)}</b>
+                    <b data-private>{camelize($table.name)}</b>
                 </p>
             </div>
         {/if}
     </div>
     <InputSelect
         id="deleting"
-        label="On deleting a document"
+        label="On deleting a row"
         bind:value={data.onDelete}
         required
         placeholder="Select a deletion method"
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts
similarity index 94%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts
index 439d3482a..91f2d6975 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts
@@ -9,7 +9,7 @@ import Ip, { submitIp, updateIp } from './ip.svelte';
 import String, { submitString, updateString } from './string.svelte';
 import Url, { submitUrl, updateUrl } from './url.svelte';
 import Datetime, { submitDatetime, updateDatetime } from './datetime.svelte';
-import type { Attributes } from '../store';
+import type { Columns } from '../store';
 import Relationship, { submitRelationship, updateRelationship } from './relationship.svelte';
 import {
     IconCalendar,
@@ -41,21 +41,21 @@ export type Option = {
     type: 'string' | 'integer' | 'double' | 'boolean' | 'datetime' | 'relationship';
     create: (
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Attributes>
+        data: Partial<Columns>
     ) => Promise<void>;
     update: (
         databaseId: string,
-        collectionId: string,
-        data: Partial<Attributes>,
+        tableId: string,
+        data: Partial<Columns>,
         originalKey: string
     ) => Promise<void>;
     format?: 'email' | 'ip' | 'url' | 'enum';
     icon: ComponentType;
 };
 
-export const attributeOptions: Option[] = [
+export const columnOptions: Option[] = [
     {
         name: 'String',
         sentenceName: 'string',
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
similarity index 86%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
index 4578f4167..5ea2fc165 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte
@@ -5,15 +5,15 @@
 
     export async function submitString(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeString>
+        data: Partial<Models.ColumnString>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createStringAttribute(
+            .grids.createStringColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.size,
                 data.required,
@@ -24,15 +24,15 @@
     }
     export async function updateString(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeString>,
+        tableId: string,
+        data: Partial<Models.ColumnString>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateStringAttribute(
+            .grids.updateStringColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -51,7 +51,7 @@
     import { InputNumber, InputText, InputTextarea } from '$lib/elements/forms';
     import { Popover, Layout, Tag, Typography, Link } from '@appwrite.io/pink-svelte';
 
-    export let data: Partial<Models.AttributeString> = {
+    export let data: Partial<Models.ColumnString> = {
         required: false,
         size: 0,
         array: false,
@@ -74,7 +74,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeString>>({
+    } = createConservative<Partial<Models.ColumnString>>({
         required: false,
         array: false,
         ...data
@@ -96,7 +96,7 @@
     bind:value={data.size}
     min={supportsStringEncryption && data.encrypt ? 150 : undefined}
     helper={supportsStringEncryption && data.encrypt
-        ? 'Encrypted string attributes require a minimum size of 150.'
+        ? 'Encrypted string columns require a minimum size of 150.'
         : undefined} />
 
 <svelte:component
@@ -115,7 +115,7 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required." />
+    description="Indicate whether this column is required." />
 
 <Selector.Checkbox
     size="s"
@@ -123,7 +123,7 @@
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
 
 <Layout.Stack gap="xs" direction="column">
     <div
@@ -159,15 +159,15 @@
                         </Layout.Stack>
                     </button>
                     <Typography.Text color="--fgcolor-neutral-tertiary">
-                        Protect attribute against data leaks for best privacy compliance. Encrypted
-                        attributes cannot be queried.
+                        Protect column against data leaks for best privacy compliance. Encrypted
+                        columns cannot be queried.
                     </Typography.Text>
                 </Layout.Stack>
 
                 <ActionMenu.Root width="180px" slot="tooltip">
                     <Typography.Text variant="m-500">
                         Available on Pro plan. <Link.Anchor href={$upgradeURL}>Upgrade</Link.Anchor>
-                        to enable encrypted attributes.
+                        to enable encrypted columns.
                     </Typography.Text>
                 </ActionMenu.Root>
             </Popover>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
similarity index 78%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
index 2d003a21a..0c7a33053 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte
@@ -5,15 +5,15 @@
 
     export async function submitUrl(
         databaseId: string,
-        collectionId: string,
+        tableId: string,
         key: string,
-        data: Partial<Models.AttributeUrl>
+        data: Partial<Models.ColumnUrl>
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.createUrlAttribute(
+            .grids.createUrlColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 key,
                 data.required,
                 data.default,
@@ -23,15 +23,15 @@
 
     export async function updateUrl(
         databaseId: string,
-        collectionId: string,
-        data: Partial<Models.AttributeUrl>,
+        tableId: string,
+        data: Partial<Models.ColumnUrl>,
         originalKey?: string
     ) {
         await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.updateUrlAttribute(
+            .grids.updateUrlColumn(
                 databaseId,
-                collectionId,
+                tableId,
                 originalKey,
                 data.required,
                 data.default,
@@ -43,7 +43,7 @@
 <script lang="ts">
     import { InputURL } from '$lib/elements/forms';
 
-    export let data: Partial<Models.AttributeUrl>;
+    export let data: Partial<Models.ColumnUrl>;
     export let editing = false;
 
     import { createConservative } from '$lib/helpers/stores';
@@ -63,7 +63,7 @@
     const {
         stores: { required, array },
         listen
-    } = createConservative<Partial<Models.AttributeUrl>>({
+    } = createConservative<Partial<Models.ColumnUrl>>({
         required: false,
         array: false,
         ...data
@@ -86,11 +86,11 @@
     label="Required"
     bind:checked={data.required}
     disabled={data.array}
-    description="Indicate whether this attribute is required" />
+    description="Indicate whether this column is required" />
 <Selector.Checkbox
     size="s"
     id="array"
     label="Array"
     bind:checked={data.array}
     disabled={data.required || editing}
-    description="Indicate whether this attribute is an array. Defaults to an empty array." />
+    description="Indicate whether this column is an array. Defaults to an empty array." />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
similarity index 85%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
index e8108de43..26cc6aa57 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
@@ -1,13 +1,17 @@
 <script lang="ts">
     import { page } from '$app/state';
-    import { type Attributes, type ColumnDirection } from './store';
+    import { type Columns, type ColumnDirection } from './store';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { Layout } from '@appwrite.io/pink-svelte';
     import { InputSelect, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { attributeOptions, option, type Option } from './attributes/store';
+    import {
+        option,
+        columnOptions,
+        type Option
+    } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store';
     import type { Column } from '$lib/helpers/types';
     import { preferences } from '$lib/stores/preferences';
 
@@ -22,7 +26,7 @@
         onColumnsReorder = null
     }: {
         showCreate: boolean;
-        column?: Attributes;
+        column?: Columns;
         columnId?: string;
         columns?: Column[];
         columnsOrder?: string[];
@@ -31,19 +35,19 @@
         onColumnsReorder?: (newOrder: string[]) => void;
     } = $props();
 
+    const tableId = page.params.table;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
 
     let key: string = $state(column?.key ?? null);
-    let data: Partial<Attributes> = $state({
+    let data: Partial<Columns> = $state({
         required: column?.required ?? false,
         array: column?.array ?? false,
         default: column?.default ?? null,
         ...column
     });
 
-    let AttributeComponent = $derived(
-        attributeOptions.find((option) => option.name === selectedOption).component
+    let ColumnComponent = $derived(
+        columnOptions.find((option) => option.name === selectedOption).component
     );
 
     function insertColumnInOrder() {
@@ -108,7 +112,7 @@
 
         preferences.saveColumnOrder(
             page.data.organization.$id ?? page.data.project.teamId,
-            collectionId,
+            tableId,
             newOrder
         );
 
@@ -118,24 +122,24 @@
 
     export async function submit() {
         try {
-            await $option.create(databaseId, collectionId, key, data);
+            await $option.create(databaseId, tableId, key, data);
 
             columnId = key;
             insertColumnInOrder();
 
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
 
             addNotification({
                 type: 'success',
                 message: `Column ${key ?? data?.key} has been created`
             });
-            trackEvent(Submit.AttributeCreate);
+            trackEvent(Submit.ColumnCreate);
         } catch (e) {
             addNotification({
                 type: 'error',
                 message: e.message
             });
-            trackError(e, Submit.AttributeCreate);
+            trackError(e, Submit.ColumnCreate);
         }
     }
 
@@ -144,7 +148,7 @@
 
         // correct view
         if (selectedOption) {
-            $option = attributeOptions.find((option) => option.name === selectedOption);
+            $option = columnOptions.find((option) => option.name === selectedOption);
         }
 
         // cleanup
@@ -176,7 +180,7 @@
             id="type"
             label="Type"
             bind:value={selectedOption}
-            options={attributeOptions.map((attr) => {
+            options={columnOptions.map((attr) => {
                 return {
                     label: attr.name,
                     value: attr.name,
@@ -187,6 +191,6 @@
     </Layout.Stack>
 
     {#if selectedOption}
-        <AttributeComponent bind:data onclose={() => ($option = null)} />
+        <ColumnComponent bind:data onclose={() => ($option = null)} />
     {/if}
 </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createRecord.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createRecord.svelte
new file mode 100644
index 000000000..5372488bb
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createRecord.svelte
@@ -0,0 +1,138 @@
+<script lang="ts">
+    import { page } from '$app/state';
+    import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+    import { addNotification } from '$lib/stores/notifications';
+
+    import { writable } from 'svelte/store';
+    import ColumnForm from './row-[row]/columnForm.svelte';
+    import { Permissions } from '$lib/components/permissions';
+    import type { Columns } from './store';
+    import { ID, type Models } from '@appwrite.io/console';
+    import { Alert, Layout, Typography } from '@appwrite.io/pink-svelte';
+    import SideSheet from './layout/sidesheet.svelte';
+
+    let {
+        table,
+        showSheet = $bindable(false),
+        existingData = $bindable(null)
+    }: {
+        showSheet: boolean;
+        table: Models.Table;
+        existingData: Models.Document | null;
+    } = $props();
+
+    let isSubmitting = $state(false);
+
+    type CreateRow = {
+        id?: string;
+        row: object;
+        permissions: string[];
+        columns: Columns[];
+    };
+
+    function createRowWritable() {
+        const availableColumns = table.columns.filter((a) => a.status === 'available');
+
+        const initial = {
+            id: null,
+            row: availableColumns.reduce((acc, attr) => {
+                acc[attr.key] = attr.array ? [] : null;
+
+                return acc;
+            }, {}),
+            permissions: [],
+            columns: availableColumns
+        };
+
+        return writable<CreateRow>({ ...initial });
+    }
+
+    let createRow = createRowWritable();
+
+    $effect(() => {
+        if (showSheet) {
+            createRow = createRowWritable();
+        }
+    });
+
+    async function create() {
+        isSubmitting = true;
+
+        try {
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .grids.createRow(
+                    page.params.database,
+                    page.params.table,
+                    $createRow.id ?? ID.unique(),
+                    $createRow.row,
+                    $createRow.permissions
+                );
+
+            showSheet = false;
+            addNotification({
+                message: 'Row has been created',
+                type: 'success'
+            });
+
+            // post op clear.
+            existingData = null;
+            trackEvent(Submit.RowCreate, {
+                customId: !!$createRow.id
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+            trackError(error, Submit.RowCreate);
+        } finally {
+            isSubmitting = false;
+        }
+    }
+</script>
+
+{#if $createRow}
+    <div class="sheet-container">
+        <!-- TODO: add a ID badge-->
+        <SideSheet
+            spaced
+            title={`${existingData ? 'Duplicate' : 'Create'} record`}
+            bind:show={showSheet}
+            closeOnBlur={false}
+            submit={{
+                text: 'Create',
+                disabled: isSubmitting,
+                onClick: () => create()
+            }}>
+            <Layout.Stack gap="xxl">
+                <ColumnForm
+                    bind:formValues={$createRow.row}
+                    columns={$createRow.columns}
+                    bind:customId={$createRow.id} />
+
+                <Layout.Stack gap="xl">
+                    <Typography.Text>
+                        Choose which permission scopes to grant your application. It is best
+                        practice to allow only the permissions you need to meet your project goals.
+                    </Typography.Text>
+                    {#if table.rowSecurity}
+                        <Alert.Inline status="info">
+                            <svelte:fragment slot="title">Row security is enabled</svelte:fragment>
+                            Users will be able to access this row if they have been granted
+                            <b>either row or table permissions</b>.
+                        </Alert.Inline>
+                        <Permissions bind:permissions={$createRow.permissions} />
+                    {:else}
+                        <Alert.Inline status="info">
+                            <svelte:fragment slot="title">Row security is disabled</svelte:fragment>
+                            If you want to assign row permissions, navigate to Table settings and enable
+                            row security. Otherwise, only table permissions will be used.
+                        </Alert.Inline>
+                    {/if}
+                </Layout.Stack>
+            </Layout.Stack>
+        </SideSheet>
+    </div>
+{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/csvDisabled.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/csvDisabled.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/csvDisabled.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/csvDisabled.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/editRow.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/editRow.svelte
new file mode 100644
index 000000000..66aab7f8b
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/editRow.svelte
@@ -0,0 +1,120 @@
+<script lang="ts">
+    import { symmetricDifference } from '$lib/helpers/array';
+    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { page } from '$app/state';
+    import { sdk } from '$lib/stores/sdk';
+    import { addNotification } from '$lib/stores/notifications';
+    import { type Writable, writable } from 'svelte/store';
+    import type { Models } from '@appwrite.io/console';
+    import { Dependencies } from '$lib/constants';
+    import { invalidate } from '$app/navigation';
+    import { table, type Columns } from './store';
+    import ColumnItem from './row-[row]/columnItem.svelte';
+    import { isRelationship, isRelationshipToMany } from './row-[row]/columns/store';
+    import { deepClone } from '$lib/helpers/object';
+
+    const tableId = page.params.table;
+    const databaseId = page.params.database;
+
+    let {
+        row = $bindable()
+    }: {
+        row: Models.Row;
+    } = $props();
+
+    let work = $state<Writable<Models.Row> | null>(null);
+
+    function initWork() {
+        const prohibitedKeys = [
+            '$id',
+            '$collection',
+            '$tableId',
+            '$databaseId',
+            '$createdAt',
+            '$updatedAt'
+        ];
+
+        const filteredKeys = Object.keys(row).filter((key) => {
+            return !prohibitedKeys.includes(key);
+        });
+
+        const result = filteredKeys.reduce((obj, key) => {
+            obj[key] = row[key];
+            return obj;
+        }, {});
+
+        return writable(deepClone(result as Models.Row));
+    }
+
+    $effect(() => {
+        if (row) work = initWork();
+    });
+
+    function compareAttributes(column: Columns, $work: Models.Row, $doc: Models.Row) {
+        if (!column) {
+            return false;
+        }
+
+        const workColumn = $work?.[column.key];
+        const currentColumn = $doc?.[column.key];
+
+        if (column.array) {
+            return !symmetricDifference(Array.from(workColumn), Array.from(currentColumn)).length;
+        }
+
+        if (isRelationship(column)) {
+            if (isRelationshipToMany(column as Models.ColumnRelationship)) {
+                const workIds = workColumn.map((doc: string | Record<string, unknown>) =>
+                    typeof doc === 'string' ? doc : doc.$id
+                );
+
+                const relatedIds = currentColumn.map((doc: string | Record<string, unknown>) =>
+                    typeof doc === 'string' ? doc : doc.$id
+                );
+                return !symmetricDifference(workIds, relatedIds).length;
+            } else {
+                const workId = typeof workColumn === 'string' ? workColumn : workColumn?.$id;
+                const relatedId =
+                    typeof currentColumn === 'string' ? currentColumn : currentColumn?.$id;
+
+                return workId === relatedId;
+            }
+        }
+
+        return workColumn === currentColumn;
+    }
+
+    export async function update() {
+        try {
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .grids.updateRow(databaseId, tableId, row.$id, $work, $work.$permissions);
+
+            invalidate(Dependencies.ROW);
+            trackEvent(Submit.RowUpdate);
+            addNotification({
+                message: 'Row has been updated',
+                type: 'success'
+            });
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+            trackError(error, Submit.RowUpdate);
+        }
+    }
+
+    export function isDisabled(): boolean {
+        if (!work || !$table?.columns?.length) return true;
+
+        return $table.columns.every((attribute) => compareAttributes(attribute, $work, row));
+    }
+</script>
+
+{#if $table.columns?.length && work}
+    {#each $table.columns as column}
+        {@const label = column.key}
+        <ColumnItem {column} bind:formValues={$work} {label} editing />
+    {/each}
+{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/failedModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/failedModal.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
similarity index 64%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
index 5c26a1feb..b81438392 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/header.svelte
@@ -4,33 +4,30 @@
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
-    import { canWriteCollections } from '$lib/stores/roles';
-    import { collection } from './store';
+    import { canWriteTables } from '$lib/stores/roles';
+    import { table } from './store';
     import { isTabletViewport } from '$lib/stores/viewport';
 
-    let databaseId = $derived.by(() => {
-        return page.params.database;
-    });
-    let collectionId = $derived.by(() => {
-        return page.params.collection;
-    });
+    const databaseId = $derived(page.params.database);
 
-    let path = $derived.by(() => {
-        return `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}`;
-    });
+    const tableId = $derived(page.params.table);
 
-    let tabs = $derived.by(() => {
-        return [
+    const path = $derived(
+        `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${tableId}`
+    );
+
+    const tabs = $derived(
+        [
             {
                 href: path,
-                title: 'Documents',
-                event: 'documents',
+                title: 'Rows',
+                event: 'rows',
                 hasChildren: true
             },
             {
-                href: `${path}/attributes`,
-                title: 'Attributes',
-                event: 'attributes'
+                href: `${path}/columns`,
+                title: 'Columns',
+                event: 'columns'
             },
             {
                 href: `${path}/indexes`,
@@ -53,10 +50,10 @@
                 href: `${path}/settings`,
                 title: 'Settings',
                 event: 'settings',
-                disabled: !$canWriteCollections
+                disabled: !$canWriteTables
             }
-        ].filter((tab) => !tab.disabled);
-    });
+        ].filter((tab) => !tab.disabled)
+    );
 </script>
 
 <div style:margin-top={$isTabletViewport ? '48px' : 0}>
@@ -64,10 +61,10 @@
         <svelte:fragment slot="header">
             <CoverTitle
                 href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}`}>
-                {$collection?.name}
+                {$table?.name}
             </CoverTitle>
-            {#key $collection?.$id}
-                <Id value={$collection?.$id}>{$collection?.$id}</Id>
+            {#key $table?.$id}
+                <Id value={$table?.$id}>{$table?.$id}</Id>
             {/key}
         </svelte:fragment>
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
index 6d70443bd..c83a5ee08 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
-    import { collection } from '../store';
+    import { table } from '../store';
     import Delete from './deleteIndex.svelte';
     import CreateIndex from './createIndex.svelte';
     import Overview from './overviewIndex.svelte';
     import type { Models } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import FailedModal from '../failedModal.svelte';
-    import { canWriteCollections } from '$lib/stores/roles';
+    import { canWriteTables } from '$lib/stores/roles';
     import {
         ActionMenu,
         Badge,
@@ -41,7 +41,7 @@
     } = $props();
 
     let showCreateIndex = $state(false);
-    let selectedIndex: Models.Index = $state(null);
+    let selectedIndex: Models.ColumnIndex = $state(null);
 
     let selectedIndexes = $state([]);
     let createIndex: CreateIndex;
@@ -60,7 +60,7 @@
         { id: 'actions', width: 40, isAction: true }
     ]);
 
-    function getAttributeStatusBadge(status: string): ComponentProps<Badge>['type'] {
+    function getColumnStatusBadge(status: string): ComponentProps<Badge>['type'] {
         switch (status) {
             case 'processing':
                 return 'warning';
@@ -86,11 +86,11 @@
 
 <Container expanded style="background: var(--bgcolor-neutral-primary)">
     <Layout.Stack direction="row" justifyContent="flex-end">
-        {#if $canWriteCollections}
+        {#if $canWriteTables}
             <Button
                 secondary
                 event="create_index"
-                disabled={!$collection?.attributes?.length}
+                disabled={!$table?.columns?.length}
                 on:click={() => (showCreateIndex = true)}>
                 <Icon icon={IconPlus} slot="start" size="s" />
                 Create index
@@ -100,8 +100,8 @@
 </Container>
 
 <div class="databases-spreadsheet">
-    {#if data.collection?.attributes?.length}
-        {#if data.collection.indexes.length}
+    {#if data.table?.columns?.length}
+        {#if data.table.indexes.length}
             <SpreadsheetContainer>
                 <Spreadsheet.Root
                     let:root
@@ -121,7 +121,7 @@
                         {/if}
                         <Spreadsheet.Header.Cell column="actions" {root} />
                     </svelte:fragment>
-                    {#each data.collection.indexes as index}
+                    {#each data.table.indexes as index}
                         <Spreadsheet.Row.Base {root} id={index.key}>
                             <Spreadsheet.Cell column="key" {root} isEditable={false}>
                                 <Layout.Stack direction="row" alignItems="center">
@@ -131,7 +131,7 @@
                                             size="s"
                                             variant="secondary"
                                             content={index.status}
-                                            type={getAttributeStatusBadge(index.status)} />
+                                            type={getColumnStatusBadge(index.status)} />
                                         {#if index.error}
                                             <Link.Button
                                                 variant="muted"
@@ -147,7 +147,7 @@
                             <Spreadsheet.Cell column="type" {root} isEditable={false}
                                 >{index.type}</Spreadsheet.Cell>
                             <Spreadsheet.Cell column="columns" {root} isEditable={false}>
-                                {index.attributes.join(', ')}
+                                {index.columns.join(', ')}
                             </Spreadsheet.Cell>
                             <!--                            <Spreadsheet.Cell column="orders" {root} isEditable={false}>-->
                             <!--                                {index.orders}-->
@@ -190,7 +190,7 @@
                 actions={{
                     primary: {
                         onClick: () => (showCreateIndex = true),
-                        disabled: !$collection?.attributes?.length
+                        disabled: !$table?.columns?.length
                     }
                 }} />
         {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
similarity index 66%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
index 8fc3a3675..3f52c532f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
@@ -9,14 +9,14 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { IndexType } from '@appwrite.io/console';
-    import { isRelationship } from '../document-[document]/attributes/store';
-    import { collection, indexes } from '../store';
+    import { isRelationship } from '../row-[row]/columns/store';
+    import { table, indexes } from '../store';
     import { Icon, Layout } from '@appwrite.io/pink-svelte';
     import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
     import { flags } from '$lib/flags';
 
     export let showCreateIndex = false;
-    export let externalAttributeKey: string = null;
+    export let externalColumnKey: string = null;
 
     const databaseId = page.params.database;
 
@@ -29,14 +29,14 @@
 
     let selectedType = IndexType.Key;
 
-    let attributeOptions = $collection.attributes
-        .filter((attribute) => !isRelationship(attribute))
-        .map((attribute) => ({
-            value: attribute.key,
-            label: attribute.key
+    let columnOptions = $table.columns
+        .filter((column) => !isRelationship(column))
+        .map((column) => ({
+            value: column.key,
+            label: column.key
         }));
 
-    let attributeList = [{ value: '', order: '', length: null }];
+    let columnList = [{ value: '', order: '', length: null }];
 
     const showLengths = flags.showIndexLengths(page.data);
 
@@ -52,8 +52,8 @@
     }
 
     function initialize() {
-        attributeList = externalAttributeKey
-            ? [{ value: externalAttributeKey, order: 'ASC', length: null }]
+        columnList = externalColumnKey
+            ? [{ value: externalColumnKey, order: 'ASC', length: null }]
             : [{ value: '', order: 'ASC', length: null }];
         selectedType = IndexType.Key;
         key = `index_${$indexes.length + 1}`;
@@ -64,31 +64,31 @@
         key = generateIndexKey();
     }
 
-    $: addAttributeDisabled = !attributeList.at(-1)?.value || !attributeList.at(-1)?.order;
+    $: addColumnDisabled = !columnList.at(-1)?.value || !columnList.at(-1)?.order;
 
     export async function create() {
-        if (!(key && selectedType && !addAttributeDisabled)) {
+        if (!(key && selectedType && !addColumnDisabled)) {
             return;
         }
 
         try {
-            await sdk.forProject(page.params.region, page.params.project).databases.createIndex(
+            await sdk.forProject(page.params.region, page.params.project).grids.createIndex(
                 databaseId,
-                $collection.$id,
+                $table.$id,
                 key,
                 selectedType,
-                attributeList.map((a) => a.value),
-                attributeList.map((a) => a.order),
-                attributeList.map((a) => (a.length ? Number(a.length) : null))
+                columnList.map((a) => a.value),
+                columnList.map((a) => a.order),
+                columnList.map((a) => (a.length ? Number(a.length) : null))
             );
 
             await Promise.allSettled([
-                invalidate(Dependencies.COLLECTION),
+                invalidate(Dependencies.TABLE),
                 invalidate(Dependencies.DATABASE)
             ]);
 
             goto(
-                `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
+                `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${$table.$id}/indexes`
             );
 
             addNotification({
@@ -106,11 +106,11 @@
         }
     }
 
-    function addAttribute() {
-        if (addAttributeDisabled) return;
+    function addColumn() {
+        if (addColumnDisabled) return;
 
         // We assign instead of pushing to trigger Svelte's reactivity
-        attributeList = [...attributeList, { value: '', order: '', length: null }];
+        columnList = [...columnList, { value: '', order: '', length: null }];
     }
 </script>
 
@@ -118,7 +118,7 @@
 <InputSelect required options={types} id="type" label="Index type" bind:value={selectedType} />
 
 <Layout.Stack gap="s">
-    {#each attributeList as attribute, i}
+    {#each columnList as column, index}
         <Layout.Stack direction="row">
             <InputSelect
                 required
@@ -126,12 +126,12 @@
                     { value: '$id', label: '$id' },
                     { value: '$createdAt', label: '$createdAt' },
                     { value: '$updatedAt', label: '$updatedAt' },
-                    ...attributeOptions
+                    ...columnOptions
                 ]}
-                id={`attribute-${i}`}
-                label={i === 0 ? 'Column' : undefined}
+                id={`column-${index}`}
+                label={index === 0 ? 'Column' : undefined}
                 placeholder="Select column"
-                bind:value={attribute.value} />
+                bind:value={column.value} />
 
             <InputSelect
                 options={[
@@ -139,26 +139,26 @@
                     { value: 'DESC', label: 'DESC' }
                 ]}
                 required
-                id={`order-${i}`}
-                label={i === 0 ? 'Order' : undefined}
-                bind:value={attribute.order}
-                placeholder="Select Order" />
+                id={`order-${index}`}
+                label={index === 0 ? 'Order' : undefined}
+                bind:value={column.order}
+                placeholder="Select order" />
 
             {#if selectedType === IndexType.Key && showLengths}
                 <InputNumber
-                    id={`length-${i}`}
-                    label={i === 0 ? 'Length' : undefined}
-                    placeholder="Enter Length"
-                    bind:value={attribute.length} />
+                    id={`length-${index}`}
+                    label={index === 0 ? 'Length' : undefined}
+                    placeholder="Enter length"
+                    bind:value={column.length} />
             {/if}
 
             <Layout.Stack direction="row" alignItems="flex-end" inline>
                 <Button
                     icon
                     secondary
-                    disabled={attributeList.length <= 1}
+                    disabled={columnList.length <= 1}
                     on:click={() => {
-                        attributeList = remove(attributeList, i);
+                        columnList = remove(columnList, index);
                     }}>
                     <Icon icon={IconX} size="s" />
                 </Button>
@@ -166,7 +166,7 @@
         </Layout.Stack>
     {/each}
     <div>
-        <Button compact on:click={addAttribute} disabled={addAttributeDisabled}>
+        <Button compact on:click={addColumn} disabled={addColumnDisabled}>
             <Icon icon={IconPlus} slot="start" size="s" />
             Add column
         </Button>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
similarity index 87%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
index 83fd175df..16d724ff3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { addNotification } from '$lib/stores/notifications';
-    import { collection } from '../store';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
     import { page } from '$app/state';
@@ -14,13 +13,13 @@
         selectedIndex = $bindable(null)
     }: {
         showDelete: boolean;
-        selectedIndex: Models.Index | string[];
+        selectedIndex: Models.ColumnIndex | string[];
     } = $props();
 
     let error: string = $state(null);
     let selectedKeys = $derived(getKeys(selectedIndex));
 
-    function getKeys(selected: Models.Index | string[]): string[] {
+    function getKeys(selected: Models.ColumnIndex | string[]): string[] {
         return Array.isArray(selected) ? selected : [selected.key];
     }
 
@@ -30,10 +29,10 @@
                 selectedKeys.map((key) =>
                     sdk
                         .forProject(page.params.region, page.params.project)
-                        .databases.deleteIndex(page.params.database, $collection.$id, key)
+                        .grids.deleteIndex(page.params.database, page.params.table, key)
                 )
             );
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
similarity index 84%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
index bd6c3343f..d0ac4101d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
@@ -8,7 +8,7 @@
     let {
         selectedIndex = null
     }: {
-        selectedIndex: Models.Index;
+        selectedIndex: Models.ColumnIndex;
     } = $props();
 
     const showLengths = flags.showIndexLengths(page.data);
@@ -17,8 +17,8 @@
 <InputText
     required
     id="key"
-    label="Index Key"
-    placeholder="Enter Key"
+    label="Index key"
+    placeholder="Enter key"
     value={selectedIndex.key}
     readonly />
 <InputText
@@ -29,14 +29,14 @@
     value={selectedIndex.type}
     readonly />
 
-{#if selectedIndex?.attributes?.length}
-    {#each selectedIndex.attributes as attribute, i}
+{#if selectedIndex?.columns?.length}
+    {#each selectedIndex.columns as column, i}
         <Layout.Stack direction="row">
             <InputText
                 required
                 label={i === 0 ? 'Column' : ''}
-                id={`value-${attribute}`}
-                value={attribute}
+                id={`value-${column}`}
+                value={column}
                 readonly />
             <InputText
                 required
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
similarity index 83%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
index ea8eb3b61..e356097a5 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
     import Helper from '$lib/elements/forms/helper.svelte';
+    import { Icon } from '@appwrite.io/pink-svelte';
+    import { IconChevronDown } from '@appwrite.io/pink-icons-svelte';
 
     export let value: string;
     export let id: string;
@@ -30,7 +32,7 @@
     <select bind:this={element} {id} bind:value {required} on:invalid={handleInvalid}>
         <slot />
     </select>
-    <span class="icon-cheveron-down" aria-hidden="true"></span>
+    <Icon icon={IconChevronDown} size="s" />
 </div>
 {#if error}
     <Helper type="warning">{error}</Helper>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte
similarity index 98%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte
index 5fba08fb1..bb2af7f52 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/emptySheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/emptySheet.svelte
@@ -5,7 +5,12 @@
     import { isSmallViewport } from '$lib/stores/viewport';
     import { SortButton } from '$lib/components';
     import type { Column } from '$lib/helpers/types';
-    import { columns, columnsOrder, showCreateAttributeSheet, spreadsheetLoading } from '../store';
+    import {
+        tableColumns,
+        columnsOrder,
+        showCreateAttributeSheet,
+        spreadsheetLoading
+    } from '../store';
 
     type Mode = 'records' | 'indexes';
 
@@ -121,7 +126,7 @@
                     onclick={() => {
                         if (columnActionsById && mode === 'records') {
                             $showCreateAttributeSheet.show = true;
-                            $showCreateAttributeSheet.columns = $columns;
+                            $showCreateAttributeSheet.columns = $tableColumns;
                             $showCreateAttributeSheet.columnsOrder = $columnsOrder;
                         }
                     }}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/sidesheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/sidesheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/layout/spreadsheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/spreadsheet.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
similarity index 85%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
index ed42e78a2..c61a3ee1c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
@@ -8,15 +8,15 @@
     import { Table } from '@appwrite.io/pink-svelte';
 
     export let show = false;
-    export let data: Partial<Models.Document>[];
-    export let selectedRelationship: Models.AttributeRelationship = null;
+    export let data: Partial<Models.Row>[];
+    export let selectedRelationship: Models.ColumnRelationship = null;
     const databaseId = page.params.database;
     const limit = 10;
 
     $: args =
         preferences
             .getDisplayNames()
-            ?.[selectedRelationship?.relatedCollection]?.filter((p) => p !== '$id') ?? [];
+            ?.[selectedRelationship?.relatedTable]?.filter((p) => p !== '$id') ?? [];
 
     $: if (!show) {
         data = null;
@@ -36,7 +36,7 @@
             {#snippet children(paginatedItems: typeof data)}
                 <Table.Root let:root columns={tableColumns}>
                     <svelte:fragment slot="header" let:root>
-                        <Table.Header.Cell column="$id" {root}>Document ID</Table.Header.Cell>
+                        <Table.Header.Cell column="$id" {root}>Row ID</Table.Header.Cell>
                         {#if args.length}
                             {#each args as arg}
                                 <Table.Header.Cell column={arg} {root}>{arg}</Table.Header.Cell>
@@ -46,7 +46,7 @@
                     {#each paginatedItems as doc}
                         <Table.Row.Link
                             {root}
-                            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
+                            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${selectedRelationship.relatedTable}/row-${doc.$id}`}
                             on:click={() => (show = false)}>
                             <Table.Cell column="$id" {root}>
                                 <Id value={doc.$id}>{doc.$id}</Id>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.svelte
similarity index 50%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.svelte
index 215b93a8a..70f18a6eb 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.svelte
@@ -1,5 +1,5 @@
 <svelte:head>
-    <title>Document - Appwrite</title>
+    <title>Row - Appwrite</title>
 </svelte:head>
 
 <slot />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
similarity index 51%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
index 5e9479dc0..c136e06d7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
@@ -3,40 +3,35 @@ import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
 import Breadcrumbs from './breadcrumbs.svelte';
 import Header from './header.svelte';
-import type { Attributes } from '../store';
-import { buildWildcardAttributesQuery } from './attributes/store';
+import type { Columns } from '../store';
+import { buildWildcardColumnsQuery } from './columns/store';
 
 export const load: LayoutLoad = async ({ params, parent, depends }) => {
-    const { collection } = await parent();
-    depends(Dependencies.DOCUMENT);
+    const { table } = await parent();
+    depends(Dependencies.ROW);
 
-    const document = await sdk
+    const row = await sdk
         .forProject(params.region, params.project)
-        .databases.getDocument(
-            params.database,
-            params.collection,
-            params.document,
-            buildWildcardAttributesQuery(collection)
-        );
+        .grids.getRow(params.database, params.table, params.row, buildWildcardColumnsQuery(table));
 
     /**
      * Sanitize DateTime to remove UTC Timezone section.
      */
-    collection.attributes.forEach((attribute) => {
-        const { type, key, array } = attribute as unknown as Attributes;
+    table.columns.forEach((column: Columns) => {
+        const { type, key, array } = column;
         if (type === 'datetime') {
             if (array) {
-                document[key] = document[key].map((n: string) => {
+                row[key] = row[key].map((n: string) => {
                     if (!n) {
                         return null;
                     }
                     return new Date(n).toISOString().slice(0, 23);
                 });
             } else {
-                if (document[key]) {
-                    document[key] = new Date(document[key]).toISOString().slice(0, 23);
+                if (row[key]) {
+                    row[key] = new Date(row[key]).toISOString().slice(0, 23);
                 } else {
-                    document[key] = null;
+                    row[key] = null;
                 }
             }
         }
@@ -45,6 +40,6 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        document
+        row
     };
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte
similarity index 53%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte
index 31db52abd..8981adbde 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte
@@ -11,36 +11,38 @@
     import type { Models } from '@appwrite.io/console';
     import { Dependencies } from '$lib/constants';
     import { invalidate } from '$app/navigation';
-    import { doc } from './store';
-    import { collection, type Attributes } from '../store';
-    import AttributeItem from './attributeItem.svelte';
-    import { isRelationship, isRelationshipToMany } from './attributes/store';
+    import { table, type Columns } from '../store';
+    import ColumnItem from './columnItem.svelte';
+    import { isRelationship, isRelationshipToMany } from './columns/store';
     import { deepClone } from '$lib/helpers/object';
 
+    export let data;
+
+    const row = data.row;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
+    const tableId = page.params.table;
+    const rowId = page.params.row;
 
     function initWork() {
         const prohibitedKeys = [
             '$id',
             '$collection',
-            '$collectionId',
+            '$tableId',
             '$databaseId',
             '$createdAt',
             '$updatedAt'
         ];
 
-        const filteredKeys = Object.keys($doc).filter((key) => {
+        const filteredKeys = Object.keys(row).filter((key) => {
             return !prohibitedKeys.includes(key);
         });
 
         const result = filteredKeys.reduce((obj, key) => {
-            obj[key] = $doc[key];
+            obj[key] = row[key];
             return obj;
         }, {});
 
-        return writable(deepClone(result as Models.Document));
+        return writable(deepClone(result as Models.Row));
     }
 
     const work = initWork();
@@ -49,18 +51,12 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.updateDocument(
-                    databaseId,
-                    collectionId,
-                    documentId,
-                    $work,
-                    $work.$permissions
-                );
+                .grids.updateRow(databaseId, tableId, rowId, $work, $work.$permissions);
 
-            invalidate(Dependencies.DOCUMENT);
-            trackEvent(Submit.DocumentUpdate);
+            await invalidate(Dependencies.ROW);
+            trackEvent(Submit.RowUpdate);
             addNotification({
-                message: 'Document has been updated',
+                message: 'Row has been updated',
                 type: 'success'
             });
         } catch (error) {
@@ -68,46 +64,46 @@
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.DocumentUpdate);
+            trackError(error, Submit.RowUpdate);
         }
     }
 
-    function compareAttributes(
-        attribute: Attributes,
-        $work: Models.Document,
-        $doc: Models.Document
-    ) {
-        if (!attribute) {
+    function compareColumns(column: Columns, related: Models.Row, row: Models.Row) {
+        if (!column) {
             return false;
         }
 
-        const workAttribute = $work?.[attribute.key];
-        const docAttribute = $doc?.[attribute.key];
+        const rowColumn = row?.[column.key];
+        const relatedColumn = related?.[column.key];
 
-        if (attribute.array) {
-            return !symmetricDifference(Array.from(workAttribute), Array.from(docAttribute)).length;
+        // undefined for a second, not sure why!
+        if (rowColumn === undefined || relatedColumn === undefined) {
+            return false;
         }
 
-        if (isRelationship(attribute)) {
-            if (isRelationshipToMany(attribute as Models.AttributeRelationship)) {
-                const workIds = workAttribute.map((doc: string | Record<string, unknown>) =>
+        if (column.array) {
+            return !symmetricDifference(Array.from(relatedColumn), Array.from(rowColumn)).length;
+        }
+
+        if (isRelationship(column)) {
+            if (isRelationshipToMany(column as Models.ColumnRelationship)) {
+                const workIds = relatedColumn.map((doc: string | Record<string, unknown>) =>
                     typeof doc === 'string' ? doc : doc.$id
                 );
 
-                const relatedIds = docAttribute.map((doc: string | Record<string, unknown>) =>
+                const relatedIds = rowColumn.map((doc: string | Record<string, unknown>) =>
                     typeof doc === 'string' ? doc : doc.$id
                 );
                 return !symmetricDifference(workIds, relatedIds).length;
             } else {
                 const workId =
-                    typeof workAttribute === 'string' ? workAttribute : workAttribute?.$id;
-                const relatedId =
-                    typeof docAttribute === 'string' ? docAttribute : docAttribute?.$id;
+                    typeof relatedColumn === 'string' ? relatedColumn : relatedColumn?.$id;
+                const relatedId = typeof rowColumn === 'string' ? rowColumn : rowColumn?.$id;
 
                 return workId === relatedId;
             }
         }
-        return workAttribute === docAttribute;
+        return relatedColumn === rowColumn;
     }
 </script>
 
@@ -116,19 +112,19 @@
 </svelte:head>
 
 <Container>
-    {#if $collection?.attributes?.length}
-        {#each $collection.attributes as attribute}
-            {@const label = attribute.key}
+    {#if $table?.columns?.length}
+        {#each $table.columns as column}
+            {@const label = column.key}
             <CardGrid>
                 <svelte:fragment slot="title">{label}</svelte:fragment>
 
                 <svelte:fragment slot="aside">
-                    <AttributeItem {attribute} bind:formValues={$work} {label} editing />
+                    <ColumnItem {column} bind:formValues={$work} {label} editing />
                 </svelte:fragment>
 
                 <svelte:fragment slot="actions">
                     <Button
-                        disabled={compareAttributes(attribute, $work, $doc)}
+                        disabled={compareColumns(column, $work, row)}
                         on:click={() => updateData()}>Update</Button>
                 </svelte:fragment>
             </CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
similarity index 87%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
index 6c59cf14f..35dbfa22d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
@@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk
             .forProject(params.region, params.project)
-            .databases.listDocumentLogs(params.database, params.collection, params.document, [
+            .grids.listRowLogs(params.database, params.table, params.row, [
                 Query.limit(limit),
                 Query.offset(offset)
             ])
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
similarity index 65%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
index 3523787c3..170bf653c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
@@ -3,8 +3,8 @@
     import { page } from '$app/state';
     import { Breadcrumbs } from '$lib/layout';
     import { database } from '../../store';
-    import { collection } from '../store';
-    import { doc } from './store';
+    import { table } from '../store';
+    import { row } from './store';
 
     $: breadcrumbs = [
         {
@@ -15,12 +15,12 @@
             title: $database?.name
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
-            title: $collection?.name
+            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}`,
+            title: $table?.name
         },
         {
-            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
-            title: $doc?.$id
+            href: `${base}/project-${page.params.region}-${page.params.project}/databases/database-${$database?.$id}/table-${$table?.$id}/row-${$row?.$id}`,
+            title: $row?.$id
         }
     ];
 </script>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/column.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/column.svelte
new file mode 100644
index 000000000..84a89115f
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/column.svelte
@@ -0,0 +1,63 @@
+<script lang="ts">
+    import type { Models } from '@appwrite.io/console';
+    import Boolean from './columns/boolean.svelte';
+    import Datetime from './columns/datetime.svelte';
+    import Enum from './columns/enum.svelte';
+    import Integer from './columns/integer.svelte';
+    import Relationship from './columns/relationship.svelte';
+    import String from './columns/string.svelte';
+    import Url from './columns/url.svelte';
+
+    export let id: string;
+    export let label: string;
+    export let optionalText: string | undefined = undefined;
+    export let value: string | number | boolean | null | string[];
+    export let editing = false;
+    export let column:
+        | Models.ColumnBoolean
+        | Models.ColumnEmail
+        | Models.ColumnEnum
+        | Models.ColumnFloat
+        | Models.ColumnInteger
+        | Models.ColumnIp
+        | Models.ColumnString
+        | Models.ColumnDatetime
+        | Models.ColumnUrl;
+
+    const columnsTypeMap = {
+        string: String,
+        integer: Integer,
+        double: Integer,
+        boolean: Boolean,
+        datetime: Datetime,
+        relationship: Relationship
+    };
+
+    const columnsFormatMap = {
+        ip: String,
+        url: Url,
+        email: String,
+        enum: Enum
+    };
+</script>
+
+{#if column.type in columnsTypeMap}
+    {#if 'format' in column && column.format}
+        <svelte:component
+            this={columnsFormatMap[column.format]}
+            {id}
+            {label}
+            {column}
+            {optionalText}
+            bind:value />
+    {:else}
+        <svelte:component
+            this={columnsTypeMap[column.type]}
+            {id}
+            {editing}
+            {label}
+            {column}
+            {optionalText}
+            bind:value />
+    {/if}
+{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnForm.svelte
similarity index 67%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnForm.svelte
index aa49a0441..343ad8c7d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnForm.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
     import CustomId from '$lib/components/customId.svelte';
     import { Icon, Layout, Tag } from '@appwrite.io/pink-svelte';
-    import type { Attributes } from '../store';
-    import AttributeItem from './attributeItem.svelte';
+    import type { Columns } from '../store';
+    import ColumnItem from './columnItem.svelte';
     import { IconPencil } from '@appwrite.io/pink-icons-svelte';
 
-    export let attributes: Attributes[] = [];
+    export let columns: Columns[] = [];
     export let formValues: object = {};
     export let customId: string | null | undefined = undefined;
 
     let showCustomId = false;
 </script>
 
-{#if attributes.length}
+{#if columns.length}
     <Layout.Stack>
-        {#each attributes as attribute}
-            {@const label = attribute.key}
-            <AttributeItem {attribute} bind:formValues {label} />
+        {#each columns as column}
+            {@const label = column.key}
+            <ColumnItem {column} bind:formValues {label} />
         {/each}
 
         {#if customId !== undefined}
@@ -24,11 +24,11 @@
                 <span>
                     <Tag size="s" on:click={() => (showCustomId = !showCustomId)}>
                         <Icon icon={IconPencil} slot="start" size="s" />
-                        Document ID
+                        Row ID
                     </Tag>
                 </span>
             {:else}
-                <CustomId autofocus bind:show={showCustomId} name="Document" bind:id={customId} />
+                <CustomId autofocus bind:show={showCustomId} name="Row" bind:id={customId} />
             {/if}
         {/if}
     </Layout.Stack>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnItem.svelte
similarity index 65%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnItem.svelte
index 61b52948e..9b4f67756 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columnItem.svelte
@@ -3,10 +3,10 @@
     import { capitalize } from '$lib/helpers/string';
     import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
-    import Attribute from './attribute.svelte';
-    import type { Attributes } from '../store';
+    import Column from './column.svelte';
+    import type { Columns } from '../store';
 
-    export let attribute: Attributes;
+    export let column: Columns;
     export let formValues: object = {};
     export let label: string;
     export let editing = false;
@@ -25,9 +25,9 @@
         };
     }
 
-    function getAttributeType(attribute: Attributes) {
-        if ('format' in attribute) {
-            switch (attribute.format) {
+    function getColumnType(column: Columns) {
+        if ('format' in column) {
+            switch (column.format) {
                 case 'ip':
                     return 'IP';
                 case 'email':
@@ -41,41 +41,41 @@
                     break;
             }
         }
-        return `${capitalize(attribute.type)}${attribute.array ? '[]' : ''}`;
+        return `${capitalize(column.type)}${column.array ? '[]' : ''}`;
     }
 </script>
 
-{#if attribute.array}
-    {#if formValues[attribute.key]?.length === 0}
+{#if column.array}
+    {#if formValues[column.key]?.length === 0}
         <Layout.Stack direction="row" alignContent="space-between">
             <Layout.Stack gap="xxs" direction="row" alignItems="center">
                 <Typography.Text variant="m-500">{label}</Typography.Text>
                 <Typography.Text variant="m-400" color="--fgcolor-neutral-tertiary">
-                    {getAttributeType(attribute)}
+                    {getColumnType(column)}
                 </Typography.Text>
             </Layout.Stack>
-            <Button secondary on:click={() => addArrayItem(attribute.key)}>
+            <Button secondary on:click={() => addArrayItem(column.key)}>
                 <Icon icon={IconPlus} slot="start" size="s" />
                 Add item
             </Button>
         </Layout.Stack>
     {:else}
         <Layout.Stack>
-            {#each [...formValues[attribute.key].keys()] as index}
+            {#each [...(formValues[column.key]?.keys() ?? [])] as index}
                 <Layout.Stack direction="row" alignItems="flex-end" gap="xs">
-                    <Attribute
-                        {attribute}
-                        id={`${attribute.key}-${index}`}
-                        optionalText={index === 0 ? getAttributeType(attribute) : undefined}
+                    <Column
+                        {column}
+                        id={`${column.key}-${index}`}
+                        optionalText={index === 0 ? getColumnType(column) : undefined}
                         label={index === 0 ? label : ''}
-                        bind:value={formValues[attribute.key][index]} />
-                    <Button text icon on:click={() => removeArrayItem(attribute.key, index)}>
+                        bind:value={formValues[column.key][index]} />
+                    <Button text icon on:click={() => removeArrayItem(column.key, index)}>
                         <span class="icon-x" aria-hidden="true"></span>
                     </Button>
                 </Layout.Stack>
             {/each}
             <div>
-                <Button secondary on:click={() => addArrayItem(attribute.key)}>
+                <Button secondary on:click={() => addArrayItem(column.key)}>
                     <Icon icon={IconPlus} slot="start" size="s" />
                     Add item
                 </Button>
@@ -83,11 +83,11 @@
         </Layout.Stack>
     {/if}
 {:else}
-    <Attribute
-        {editing}
-        {attribute}
+    <Column
         {label}
-        optionalText={getAttributeType(attribute)}
-        id={attribute.key}
-        bind:value={formValues[attribute.key]} />
+        {editing}
+        {column}
+        id={column.key}
+        optionalText={getColumnType(column)}
+        bind:value={formValues[column.key]} />
 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/boolean.svelte
similarity index 77%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/boolean.svelte
index 7be1202e2..cf26aa742 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/boolean.svelte
@@ -5,7 +5,7 @@
     export let id: string;
     export let label: string;
     export let value: boolean;
-    export let attribute: Models.AttributeBoolean;
+    export let column: Models.ColumnBoolean;
     export let optionalText: string | undefined = undefined;
 </script>
 
@@ -15,9 +15,9 @@
     bind:value
     {optionalText}
     placeholder="Select a value"
-    required={attribute.required}
+    required={column.required}
     options={[
-        !attribute.required && { label: 'NULL', value: null },
+        !column.required && { label: 'NULL', value: null },
         { label: 'True', value: true },
         { label: 'False', value: false }
     ].filter(Boolean)} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/datetime.svelte
similarity index 74%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/datetime.svelte
index e7c7b0be8..fe9960607 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/datetime.svelte
@@ -5,7 +5,7 @@
     export let id: string;
     export let label: string;
     export let value: string;
-    export let attribute: Models.AttributeDatetime;
+    export let column: Models.ColumnDatetime;
     export let type: 'date' | 'time' | 'datetime-local' = 'datetime-local';
 </script>
 
@@ -14,5 +14,5 @@
     {label}
     {type}
     bind:value
-    required={attribute.required}
-    nullable={!attribute.required} />
+    required={column.required}
+    nullable={!column.required} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/email.svelte
similarity index 73%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/email.svelte
index 5d7b9989f..eeb7a1334 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/email.svelte
@@ -5,7 +5,7 @@
     export let id: string;
     export let label: string;
     export let value: string | null;
-    export let attribute: Models.AttributeUrl;
+    export let column: Models.ColumnEmail;
 </script>
 
 <InputEmail
@@ -13,5 +13,5 @@
     {label}
     bind:value
     placeholder="Enter URL"
-    required={attribute.required}
-    nullable={!attribute.required} />
+    required={column.required}
+    nullable={!column.required} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/enum.svelte
similarity index 79%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/enum.svelte
index fc4c053b9..25f2a1f06 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/enum.svelte
@@ -5,17 +5,17 @@
     export let id: string;
     export let label: string;
     export let value: string;
-    export let attribute: Models.AttributeEnum;
+    export let column: Models.ColumnEnum;
     export let optionalText: string | undefined = undefined;
 
     $: options = [
-        ...attribute.elements.map((element) => {
+        ...column.elements.map((element) => {
             return {
                 label: element,
                 value: element
             };
         }),
-        !attribute.required && {
+        !column.required && {
             label: 'NULL',
             value: null
         }
@@ -28,5 +28,5 @@
     {id}
     {label}
     {optionalText}
-    required={attribute.required}
+    required={column.required}
     placeholder="Select a value" />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/integer.svelte
similarity index 55%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/integer.svelte
index a0725df98..d25b85d9f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/integer.svelte
@@ -5,15 +5,15 @@
     export let id: string;
     export let label: string;
     export let value: number;
-    export let attribute: Models.AttributeInteger;
+    export let column: Models.ColumnInteger;
 </script>
 
 <InputNumber
     {id}
     {label}
     bind:value
-    min={attribute.min}
-    max={attribute.max}
-    required={attribute.required}
-    nullable={!attribute.required}
-    step={attribute.type === 'double' ? 'any' : 1} />
+    min={column.min}
+    max={column.max}
+    required={column.required}
+    nullable={!column.required}
+    step={column.type === 'double' ? 'any' : 1} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte
similarity index 87%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte
index f93090172..46619afec 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte
@@ -5,7 +5,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Query, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
-    import { doc } from '../store';
+    import { row } from '../store';
     import { isRelationshipToMany } from './store';
     import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
     import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
@@ -15,12 +15,12 @@
 
     export let editing = false;
     export let value: string | string[];
-    export let attribute: Models.AttributeRelationship;
+    export let column: Models.ColumnRelationship;
     export let optionalText: string | undefined = undefined;
 
     const databaseId = page.params.database;
 
-    let documentList: Models.DocumentList<Models.Document>;
+    let rowList: Models.RowList<Models.Row>;
     let search: string = null;
     let displayNames = ['$id'];
     let relatedList: string[] = [];
@@ -32,38 +32,38 @@
 
     onMount(async () => {
         if (value) {
-            if (isRelationshipToMany(attribute)) {
+            if (isRelationshipToMany(column)) {
                 relatedList = (value as string[]).slice();
             } else {
                 singleRel = value as string;
             }
         }
 
-        if (editing && $doc?.[attribute.key]) {
-            if ($doc[attribute.key]?.length) {
+        if (editing && $row?.[column.key]) {
+            if ($row[column.key]?.length) {
                 relatedList =
-                    $doc[attribute.key]?.map((d: Record<string, unknown>) => {
+                    $row[column.key]?.map((d: Record<string, unknown>) => {
                         return d?.$id;
                     }) ?? [];
             } else {
-                singleRel = $doc[attribute.key]?.$id;
+                singleRel = $row[column.key]?.$id;
             }
         }
 
-        displayNames = preferences.getDisplayNames()?.[attribute?.relatedCollection] ?? ['$id'];
+        displayNames = preferences.getDisplayNames()?.[column?.relatedTable] ?? ['$id'];
         if (!displayNames?.includes('$id')) {
             displayNames.unshift('$id');
         }
     });
 
-    async function getDocuments(search: string = null) {
+    async function getRows(search: string = null) {
         const queries = search
             ? [Query.select(['$id']), Query.startsWith('$id', search), Query.orderDesc('')]
             : [Query.select(['$id'])];
 
         return await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.listDocuments(databaseId, attribute.relatedCollection, queries);
+            .grids.listRows(databaseId, column.relatedTable, queries);
     }
 
     function getAvailableOptions(excludeIndex?: number) {
@@ -105,7 +105,7 @@
     }
 
     // Reactive statements
-    $: getDocuments(search).then((res) => (documentList = res));
+    $: getRows(search).then((res) => (rowList = res));
 
     $: paginatedItems = editing
         ? relatedList
@@ -117,10 +117,10 @@
     $: totalCount = relatedList?.length ?? 0;
 
     $: options =
-        documentList?.documents?.map((document) => {
+        rowList?.rows?.map((row) => {
             const names = displayNames.filter((name) => name !== '$id');
             const values = names
-                .map((name) => document?.[name])
+                .map((name) => row?.[name])
                 // always supposed to be a string but just being a bit safe here
                 .filter((value) => value != null && typeof value === 'string' && value !== '');
 
@@ -130,15 +130,15 @@
                   values.map((value) => (value.length > 5 ? value.slice(0, 5) + '...' : value));
 
             const label = !values.length
-                ? document.$id
+                ? row.$id
                 : // values are in `$id (a | b)` format
                   // previously used to have a `$id a | b`.
-                  `${document.$id} (${displayValues.join(' | ')})`;
+                  `${row.$id} (${displayValues.join(' | ')})`;
 
             return {
                 label,
-                value: document.$id,
-                data: names.map((name) => document?.[name])
+                value: row.$id,
+                data: names.map((name) => row?.[name])
             };
         }) ?? [];
 
@@ -150,7 +150,7 @@
     $: showEmptyInput = editing && totalCount === 0 && !showInput;
 </script>
 
-{#if isRelationshipToMany(attribute)}
+{#if isRelationshipToMany(column)}
     <Layout.Stack gap="xxl">
         <Layout.Stack gap="m">
             <Layout.Stack direction="row" alignContent="space-between">
@@ -178,7 +178,7 @@
                             required
                             {options}
                             bind:value={relatedList[0]}
-                            placeholder={`Select ${attribute.key}`}
+                            placeholder={`Select ${column.key}`}
                             on:change={() => {
                                 if (!relatedList[0]) relatedList = [''];
                                 updateRelatedList();
@@ -196,7 +196,7 @@
                                 required
                                 options={getAvailableOptions(actualIndex)}
                                 bind:value={relatedList[actualIndex]}
-                                placeholder={`Select ${attribute.key}`}
+                                placeholder={`Select ${column.key}`}
                                 on:change={updateRelatedList} />
                             {#if relatedList[actualIndex]}
                                 <div style:padding-block-start="0.5rem">
@@ -244,7 +244,7 @@
                         <InputSelect
                             {id}
                             required
-                            placeholder={`Select ${attribute.key}`}
+                            placeholder={`Select ${column.key}`}
                             bind:value={newItemValue}
                             options={getAvailableOptions()}
                             on:change={addNewItem} />
@@ -272,8 +272,8 @@
         {id}
         {label}
         {options}
-        required={attribute.required}
-        placeholder={`Select ${attribute.key}`}
+        required={column.required}
+        placeholder={`Select ${column.key}`}
         bind:value={singleRel}
         on:change={() => (value = singleRel)} />
 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts
new file mode 100644
index 000000000..7d92c8e22
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts
@@ -0,0 +1,35 @@
+import type { Columns } from '../../store';
+import { type Models, Query } from '@appwrite.io/console';
+
+export function isRelationshipToMany(column: Models.ColumnRelationship) {
+    if (!column) return false;
+    if (!column?.relationType) return false;
+    if (column?.side === 'child') {
+        return !['oneToOne', 'oneToMany'].includes(column?.relationType);
+    } else {
+        return !['oneToOne', 'manyToOne'].includes(column?.relationType);
+    }
+}
+
+export function isRelationship(column: Columns): column is Models.ColumnRelationship {
+    if (!column) return false;
+    return column?.type === 'relationship';
+}
+
+export function isString(column: Columns): column is Models.ColumnString {
+    if (!column) return false;
+    return column?.type === 'string';
+}
+
+/**
+ * Returns select queries for all main and related fields in a table.
+ */
+export function buildWildcardColumnsQuery(table: Models.Table | null = null): string[] {
+    return [
+        ...(table?.columns
+            ?.filter((col) => isRelationship(col))
+            ?.map((col) => Query.select([`${col.key}.*`])) ?? []),
+
+        Query.select(['*'])
+    ];
+}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/string.svelte
similarity index 59%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/string.svelte
index 901555a9b..fd6678b8f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/string.svelte
@@ -5,25 +5,25 @@
     export let id: string;
     export let label: string;
     export let value: string;
-    export let attribute: Models.AttributeString;
+    export let column: Models.ColumnString;
 </script>
 
-{#if attribute.size >= 50}
+{#if column.size >= 50}
     <InputTextarea
         {id}
         {label}
         bind:value
         placeholder="Enter string"
-        maxlength={attribute.size}
-        required={attribute.required}
-        nullable={!attribute.required} />
+        maxlength={column.size}
+        required={column.required}
+        nullable={!column.required} />
 {:else}
     <InputText
         {id}
         {label}
         bind:value
         placeholder="Enter string"
-        maxlength={attribute.size}
-        required={attribute.required}
-        nullable={!attribute.required} />
+        maxlength={column.size}
+        required={column.required}
+        nullable={!column.required} />
 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/url.svelte
similarity index 72%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/url.svelte
index 9a035a067..c160e8a30 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/url.svelte
@@ -5,7 +5,7 @@
     export let id: string;
     export let label: string;
     export let value: string | null;
-    export let attribute: Models.AttributeUrl;
+    export let column: Models.ColumnUrl;
 </script>
 
 <InputURL
@@ -13,5 +13,5 @@
     {label}
     bind:value
     placeholder="Enter URL"
-    required={attribute.required}
-    nullable={!attribute.required} />
+    required={column.required}
+    nullable={!column.required} />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
similarity index 58%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
index 0fcf83a43..5121b3af1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
@@ -7,9 +7,9 @@
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import { Alert, Selector, Table } from '@appwrite.io/pink-svelte';
-    import { attributes, collection } from '../store';
-    import { isRelationship, isRelationshipToMany } from './attributes/store';
+    import { Alert, Layout, Selector, Table } from '@appwrite.io/pink-svelte';
+    import { columns, table } from '../store';
+    import { isRelationship, isRelationshipToMany } from './columns/store';
     import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
@@ -20,54 +20,52 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.deleteDocument(databaseId, page.params.collection, page.params.document);
+                .grids.deleteRow(databaseId, page.params.table, page.params.row);
             showDelete = false;
             addNotification({
                 type: 'success',
-                message: `Document has been deleted`
+                message: `Row has been deleted`
             });
-            trackEvent(Submit.DocumentDelete);
+            trackEvent(Submit.RowDelete);
             await goto(
-                `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}`
+                `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}`
             );
         } catch (error) {
             addNotification({
                 type: 'error',
                 message: error.message
             });
-            trackError(error, Submit.DocumentDelete);
+            trackError(error, Submit.RowDelete);
         }
     };
 
     enum Deletion {
-        'setNull' = 'Set document ID as NULL in all related documents',
-        'cascade' = 'All related documents will be deleted',
-        'restrict' = 'Document cannot be deleted'
+        'setNull' = 'Set row ID as NULL in all related rows',
+        'cascade' = 'All related rows will be deleted',
+        'restrict' = 'Row cannot be deleted'
     }
 
-    $: relAttributes = $attributes?.filter(
-        (attribute) =>
-            isRelationship(attribute) &&
+    $: relatedColumns = $columns?.filter(
+        (column) =>
+            isRelationship(column) &&
             // One-to-One are always included
-            (attribute.relationType === 'oneToOne' ||
+            (column.relationType === 'oneToOne' ||
                 // One-to-Many: Only if parent is deleted
-                (attribute.relationType === 'oneToMany' && attribute.side === 'parent') ||
+                (column.relationType === 'oneToMany' && column.side === 'parent') ||
                 // Many-to-One: Only include if child is deleted
-                (attribute.relationType === 'manyToOne' && attribute.side === 'child') ||
+                (column.relationType === 'manyToOne' && column.side === 'child') ||
                 // Many-to-Many: Only include if the parent is being deleted
-                (isRelationshipToMany(attribute) && attribute.side === 'parent'))
-    ) as Models.AttributeRelationship[];
+                (isRelationshipToMany(column) && column.side === 'parent'))
+    ) as Models.ColumnRelationship[];
 </script>
 
-<Confirm title="Delete document" onSubmit={handleDelete} bind:open={showDelete}>
+<Confirm title="Delete row" onSubmit={handleDelete} bind:open={showDelete}>
     <p data-private>
-        Are you sure you want to delete <b
-            >the document from <span data-private>{$collection.name}</span></b
-        >?
+        Are you sure you want to delete <b>the row from <span data-private>{$table.name}</span></b>?
     </p>
 
-    {#if relAttributes?.length}
-        <p class="text">This document contains the following relationships:</p>
+    {#if relatedColumns?.length}
+        <p class="text">This row contains the following relationships:</p>
         <Table.Root
             let:root
             columns={[
@@ -80,39 +78,37 @@
                 <Table.Header.Cell column="setting" {root}>Setting</Table.Header.Cell>
                 <Table.Header.Cell column="desc" {root} />
             </svelte:fragment>
-            {#each relAttributes as attr}
+            {#each relatedColumns as column}
                 <Table.Row.Base {root}>
                     <Table.Cell column="relations" {root}>
                         <span class="u-flex u-cross-center u-gap-8">
-                            {#if attr.twoWay}
+                            {#if column.twoWay}
                                 <span class="icon-switch-horizontal"></span>
                             {:else}
                                 <span class="icon-arrow-sm-right"></span>
                             {/if}
-                            <Trim>{attr.key}</Trim>
+                            <Trim>{column.key}</Trim>
                         </span>
                     </Table.Cell>
                     <Table.Cell column="setting" {root}>
-                        {attr.onDelete}
+                        {column.onDelete}
                     </Table.Cell>
                     <Table.Cell column="desc" {root}>
-                        {Deletion[attr.onDelete]}
+                        {Deletion[column.onDelete]}
                     </Table.Cell>
                 </Table.Row.Base>
             {/each}
         </Table.Root>
-        <div class="u-flex u-flex-vertical u-gap-16">
+        <Layout.Stack gap="l">
             <Alert.Inline
                 title="To change these deletion behaviors edit the relationship settings." />
-            <Selector.Checkbox
-                id="delete"
-                label={`Delete document from ${$collection.name}`}
-                bind:checked />
-        </div>
+
+            <Selector.Checkbox id="delete" label="Delete row from ${$table.name}" bind:checked />
+        </Layout.Stack>
     {/if}
 
     <svelte:fragment slot="footer">
         <Button text on:click={() => (showDelete = false)}>Cancel</Button>
-        <Button danger submit disabled={relAttributes?.length && !checked}>Delete</Button>
+        <Button danger submit disabled={relatedColumns?.length && !checked}>Delete</Button>
     </svelte:fragment>
 </Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
similarity index 77%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
index d97751b9f..0f4b7a0c8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
@@ -4,13 +4,14 @@
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
-    import { doc } from './store';
+    import { row } from './store';
 
     const projectId = page.params.project;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
-    const path = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
+    const tableId = page.params.table;
+    const rowId = page.params.row;
+
+    const path = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${tableId}/row-${rowId}`;
     const tabs = [
         {
             href: path,
@@ -35,10 +36,10 @@
 <Cover>
     <svelte:fragment slot="header">
         <CoverTitle
-            href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
-            {$doc?.$id}
+            href={`${base}/project-${page.params.region}-${projectId}/databases/database-${databaseId}/table-${tableId}`}>
+            {$row?.$id}
         </CoverTitle>
-        <Id value={$doc?.$id} event="document">Document ID</Id>
+        <Id value={$row?.$id} event="row">Row ID</Id>
     </svelte:fragment>
 
     <Tabs>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte
similarity index 59%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte
index fd3865bf8..6178f3de2 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { Button } from '$lib/elements/forms';
     import { CardGrid } from '$lib/components';
-    import { collection } from '../store';
-    import { doc } from './store';
+    import { table } from '../store';
+    import { row } from './store';
     import { onMount } from 'svelte';
     import { page } from '$app/state';
     import { sdk } from '$lib/stores/sdk';
@@ -12,62 +12,52 @@
     import { Dependencies } from '$lib/constants';
     import { invalidate } from '$app/navigation';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import AttributeForm from './attributeForm.svelte';
+    import ColumnForm from './columnForm.svelte';
 
     let disableUpdate = true;
-    let currentDoc: string;
+    let currentRow: string;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
+    const tableId = page.params.table;
+    const rowId = page.params.row;
 
     const work = writable(
-        Object.keys($doc)
+        Object.keys($row)
             .filter((key) => {
                 return ![
                     '$id',
                     '$collection',
-                    '$collectionId',
+                    '$tableId',
                     '$databaseId',
                     '$createdAt',
                     '$updatedAt'
                 ].includes(key);
             })
             .reduce((obj, key) => {
-                obj[key] = $doc[key];
+                obj[key] = $row[key];
                 return obj;
-            }, {}) as Models.Document
+            }, {}) as Models.Row
     );
 
     onMount(async () => {
-        currentDoc = JSON.stringify($work);
+        currentRow = JSON.stringify($work);
     });
 
     $: {
-        if (currentDoc !== JSON.stringify($work)) {
-            disableUpdate = false;
-        } else {
-            disableUpdate = true;
-        }
+        disableUpdate = currentRow === JSON.stringify($work);
     }
 
     async function updateData() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.updateDocument(
-                    databaseId,
-                    collectionId,
-                    documentId,
-                    $work,
-                    $work.$permissions
-                );
-            await invalidate(Dependencies.DOCUMENT);
+                .grids.updateRow(databaseId, tableId, rowId, $work, $work.$permissions);
 
-            currentDoc = JSON.stringify($work);
-            trackEvent(Submit.DocumentUpdate);
+            await invalidate(Dependencies.ROW);
+            currentRow = JSON.stringify($work);
+            trackEvent(Submit.RowUpdate);
             disableUpdate = true;
             addNotification({
-                message: 'Document has been updated',
+                message: 'Row has been updated',
                 type: 'success'
             });
         } catch (error) {
@@ -75,16 +65,16 @@
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.DocumentUpdate);
+            trackError(error, Submit.RowUpdate);
         }
     }
 </script>
 
 <CardGrid>
     <svelte:fragment slot="title">Data</svelte:fragment>
-    Update document data based on the attributes created earlier.
+    Update row data based on the columns created earlier.
     <svelte:fragment slot="aside">
-        <AttributeForm attributes={$collection.attributes} bind:formValues={$work} />
+        <ColumnForm columns={$table.columns} bind:formValues={$work} />
     </svelte:fragment>
 
     <svelte:fragment slot="actions">
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte
similarity index 52%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte
index abfab7dee..fa87155b1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { CardGrid, BoxAvatar } from '$lib/components';
+    import { CardGrid, BoxAvatar, Alert } from '$lib/components';
     import { Container } from '$lib/layout';
     import { Button } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
-    import { doc } from '../store';
+    import { row } from '../store';
     import { addNotification } from '$lib/stores/notifications';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import Delete from '../delete.svelte';
@@ -12,49 +12,44 @@
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import { collection } from '../../store';
-    import { page } from '$app/stores';
-    import { Alert } from '@appwrite.io/pink-svelte';
+    import { table } from '../../store';
+    import { page } from '$app/state';
 
     let showDelete = false;
-    let permissions = $doc?.$permissions;
+    let permissions = $row?.$permissions;
+
     let arePermsDisabled = true;
     let showPermissionAlert = true;
 
     async function updatePermissions() {
         try {
             await sdk
-                .forProject($page.params.region, $page.params.project)
-                .databases.updateDocument(
-                    $doc.$databaseId,
-                    $doc.$collectionId,
-                    $doc.$id,
-                    $doc.data,
-                    permissions
-                );
-            await invalidate(Dependencies.DOCUMENT);
+                .forProject(page.params.region, page.params.project)
+                .grids.updateRow($row.$databaseId, $row.$tableId, $row.$id, $row, permissions);
+
+            await invalidate(Dependencies.ROW);
             arePermsDisabled = true;
             addNotification({
                 message: 'Permissions have been updated',
                 type: 'success'
             });
-            trackEvent(Submit.DocumentUpdatePermissions);
+            trackEvent(Submit.RowUpdatePermissions);
         } catch (error) {
             addNotification({
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.DocumentUpdatePermissions);
+            trackError(error, Submit.RowUpdatePermissions);
         }
     }
 
     $: if (permissions) {
-        arePermsDisabled = !symmetricDifference(permissions, $doc.$permissions).length;
+        arePermsDisabled = !symmetricDifference(permissions, $row.$permissions).length;
     }
 </script>
 
 <svelte:head>
-    <title>Document - Appwrite</title>
+    <title>Row - Appwrite</title>
 </svelte:head>
 
 <Container>
@@ -63,8 +58,8 @@
 
         <svelte:fragment slot="aside">
             <div>
-                <p>Created: {toLocaleDateTime($doc.$createdAt)}</p>
-                <p>Last updated: {toLocaleDateTime($doc.$updatedAt)}</p>
+                <p>Created: {toLocaleDateTime($row.$createdAt)}</p>
+                <p>Last updated: {toLocaleDateTime($row.$updatedAt)}</p>
             </div>
         </svelte:fragment>
     </CardGrid>
@@ -72,9 +67,9 @@
         <svelte:fragment slot="title">Permissions</svelte:fragment>
 
         <p>
-            A user requires appropriate permissions at either the <b>collection level</b> or
-            <b>document level</b> to access a document. If no permissions are configured, no user
-            can access the document
+            A user requires appropriate permissions at either the <b>table level</b> or
+            <b>row level</b> to access a row. If no permissions are configured, no user can access
+            the row
             <a
                 href="https://appwrite.io/docs/products/databases/permissions"
                 target="_blank"
@@ -84,50 +79,49 @@
         </p>
 
         <svelte:fragment slot="aside">
-            {#if $collection.documentSecurity}
+            {#if $table.rowSecurity}
                 {#if showPermissionAlert}
-                    <Alert.Inline
-                        status="info"
-                        title="Document security is enabled"
-                        dismissible
-                        on:dismiss={() => (showPermissionAlert = false)}>
-                        Users will be able to access this document if they have been granted <b
-                            >either document or collection permissions.</b>
-                    </Alert.Inline>
+                    <Alert type="info" dismissible on:dismiss={() => (showPermissionAlert = false)}>
+                        <svelte:fragment slot="title">Row security is enabled</svelte:fragment>
+                        <p class="text">
+                            Users will be able to access this row if they have been granted <b
+                                >either row or table permissions.
+                            </b>
+                        </p>
+                    </Alert>
                 {/if}
                 {#if permissions}
                     <Permissions bind:permissions />
                 {/if}
             {:else}
-                <Alert.Inline status="info" title="Document security is disabled">
-                    If you want to assign document permissions. Go to Collection settings and enable
-                    document security. Otherwise, only collection permissions will be used.
-                </Alert.Inline>
+                <Alert type="info">
+                    <svelte:fragment slot="title">Row security is disabled</svelte:fragment>
+                    <p class="text">
+                        If you want to assign row permissions. Go to Table settings and enable row
+                        security. Otherwise, only table permissions will be used.
+                    </p>
+                </Alert>
             {/if}
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button
-                disabled={arePermsDisabled}
-                on:click={() => {
-                    updatePermissions();
-                }}>Update</Button>
+            <Button disabled={arePermsDisabled} on:click={updatePermissions}>Update</Button>
         </svelte:fragment>
     </CardGrid>
 
     <CardGrid>
-        <svelte:fragment slot="title">Delete document</svelte:fragment>
+        <svelte:fragment slot="title">Delete row</svelte:fragment>
         <p>
-            The document will be permanently deleted, including all the data within it. This action
-            is irreversible.
+            The row will be permanently deleted, including all the data within it. This action is
+            irreversible.
         </p>
         <svelte:fragment slot="aside">
             <BoxAvatar>
                 <svelte:fragment slot="title">
-                    <h6 class="u-bold u-trim-1">{$doc.$id}</h6>
+                    <h6 class="u-bold u-trim-1">{$row.$id}</h6>
                 </svelte:fragment>
                 <p>
-                    Last updated: {toLocaleDateTime($doc.$updatedAt)}
+                    Last updated: {toLocaleDateTime($row.$updatedAt)}
                 </p>
             </BoxAvatar>
         </svelte:fragment>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/store.ts
similarity index 60%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/store.ts
index e8470449e..f060a0d53 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/store.ts
@@ -2,4 +2,4 @@ import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
-export const doc = derived(page, ($page) => $page.data.document as Models.Document);
+export const row = derived(page, ($page) => $page.data.row as Models.Row);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
similarity index 91%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
index 021820720..20abb285b 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
-    import { collection } from '../store';
+    import { table } from '../store';
     import DangerZone from './dangerZone.svelte';
     import DisplayName from './displayName.svelte';
     import UpdateName from './updateName.svelte';
@@ -11,7 +11,7 @@
 
 <div class="wide-screen-wrapper databases-spreadsheet">
     <Container expanded slotSpacing databasesScreen>
-        {#if $collection}
+        {#if $table}
             <UpdateStatus />
             <UpdateName />
             <DisplayName />
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
similarity index 59%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
index 493e37667..fa7597696 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
@@ -2,23 +2,22 @@
     import { BoxAvatar, CardGrid } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { collection } from '../store';
-    import Delete from './deleteCollection.svelte';
+    import { table } from '../store';
+    import Delete from './deleteTable.svelte';
     import { Click, trackEvent } from '$lib/actions/analytics';
 
     let showDelete = false;
 </script>
 
 <CardGrid>
-    <svelte:fragment slot="title">Delete collection</svelte:fragment>
-    The collection will be permanently deleted, including all the documents within it. This action is
-    irreversible.
+    <svelte:fragment slot="title">Delete table</svelte:fragment>
+    The table will be permanently deleted, including all the rows within it. This action is irreversible.
     <svelte:fragment slot="aside">
         <BoxAvatar>
             <svelte:fragment slot="title">
-                <h6 class="u-bold u-trim-1">{$collection.name}</h6>
+                <h6 class="u-bold u-trim-1">{$table.name}</h6>
             </svelte:fragment>
-            <p>Last updated: {toLocaleDateTime($collection.$updatedAt)}</p>
+            <p>Last updated: {toLocaleDateTime($table.$updatedAt)}</p>
         </BoxAvatar>
     </svelte:fragment>
 
@@ -26,7 +25,7 @@
         <Button
             secondary
             on:click={() => {
-                trackEvent(Click.DatabaseCollectionDelete);
+                trackEvent(Click.DatabaseTableDelete);
                 showDelete = true;
             }}>Delete</Button>
     </svelte:fragment>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte
similarity index 73%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte
index dfd0e6548..c51e097fc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte
@@ -8,7 +8,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { Typography } from '@appwrite.io/pink-svelte';
-    import { collection } from '../store';
+    import { table } from '../store';
 
     export let showDelete = false;
 
@@ -19,26 +19,26 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.deleteCollection(databaseId, $collection.$id);
+                .grids.deleteTable(databaseId, $table.$id);
             await invalidate(Dependencies.DATABASE);
             showDelete = false;
             addNotification({
                 type: 'success',
-                message: `${$collection.name} has been deleted`
+                message: `${$table.name} has been deleted`
             });
-            trackEvent(Submit.CollectionDelete);
+            trackEvent(Submit.TableDelete);
             await goto(
                 `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}`
             );
         } catch (e) {
             error = e.message;
-            trackError(e, Submit.CollectionDelete);
+            trackError(e, Submit.TableDelete);
         }
     }
 </script>
 
-<Confirm onSubmit={handleDelete} title="Delete collection" bind:open={showDelete} bind:error>
+<Confirm onSubmit={handleDelete} title="Delete table" bind:open={showDelete} bind:error>
     <Typography.Text>
-        Are you sure you want to delete <b>{$collection.name}</b>?
+        Are you sure you want to delete <b>{$table.name}</b>?
     </Typography.Text>
 </Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
similarity index 78%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
index e4d909525..ce22763a8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
@@ -7,17 +7,17 @@
     import { last, symmetricDifference } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
     import type { Models } from '@appwrite.io/console';
-    import { attributes } from '../store';
+    import { columns } from '../store';
     import { preferences } from '$lib/stores/preferences';
     import { page } from '$app/state';
     import { Icon, Layout } from '@appwrite.io/pink-svelte';
     import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
     import { organization } from '$lib/stores/organization';
 
-    const collectionId = page.params.collection;
+    const tableId = page.params.table;
 
     function getDisplayNames() {
-        return [...(preferences.getDisplayNames()?.[collectionId] ?? [])].filter(
+        return [...(preferences.getDisplayNames()?.[tableId] ?? [])].filter(
             (name) => name !== '$id'
         ); // edge case with `$id`? got saved during tests!
     }
@@ -30,33 +30,33 @@
             // structuredClone doesn't work
             const regularArray = [...names];
 
-            await preferences.setDisplayNames($organization.$id, collectionId, regularArray);
+            await preferences.setDisplayNames($organization.$id, tableId, regularArray);
             names = getDisplayNames();
 
             await invalidate(Dependencies.TEAM);
             addNotification({
-                message: 'Display names has been updated',
+                message: 'Display names have been updated',
                 type: 'success'
             });
-            trackEvent(Submit.CollectionUpdateDisplayNames);
+            trackEvent(Submit.TableUpdateDisplayNames);
         } catch (error) {
             addNotification({
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.CollectionUpdateDisplayNames);
+            trackError(error, Submit.TableUpdateDisplayNames);
         }
     }
 
-    function getValidAttributes() {
-        return ($attributes as Models.AttributeString[]).filter(
+    function getValidColumns() {
+        return ($columns as Models.ColumnString[]).filter(
             (attr) => attr.type === 'string' && !attr?.array
         );
     }
 
     function getOptions(index: number) {
         const current = names?.[index];
-        return getValidAttributes()
+        return getValidColumns()
             .filter((attr) => !names?.includes(attr.key) || attr.key === current)
             .map((attr) => ({
                 value: attr.key,
@@ -64,30 +64,28 @@
             }));
     }
 
-    const addAttributeDisabled = $derived(
+    const addColumnDisabled = $derived(
         names?.length >= 5 || (names?.length && !names[names?.length - 1])
     );
 
     const updateBtnDisabled = $derived(
-        !symmetricDifference(names, preferences.getDisplayNames()?.[collectionId] ?? [])?.length ||
+        !symmetricDifference(names, preferences.getDisplayNames()?.[tableId] ?? [])?.length ||
             (names?.length && !last(names))
     );
 
-    const hasExhaustedOptions = $derived(
-        getValidAttributes().length === names.filter(Boolean).length
-    );
+    const hasExhaustedOptions = $derived(getValidColumns().length === names.filter(Boolean).length);
 </script>
 
 <Form onSubmit={updateDisplayName}>
     <CardGrid>
         <svelte:fragment slot="title">Display name</svelte:fragment>
-        Select up to 5 string attributes to display as document names in the Appwrite console. These
-        help identify documents in places like relationships.
+        Select up to 5 string columns to display as row names in the Appwrite console. These help identify
+        rows in places like relationships.
 
         <svelte:fragment slot="aside">
             <Layout.Stack gap="s">
                 <Layout.Stack direction="row" gap="xxs">
-                    <InputText id="id" value="Document ID" readonly />
+                    <InputText id="id" value="Row ID" readonly />
                     <span style:visibility="hidden">
                         <Button icon extraCompact>
                             <Icon icon={IconX} />
@@ -105,7 +103,7 @@
                                 {options}
                                 {disabled}
                                 bind:value={names[index]}
-                                placeholder="Select attribute" />
+                                placeholder="Select column" />
                             <Button
                                 icon
                                 extraCompact
@@ -119,18 +117,18 @@
                     {/each}
                 {/if}
 
-                <!-- show only when options don't have all the attributes -->
+                <!-- show only when options don't have all the columns -->
                 {#if !hasExhaustedOptions}
                     <div>
                         <Button
                             compact
-                            disabled={addAttributeDisabled}
+                            disabled={addColumnDisabled}
                             on:click={() => {
                                 names[names.length] = null;
                                 names = names;
                             }}>
                             <Icon icon={IconPlus} slot="start" size="s" />
-                            Add attribute
+                            Add column
                         </Button>
                     </div>
                 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
similarity index 67%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
index 80351378c..641338d40 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
@@ -8,40 +8,40 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
-    import { collection } from '../store';
+    import { table } from '../store';
 
     const databaseId = page.params.database;
 
-    let collectionName: string = null;
+    let tableName: string = null;
 
     onMount(() => {
-        collectionName ??= $collection.name;
+        tableName ??= $table.name;
     });
 
     async function updateName() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.updateCollection(
+                .grids.updateTable(
                     databaseId,
-                    $collection.$id,
-                    collectionName,
-                    $collection.$permissions,
-                    $collection.documentSecurity,
-                    $collection.enabled
+                    $table.$id,
+                    tableName,
+                    $table.$permissions,
+                    $table.rowSecurity,
+                    $table.enabled
                 );
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
             addNotification({
                 message: 'Name has been updated',
                 type: 'success'
             });
-            trackEvent(Submit.CollectionUpdateName);
+            trackEvent(Submit.TableUpdateName);
         } catch (error) {
             addNotification({
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.CollectionUpdateName);
+            trackError(error, Submit.TableUpdateName);
         }
     }
 </script>
@@ -56,12 +56,11 @@
                 label="Name"
                 placeholder="Enter name"
                 autocomplete={false}
-                bind:value={collectionName} />
+                bind:value={tableName} />
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            <Button disabled={collectionName === $collection.name || !collectionName} submit
-                >Update</Button>
+            <Button disabled={tableName === $table.name || !tableName} submit>Update</Button>
         </svelte:fragment>
     </CardGrid>
 </Form>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
similarity index 66%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
index f9b4e4bff..bf9f3fe8c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
@@ -10,63 +10,62 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
-    import { collection } from '../store';
+    import { table } from '../store';
     import { Link } from '@appwrite.io/pink-svelte';
 
     const databaseId = page.params.database;
 
     let arePermsDisabled = true;
 
-    let collectionPermissions: string[] = null;
+    let tablePermissions: string[] = null;
 
     onMount(() => {
-        collectionPermissions ??= $collection.$permissions;
+        tablePermissions ??= $table.$permissions;
     });
 
     async function updatePermissions() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.updateCollection(
+                .grids.updateTable(
                     databaseId,
-                    $collection.$id,
-                    $collection.name,
-                    collectionPermissions,
-                    $collection.documentSecurity,
-                    $collection.enabled
+                    $table.$id,
+                    $table.name,
+                    tablePermissions,
+                    $table.rowSecurity,
+                    $table.enabled
                 );
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
             addNotification({
                 message: 'Permissions have been updated',
                 type: 'success'
             });
-            trackEvent(Submit.CollectionUpdatePermissions);
+            trackEvent(Submit.TableUpdatePermissions);
         } catch (error) {
             addNotification({
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.CollectionUpdatePermissions);
+            trackError(error, Submit.TableUpdatePermissions);
         }
     }
 
     $: arePermsDisabled = !(
-        collectionPermissions &&
-        symmetricDifference(collectionPermissions, $collection.$permissions).length
+        tablePermissions && symmetricDifference(tablePermissions, $table.$permissions).length
     );
 </script>
 
 <CardGrid>
     <svelte:fragment slot="title">Permissions</svelte:fragment>
-    Choose who can access your collection and documents. <Link.Anchor
+    Choose who can access your tables and rows. <Link.Anchor
         href="https://appwrite.io/docs/products/databases/permissions"
         target="_blank"
         rel="noopener noreferrer">
         Learn more
     </Link.Anchor>.
     <svelte:fragment slot="aside">
-        {#if collectionPermissions}
-            <Permissions bind:permissions={collectionPermissions} withCreate />
+        {#if tablePermissions}
+            <Permissions bind:permissions={tablePermissions} withCreate />
         {/if}
     </svelte:fragment>
     <svelte:fragment slot="actions">
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
new file mode 100644
index 000000000..05cf90146
--- /dev/null
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { page } from '$app/state';
+    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { CardGrid } from '$lib/components';
+    import { Dependencies } from '$lib/constants';
+    import { Button, InputSwitch } from '$lib/elements/forms';
+    import { addNotification } from '$lib/stores/notifications';
+    import { sdk } from '$lib/stores/sdk';
+    import { onMount } from 'svelte';
+    import { table } from '../store';
+
+    const databaseId = page.params.database;
+
+    let tableRowSecurity: boolean = null;
+
+    onMount(() => {
+        tableRowSecurity ??= $table.rowSecurity;
+    });
+
+    async function updateSecurity() {
+        try {
+            await sdk
+                .forProject(page.params.region, page.params.project)
+                .grids.updateTable(
+                    databaseId,
+                    $table.$id,
+                    $table.name,
+                    $table.$permissions,
+                    tableRowSecurity,
+                    $table.enabled
+                );
+            await invalidate(Dependencies.TABLE);
+            addNotification({
+                message: 'Security has been updated',
+                type: 'success'
+            });
+            trackEvent(Submit.TableUpdateSecurity);
+        } catch (error) {
+            addNotification({
+                message: error.message,
+                type: 'error'
+            });
+            trackError(error, Submit.TableUpdateSecurity);
+        }
+    }
+</script>
+
+<CardGrid>
+    <svelte:fragment slot="title">Row security</svelte:fragment>
+    <svelte:fragment slot="aside">
+        <InputSwitch bind:value={tableRowSecurity} id="security" label="Row security" />
+
+        <p class="text">
+            When row security is enabled, users will be able to access rows for which they have been
+            granted <b>either row or table permissions</b>.
+        </p>
+        <p class="text">
+            If row security is disabled, users can access rows <b
+                >only if they have table permissions</b
+            >. Row permissions will be ignored.
+        </p>
+    </svelte:fragment>
+    <svelte:fragment slot="actions">
+        <Button disabled={tableRowSecurity === $table.rowSecurity} on:click={updateSecurity}
+            >Update</Button>
+    </svelte:fragment>
+</CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
similarity index 61%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
index 0089ecf9a..9dc9f82c1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
@@ -9,46 +9,46 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
-    import { collection } from '../store';
+    import { table } from '../store';
 
     const databaseId = page.params.database;
 
     let enabled: boolean = null;
 
     onMount(() => {
-        enabled ??= $collection.enabled;
+        enabled ??= $table.enabled;
     });
 
-    async function toggleCollection() {
+    async function toggleTable() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.updateCollection(
+                .grids.updateTable(
                     databaseId,
-                    $collection.$id,
-                    $collection.name,
-                    $collection.$permissions,
-                    $collection.documentSecurity,
+                    $table.$id,
+                    $table.name,
+                    $table.$permissions,
+                    $table.rowSecurity,
                     enabled
                 );
-            await invalidate(Dependencies.COLLECTION);
+            await invalidate(Dependencies.TABLE);
             addNotification({
-                message: `${$collection.name} has been updated`,
+                message: `${$table.name} has been updated`,
                 type: 'success'
             });
-            trackEvent(Submit.CollectionUpdateEnabled);
+            trackEvent(Submit.TableUpdateEnabled);
         } catch (error) {
             addNotification({
                 message: error.message,
                 type: 'error'
             });
-            trackError(error, Submit.CollectionUpdateEnabled);
+            trackError(error, Submit.TableUpdateEnabled);
         }
     }
 </script>
 
 <CardGrid>
-    <svelte:fragment slot="title">{$collection.name}</svelte:fragment>
+    <svelte:fragment slot="title">{$table.name}</svelte:fragment>
     <svelte:fragment slot="aside">
         <ul>
             <InputSwitch
@@ -57,14 +57,12 @@
                 bind:value={enabled} />
         </ul>
         <div>
-            <p>Created: {toLocaleDateTime($collection.$createdAt)}</p>
-            <p>Last updated: {toLocaleDateTime($collection.$updatedAt)}</p>
+            <p>Created: {toLocaleDateTime($table.$createdAt)}</p>
+            <p>Last updated: {toLocaleDateTime($table.$updatedAt)}</p>
         </div>
     </svelte:fragment>
 
     <svelte:fragment slot="actions">
-        <Button disabled={enabled === $collection.enabled} on:click={toggleCollection}>
-            Update
-        </Button>
+        <Button disabled={enabled === $table.enabled} on:click={toggleTable}>Update</Button>
     </svelte:fragment>
 </CardGrid>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/sheetOptions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte
similarity index 98%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/sheetOptions.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte
index 4ebc0ecaa..7b6a0b34a 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/sheetOptions.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/sheetOptions.svelte
@@ -34,7 +34,7 @@
         IconSortDescending,
         IconTrash
     } from '@appwrite.io/pink-icons-svelte';
-    import { type Attributes, databaseColumnSheetOptions } from './store';
+    import { type Columns, databaseColumnSheetOptions } from './store';
 
     interface MenuItem {
         label?: string;
@@ -79,7 +79,7 @@
         onSelect,
         type
     }: {
-        column: Attributes;
+        column: Columns;
         columnId?: string;
         type: 'header' | 'row';
         onSelect: (option: HeaderCellAction | RowCellAction, columnId: string) => void;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
similarity index 82%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
index 2a7e6e91f..8f443473f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/spreadsheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte
@@ -12,15 +12,11 @@
     import { type Models, Query } from '@appwrite.io/console';
     import { type ComponentType, onDestroy, onMount } from 'svelte';
     import type { PageData } from './$types';
+    import { isRelationship, isRelationshipToMany, isString } from './row-[row]/columns/store';
     import {
-        isRelationship,
-        isRelationshipToMany,
-        isString
-    } from './document-[document]/attributes/store';
-    import {
-        attributes,
-        collection,
         columns,
+        table,
+        tableColumns,
         databaseColumnSheetOptions,
         databaseRowSheetOptions,
         sortState,
@@ -73,23 +69,23 @@
     export let data: PageData;
     export let showRecordsCreateSheet: {
         show: boolean;
-        document: Models.Document | null;
+        row: Models.Row | null;
     };
 
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
+    const tableId = page.params.table;
 
     let displayNames = {};
     let showRelationships = false;
-    let relationshipData: Partial<Models.Document>[];
-    let selectedRelationship: Models.AttributeRelationship = null;
+    let relationshipData: Partial<Models.Row>[];
+    let selectedRelationship: Models.ColumnRelationship = null;
 
-    $: documents = data.documents;
+    $: rows = data.rows;
 
     onMount(async () => {
         displayNames = preferences.getDisplayNames();
-        columnsOrder.set(preferences.getColumnOrder(collectionId));
-        columnsWidth.set(preferences.getColumnWidths(collectionId));
+        columnsOrder.set(preferences.getColumnOrder(tableId));
+        columnsWidth.set(preferences.getColumnWidths(tableId));
     });
 
     onDestroy(() => ($showCreateAttributeSheet.show = false));
@@ -101,7 +97,7 @@
 
         preferences.saveColumnOrder(
             data.organization.$id ?? data.project.teamId,
-            collectionId,
+            tableId,
             newOrder
         );
     }
@@ -171,22 +167,22 @@
         return savedWidth.resized;
     }
 
-    $: selected = preferences.getCustomCollectionColumns(page.params.collection);
+    $: selected = preferences.getCustomTableColumns(page.params.table);
 
     const minimumWidth = 168;
-    $: if ($collection.attributes && $columnsOrder && $columnsWidth) {
-        const baseColumns = $collection.attributes.map((attribute) => ({
-            id: attribute.key,
-            title: attribute.key,
-            type: attribute.type as ColumnType,
-            hide: !!selected?.includes(attribute.key),
-            array: attribute?.array,
-            width: getColumnWidth(attribute.key, { min: minimumWidth }),
+    $: if ($table.columns && $columnsOrder && $columnsWidth) {
+        const baseColumns = $table.columns.map((col) => ({
+            id: col.key,
+            title: col.key,
+            type: col.type as ColumnType,
+            hide: !!selected?.includes(col.key),
+            array: col?.array,
+            width: getColumnWidth(col.key, { min: minimumWidth }),
             minimumWidth: minimumWidth,
             draggable: true,
-            icon: getAppropriateIcon(attribute.type),
-            format: 'format' in attribute && attribute?.format === 'enum' ? attribute.format : null,
-            elements: 'elements' in attribute ? attribute.elements : null
+            icon: getAppropriateIcon(col.type),
+            format: 'format' in col && col?.format === 'enum' ? col.format : null,
+            elements: 'elements' in col ? col.elements : null
         }));
 
         const staticColumns: Column[] = [
@@ -233,7 +229,7 @@
             }
         ];
 
-        columns.set(
+        tableColumns.set(
             reorderItems(
                 [
                     staticColumns[0],
@@ -251,13 +247,13 @@
     let selectedRows: string[] = [];
 
     let showDelete = false;
-    let selectedDocumentForDelete: Models.Document['$id'] | null = null;
+    let selectedDocumentForDelete: Models.Row['$id'] | null = null;
 
     async function sort(query: string[]) {
         $spreadsheetLoading = true;
-        documents = await sdk
+        rows = await sdk
             .forProject(page.params.region, page.params.project)
-            .databases.listDocuments(databaseId, collectionId, query);
+            .grids.listRows(databaseId, tableId, query);
         $spreadsheetLoading = false;
     }
 
@@ -267,26 +263,24 @@
             if (selectedDocumentForDelete) {
                 await sdk
                     .forProject(page.params.region, page.params.project)
-                    .databases.deleteDocument(databaseId, collectionId, selectedDocumentForDelete);
+                    .grids.deleteRow(databaseId, tableId, selectedDocumentForDelete);
 
                 selectedDocumentForDelete = null;
             } else {
                 await sdk
                     .forProject(page.params.region, page.params.project)
-                    .databases.deleteDocuments(databaseId, collectionId, [
-                        Query.equal('$id', selectedRows)
-                    ]);
+                    .grids.deleteRows(databaseId, tableId, [Query.equal('$id', selectedRows)]);
             }
 
-            trackEvent(Submit.DocumentDelete);
+            trackEvent(Submit.RowDelete);
             addNotification({
                 type: 'success',
                 message: `${selectedRows.length} document${selectedRows.length > 1 ? 's' : ''} deleted`
             });
-            invalidate(Dependencies.DOCUMENTS);
+            invalidate(Dependencies.ROWS);
         } catch (error) {
             addNotification({ type: 'error', message: error.message });
-            trackError(error, Submit.DocumentDelete);
+            trackError(error, Submit.RowDelete);
         } finally {
             selectedRows = [];
             showDelete = false;
@@ -299,11 +293,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.deleteAttribute(
-                    databaseId,
-                    collectionId,
-                    $databaseColumnSheetOptions.column.key
-                );
+                .grids.deleteColumn(databaseId, tableId, $databaseColumnSheetOptions.column.key);
 
             if ($columnsOrder.includes($databaseColumnSheetOptions.column.key)) {
                 const updatedOrder = $columnsOrder.filter(
@@ -312,31 +302,31 @@
                 saveColumnsOrder(updatedOrder, false);
             }
 
-            trackEvent(Submit.AttributeDelete);
+            trackEvent(Submit.ColumnDelete);
             addNotification({
                 type: 'success',
-                message: 'Attribute deleted'
+                message: 'Column deleted'
             });
 
-            invalidate(Dependencies.COLLECTION);
-            invalidate(Dependencies.DOCUMENTS);
+            invalidate(Dependencies.TABLE);
+            invalidate(Dependencies.ROWS);
 
             $databaseColumnSheetOptions.column = null;
         } catch (error) {
             addNotification({ type: 'error', message: error.message });
-            trackError(error, Submit.AttributeDelete);
+            trackError(error, Submit.ColumnDelete);
         } finally {
             showColumnDelete = false;
         }
     }
 
     enum Deletion {
-        'setNull' = 'Set document ID as NULL in all related documents',
-        'cascade' = 'All related documents will be deleted',
-        'restrict' = 'Document can not be deleted'
+        'setNull' = 'Set rpw ID as NULL in all related rows',
+        'cascade' = 'All related rows will be deleted',
+        'restrict' = 'Row can not be deleted'
     }
 
-    $: relAttributes = $attributes?.filter(
+    $: relatedColumns = $columns?.filter(
         (attribute) =>
             isRelationship(attribute) &&
             // One-to-One are always included
@@ -347,7 +337,7 @@
                 (attribute.relationType === 'manyToOne' && attribute.side === 'child') ||
                 // Many-to-Many: Only include if the parent is being deleted
                 (isRelationshipToMany(attribute) && attribute.side === 'parent'))
-    ) as Models.AttributeRelationship[];
+    ) as Models.ColumnRelationship[];
 
     let checked = false;
 
@@ -355,7 +345,7 @@
         action: HeaderCellAction | RowCellAction,
         columnId: string,
         type: 'header' | 'row',
-        document: Models.Document | null = null
+        row: Models.Row | null = null
     ) {
         if (type === 'header') {
             if (action === 'update') {
@@ -368,7 +358,7 @@
                 const { to, neighbour } = $databaseColumnSheetOptions.direction;
                 $showCreateAttributeSheet.title = `Insert column to the ${to} of ${neighbour}`;
                 $showCreateAttributeSheet.direction = $databaseColumnSheetOptions.direction;
-                $showCreateAttributeSheet.columns = $columns;
+                $showCreateAttributeSheet.columns = $tableColumns;
                 $showCreateAttributeSheet.columnsOrder = $columnsOrder;
                 $showCreateAttributeSheet.show = true;
             }
@@ -392,23 +382,21 @@
 
             if (action === 'duplicate-header') {
                 $showCreateAttributeSheet.title = `Duplicate column`;
-                $showCreateAttributeSheet.column = $attributes.find(
-                    (attr) => attr.key === columnId
-                );
-                $showCreateAttributeSheet.columns = $columns;
+                $showCreateAttributeSheet.column = $columns.find((attr) => attr.key === columnId);
+                $showCreateAttributeSheet.columns = $tableColumns;
                 $showCreateAttributeSheet.columnsOrder = $columnsOrder;
                 $showCreateAttributeSheet.show = true;
             }
         } else if (type === 'row') {
             if (action === 'update') {
                 $databaseRowSheetOptions.show = true;
-                $databaseRowSheetOptions.document = document;
+                $databaseRowSheetOptions.row = row;
                 $databaseRowSheetOptions.title = 'Update record';
             }
 
             if (action === 'duplicate-row') {
                 showRecordsCreateSheet.show = true;
-                showRecordsCreateSheet.document = document;
+                showRecordsCreateSheet.row = row;
             }
 
             if (action === 'copy-json') {
@@ -417,7 +405,7 @@
                     await copy(stringified);
                     addNotification({
                         type: 'success',
-                        message: 'Document copied' // TODO: should be Row later
+                        message: 'Row copied'
                     });
                 } catch (e) {
                     addNotification({
@@ -429,7 +417,7 @@
 
             if (action === 'delete') {
                 showDelete = true;
-                selectedDocumentForDelete = document.$id;
+                selectedDocumentForDelete = row.$id;
             }
         }
     }
@@ -437,15 +425,13 @@
     const emptyCellsLimit = $isSmallViewport ? 12 : 18;
 
     $: emptyCellsCount =
-        data.documents.documents.length >= emptyCellsLimit
-            ? 0
-            : emptyCellsLimit - data.documents.documents.length;
+        data.rows.rows.length >= emptyCellsLimit ? 0 : emptyCellsLimit - data.rows.rows.length;
 
     const saveColumnsWidth = debounce((column: { columnId: string; newWidth: number }) => {
         const fixedWidth =
-            $columns.find((col) => col.id === column.columnId)?.width ?? column.newWidth;
+            $tableColumns.find((col) => col.id === column.columnId)?.width ?? column.newWidth;
 
-        preferences.saveColumnWidths(data.organization.$id ?? data.project.teamId, collectionId, {
+        preferences.saveColumnWidths(data.organization.$id ?? data.project.teamId, tableId, {
             [column.columnId]: {
                 fixed: fixedWidth,
                 resized: Math.ceil(column.newWidth)
@@ -453,7 +439,7 @@
         });
     }, 1000);
 
-    $: reInitSpreadsheetKey = $collection.attributes.length;
+    $: reInitSpreadsheetKey = $table.columns.length;
 </script>
 
 <SpreadsheetContainer>
@@ -463,7 +449,7 @@
             height="100%"
             allowSelection
             bind:selectedRows
-            bind:columns={$columns}
+            bind:columns={$tableColumns}
             loading={$spreadsheetLoading}
             emptyCells={emptyCellsCount}
             keyboardNavigation
@@ -475,7 +461,7 @@
                 saveColumnsWidth(resize.detail);
             }}>
             <svelte:fragment slot="header" let:root>
-                {#each $columns as column (column.id)}
+                {#each $tableColumns as column (column.id)}
                     {#if column.isAction}
                         <Spreadsheet.Header.Cell column="actions" {root}>
                             <Button.Button
@@ -484,7 +470,7 @@
                                 on:click={() => {
                                     $showCreateAttributeSheet.show = true;
                                     $showCreateAttributeSheet.column = null;
-                                    $showCreateAttributeSheet.columns = $columns;
+                                    $showCreateAttributeSheet.columns = $tableColumns;
                                     $showCreateAttributeSheet.title = 'Insert column';
                                     $showCreateAttributeSheet.columnsOrder = $columnsOrder;
                                 }}>
@@ -495,7 +481,7 @@
                         <SheetOptions
                             type="header"
                             columnId={column.id}
-                            column={$attributes.find((attr) => attr.key === column.id)}
+                            column={$columns.find((col) => col.key === column.id)}
                             onSelect={(option, columnId) =>
                                 onSelectSheetOption(option, columnId, 'header')}>
                             {#snippet children(toggle)}
@@ -530,11 +516,11 @@
                 {/each}
             </svelte:fragment>
 
-            {#each documents.documents as document, index (document.$id)}
+            {#each rows.rows as row, index (row.$id)}
                 <!-- TODO: add `value` for user attributes -->
-                <Spreadsheet.Row.Base {root} id={document.$id} {index}>
-                    {#each $columns as { id: columnId, isEditable } (columnId)}
-                        {@const formatted = formatColumn(document[columnId])}
+                <Spreadsheet.Row.Base {root} id={row.$id} {index}>
+                    {#each $tableColumns as { id: columnId, isEditable } (columnId)}
+                        {@const formatted = formatColumn(row[columnId])}
                         <Spreadsheet.Cell
                             {root}
                             {isEditable}
@@ -543,15 +529,15 @@
                                 ? undefined
                                 : formatted}>
                             {#if columnId === '$id'}
-                                <Id value={document.$id} tooltipPortal>{document.$id}</Id>
+                                <Id value={row.$id} tooltipPortal>{row.$id}</Id>
                             {:else if columnId === '$createdAt' || columnId === '$updatedAt'}
-                                <DualTimeView time={document[columnId]} />
+                                <DualTimeView time={row[columnId]} />
                             {:else if columnId === 'actions'}
                                 <SheetOptions
                                     type="row"
-                                    column={$attributes.find((attr) => attr.key === columnId)}
+                                    column={$columns.find((col) => col.key === columnId)}
                                     onSelect={(option) =>
-                                        onSelectSheetOption(option, 'row', null, document)}>
+                                        onSelectSheetOption(option, 'row', null, row)}>
                                     {#snippet children(toggle)}
                                         <Button.Button
                                             icon
@@ -564,22 +550,21 @@
                                     {/snippet}
                                 </SheetOptions>
                             {:else}
-                                {@const attr = $attributes.find((n) => n.key === columnId)}
-                                {#if attr}
-                                    {#if isRelationship(attr)}
-                                        {@const args = displayNames?.[attr.relatedCollection] ?? [
-                                            '$id'
-                                        ]}
-                                        {#if !isRelationshipToMany(attr)}
-                                            {#if document[columnId]}
-                                                {@const related = document[columnId]}
+                                {@const col = $columns.find((n) => n.key === columnId)}
+                                {#if col}
+                                    {#if isRelationship(col)}
+                                        {@const args = displayNames?.[col.relatedTable] ?? ['$id']}
+                                        {#if !isRelationshipToMany(col)}
+                                            {#if row[columnId]}
+                                                {@const related = row[columnId]}
                                                 <Link.Button
                                                     variant="muted"
                                                     on:click={(e) => {
                                                         e.preventDefault();
                                                         e.stopPropagation();
+                                                        // TODO: open sheet maybes
                                                         goto(
-                                                            `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection/${attr.relatedCollection}/document/${related.$id}`
+                                                            `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table/${col.relatedTable}/row/${related.$id}`
                                                         );
                                                     }}>
                                                     {#each args as arg, i}
@@ -594,7 +579,7 @@
                                                 <span class="text">n/a</span>
                                             {/if}
                                         {:else}
-                                            {@const itemsNum = document[columnId]?.length}
+                                            {@const itemsNum = row[columnId]?.length}
                                             <Button.Button
                                                 variant="extra-compact"
                                                 disabled={!itemsNum}
@@ -602,19 +587,18 @@
                                                 on:click={(e) => {
                                                     e.stopPropagation();
                                                     e.preventDefault();
-                                                    relationshipData = document[columnId];
+                                                    relationshipData = row[columnId];
                                                     showRelationships = true;
-                                                    selectedRelationship = attr;
+                                                    selectedRelationship = col;
                                                 }}>
                                                 Items
                                             </Button.Button>
                                         {/if}
                                     {:else}
-                                        {@const value = document[columnId]}
-                                        {@const formatted = formatColumn(document[columnId])}
-                                        {@const isDatetimeAttribute = attr.type === 'datetime'}
-                                        {@const isEncryptedAttribute =
-                                            isString(attr) && attr.encrypt}
+                                        {@const value = row[columnId]}
+                                        {@const formatted = formatColumn(row[columnId])}
+                                        {@const isDatetimeAttribute = col.type === 'datetime'}
+                                        {@const isEncryptedAttribute = isString(col) && col.encrypt}
                                         {#if isDatetimeAttribute}
                                             <DualTimeView time={value}>
                                                 <span slot="title">Timestamp</span>
@@ -664,7 +648,7 @@
                     <Typography.Text variant="m-400" color="--fgcolor-neutral-secondary">
                         {selectedRows.length
                             ? `${selectedRows.length} records selected`
-                            : `${documents.documents.length} records`}
+                            : `${rows.rows.length} records`}
                     </Typography.Text>
 
                     <div style:margin-right="var(--space-6)">
@@ -687,7 +671,7 @@
                         <Layout.Stack direction="row" alignItems="center" gap="m">
                             <Badge content={selectedRows.length.toString()} />
                             <span style:font-size="14px">
-                                {selectedRows.length > 1 ? 'documents' : 'document'}
+                                {selectedRows.length > 1 ? 'rows' : 'row'}
                                 selected
                             </span>
                         </Layout.Stack>
@@ -706,20 +690,20 @@
 <RelationshipsModal bind:show={showRelationships} {selectedRelationship} data={relationshipData} />
 
 <Confirm
-    title={selectedRows.length === 1 ? 'Delete Document' : 'Delete Documents'}
+    title={selectedRows.length === 1 ? 'Delete Row' : 'Delete Rows'}
     bind:open={showDelete}
     onSubmit={handleDelete}>
     {@const isSingle = selectedDocumentForDelete !== null}
 
     <div>
         {#if isSingle}
-            Are you sure you want to delete this document from <b>{$collection.name}</b>?
+            Are you sure you want to delete this document from <b>{$table.name}</b>?
         {:else}
             Are you sure you want to delete <b>{selectedRows.length}</b>
-            {selectedRows.length > 1 ? 'documents' : 'document'} from <b>{$collection.name}</b>?
+            {selectedRows.length > 1 ? 'rows' : 'row'} from <b>{$table.name}</b>?
         {/if}
 
-        {#if relAttributes?.length}
+        {#if relatedColumns?.length}
             <Table.Root
                 let:root
                 columns={[
@@ -732,7 +716,7 @@
                     <Table.Header.Cell column="setting" {root}>Setting</Table.Header.Cell>
                     <Table.Header.Cell column="desc" {root} />
                 </svelte:fragment>
-                {#each relAttributes as attr}
+                {#each relatedColumns as attr}
                     <Table.Row.Base {root}>
                         <Table.Cell column="relation" {root}>
                             <span class="u-flex u-cross-center u-gap-8">
@@ -758,7 +742,7 @@
                 <ul>
                     <InputChoice id="delete" label="Delete" showLabel={false} bind:value={checked}>
                         Delete {isSingle ? 'document' : 'documents'} from
-                        <span data-private>{$collection.name}</span>
+                        <span data-private>{$table.name}</span>
                     </InputChoice>
                 </ul>
             </div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
similarity index 72%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
index 672adab6e..226bb6c74 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
@@ -1,43 +1,41 @@
 import { page } from '$app/stores';
-import { derived, writable } from 'svelte/store';
 import type { Column } from '$lib/helpers/types';
 import type { Models } from '@appwrite.io/console';
-import type { SortDirection } from '$lib/components/sortButton.svelte';
+import { derived, writable } from 'svelte/store';
+import type { SortDirection } from '$lib/components';
 
-export type Attributes =
-    | Models.AttributeBoolean
-    | Models.AttributeEmail
-    | Models.AttributeEnum
-    | Models.AttributeFloat
-    | Models.AttributeInteger
-    | Models.AttributeIp
-    | Models.AttributeString
-    | Models.AttributeUrl
-    | (Models.AttributeRelationship & { default?: never });
+export type Columns =
+    | Models.ColumnBoolean
+    | Models.ColumnEmail
+    | Models.ColumnEnum
+    | Models.ColumnFloat
+    | Models.ColumnInteger
+    | Models.ColumnIp
+    | Models.ColumnString
+    | Models.ColumnUrl
+    | (Models.ColumnRelationship & { default?: never });
 
-type Collection = Omit<Models.Collection, 'attributes'> & {
-    attributes: Array<Attributes>;
+type Table = Omit<Models.Table, 'columns'> & {
+    columns: Array<Columns>;
 };
 
-export const collection = derived(page, ($page) => $page.data.collection as Collection);
-export const attributes = derived(
-    page,
-    ($page) => $page.data.collection.attributes as Attributes[]
-);
-export const indexes = derived(page, ($page) => $page.data.collection.indexes as Models.Index[]);
+export const table = derived(page, ($page) => $page.data.table as Table);
+export const columns = derived(page, ($page) => $page.data.table.columns as Columns[]);
+export const indexes = derived(page, ($page) => $page.data.table.indexes as Models.ColumnIndex[]);
+
+export const tableColumns = writable<Column[]>([]);
+
+export const isCsvImportInProgress = writable(false);
 
-export const columns = writable<Column[]>([]);
 export const columnsOrder = writable<string[]>([]);
 export const columnsWidth = writable<{
     [columnId: string]: { fixed: number | { min: number }; resized: number };
 }>();
 
-export const isCsvImportInProgress = writable(false);
-
 type DatabaseSheetOptions = {
     show: boolean;
     title?: string;
-    column?: Attributes;
+    column?: Columns;
     isEdit?: boolean;
     disableSubmit?: boolean;
     submitAction?: () => Promise<void>;
@@ -56,17 +54,17 @@ export const databaseColumnSheetOptions = writable<DatabaseSheetOptions>({
 
 export const databaseRowSheetOptions = writable<
     DatabaseSheetOptions & {
-        document: Models.Document;
+        row: Models.Row;
     }
 >({
     title: null,
     show: false,
-    document: null
+    row: null
 });
 
 export const showRecordsCreateSheet = writable({
     show: false,
-    document: null
+    row: null
 });
 
 export const sortState = writable({
@@ -81,7 +79,7 @@ export type ColumnDirection = {
 
 export type CreateAttribute = {
     show: boolean;
-    column?: Attributes;
+    column?: Columns;
     title: string;
     direction?: ColumnDirection;
     onDone?: () => void;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
similarity index 68%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
index 87da2e66b..4476c9a17 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
@@ -5,19 +5,20 @@
     import Container from '$lib/layout/container.svelte';
 
     export let data;
-    $: total = data.documentsTotal;
-    $: count = data.documents;
+
+    $: count = data.rows;
+    $: total = data.rowsTotal;
 </script>
 
 <div class="wide-screen-wrapper databases-spreadsheet">
     <Container expanded slotSpacing paddingInlineEnd databasesScreen>
         <Usage
-            path={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/usage`}
+            path={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/usage`}
             {total}
             {count}
             countMetadata={{
-                legend: 'Documents',
-                title: 'Total documents'
+                legend: 'Rows',
+                title: 'Total rows'
             }} />
     </Container>
 </div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
similarity index 52%
rename from src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
index deec39cec..9cdb7bdd1 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
@@ -1,13 +1,14 @@
 import { isValueOfStringEnum } from '$lib/helpers/types';
 import { sdk } from '$lib/stores/sdk';
-import { DatabaseUsageRange } from '@appwrite.io/console';
+import { GridUsageRange } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
-    const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
+    const period = isValueOfStringEnum(GridUsageRange, params.period)
         ? params.period
-        : DatabaseUsageRange.ThirtyDays;
+        : GridUsageRange.ThirtyDays;
+
     return sdk
         .forProject(params.region, params.project)
-        .databases.getCollectionUsage(params.database, params.collection, period);
+        .grids.getTableUsage(params.database, params.table, period);
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
index bab65963c..4e4b4ae72 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
@@ -8,70 +8,74 @@
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
-    import { canWriteCollections } from '$lib/stores/roles';
+    import { canWriteTables } from '$lib/stores/roles';
     import { sdk } from '$lib/stores/sdk';
     import { Badge, FloatingActionBar, Table, Typography } from '@appwrite.io/pink-svelte';
     import type { PageData } from './$types';
-    import { columns } from './store';
+    import { tableViewColumns } from './store';
     import Confirm from '$lib/components/confirm.svelte';
 
     export let data: PageData;
     const databaseId = page.params.database;
 
-    let selectedRows: string[] = [];
-    let showDelete = false;
     let deleting = false;
+    let showDelete = false;
+    let selectedTables: string[] = [];
 
     async function handleDelete() {
         showDelete = false;
 
-        const promises = selectedRows.map((collectionId) =>
+        const promises = selectedTables.map((tableId) =>
             sdk
                 .forProject(page.params.region, page.params.project)
-                .databases.deleteCollection(databaseId, collectionId)
+                .grids.deleteTable(databaseId, tableId)
         );
         try {
             await Promise.all(promises);
-            trackEvent(Submit.CollectionDelete);
+            trackEvent(Submit.TableDelete);
             addNotification({
                 type: 'success',
-                message: `${selectedRows.length} collection${selectedRows.length > 1 ? 's' : ''} deleted`
+                message: `${selectedTables.length} table${selectedTables.length > 1 ? 's' : ''} deleted`
             });
-            invalidate(Dependencies.COLLECTIONS);
+            invalidate(Dependencies.TABLES);
         } catch (error) {
             addNotification({
                 type: 'error',
                 message: error.message
             });
-            trackError(error, Submit.CollectionDelete);
+            trackError(error, Submit.TableDelete);
         } finally {
-            selectedRows = [];
+            selectedTables = [];
             showDelete = false;
         }
     }
 </script>
 
-<Table.Root columns={$columns} allowSelection={$canWriteCollections} bind:selectedRows let:root>
+<Table.Root
+    columns={$tableViewColumns}
+    allowSelection={$canWriteTables}
+    bind:selectedRows={selectedTables}
+    let:root>
     <svelte:fragment slot="header" let:root>
-        {#each $columns as { id, title }}
+        {#each $tableViewColumns as { id, title }}
             <Table.Header.Cell column={id} {root}>{title}</Table.Header.Cell>
         {/each}
     </svelte:fragment>
-    {#each data.collections.collections as collection (collection.$id)}
+    {#each data.tables.tables as table (table.$id)}
         <Table.Row.Link
             {root}
-            id={collection.$id}
-            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${collection.$id}`}>
-            {#each $columns as column}
+            id={table.$id}
+            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${table.$id}`}>
+            {#each $tableViewColumns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === '$id'}
-                        {#key $columns}
-                            <Id value={collection.$id}>{collection.$id}</Id>
+                        {#key $tableViewColumns}
+                            <Id value={table.$id}>{table.$id}</Id>
                         {/key}
                     {:else if column.id === 'name'}
-                        {collection.name}
+                        {table.name}
                     {:else}
-                        {toLocaleDateTime(collection[column.id])}
+                        {toLocaleDateTime(table[column.id])}
                     {/if}
                 </Table.Cell>
             {/each}
@@ -79,29 +83,25 @@
     {/each}
 </Table.Root>
 
-{#if selectedRows.length > 0}
+{#if selectedTables.length > 0}
     <FloatingActionBar>
         <svelte:fragment slot="start">
-            <Badge content={selectedRows.length.toString()} />
+            <Badge content={selectedTables.length.toString()} />
             <span>
-                {selectedRows.length > 1 ? 'collections' : 'collection'}
+                {selectedTables.length > 1 ? 'tables' : 'table'}
                 selected
             </span>
         </svelte:fragment>
         <svelte:fragment slot="end">
-            <Button text on:click={() => (selectedRows = [])}>Cancel</Button>
+            <Button text on:click={() => (selectedTables = [])}>Cancel</Button>
             <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
         </svelte:fragment>
     </FloatingActionBar>
 {/if}
 
-<Confirm
-    title="Delete collections"
-    bind:open={showDelete}
-    onSubmit={handleDelete}
-    disabled={deleting}>
+<Confirm title="Delete tables" bind:open={showDelete} onSubmit={handleDelete} disabled={deleting}>
     <Typography.Text>
-        Are you sure you want to delete <b>{selectedRows.length}</b>
-        {selectedRows.length > 1 ? 'collections' : 'collection'}?
+        Are you sure you want to delete <b>{selectedTables.length}</b>
+        {selectedTables.length > 1 ? 'tables' : 'table'}?
     </Typography.Text>
 </Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
index 2cf815d2e..8ae2d9073 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
@@ -6,8 +6,8 @@
 
     export let data;
 
-    $: total = data.collectionsTotal;
-    $: count = data.collections;
+    $: total = data.tablesTotal;
+    $: count = data.tables;
 
     $: reads = data.databaseReads;
     $: readsTotal = data.databaseReadsTotal;
@@ -23,8 +23,8 @@
             {total}
             {count}
             countMetadata={{
-                legend: 'Collections',
-                title: 'Total collections'
+                legend: 'Tables',
+                title: 'Total tables'
             }} />
 
         <UsageMultiple
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
index 9b8f7d9a9..f80949739 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts
@@ -4,10 +4,11 @@ import { DatabaseUsageRange } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
+    // TODO: @Jake, should be GridUsageRange
     const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
     return sdk
         .forProject(params.region, params.project)
-        .databases.getDatabaseUsage(params.database, period);
+        .grids.getDatabaseUsage(params.database, period);
 };
diff --git a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
index 5ff65052e..d0caac9cf 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.svelte
@@ -6,6 +6,7 @@
     import type { PageData } from './$types';
 
     export let data: PageData;
+
     $: total = data.databasesTotal;
     $: count = data.databases;
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
index f9b560e93..63dc3e7b4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts
@@ -4,8 +4,10 @@ import { DatabaseUsageRange } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
+    // TODO: @Jake, should be GridUsageRange
     const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
-    return sdk.forProject(params.region, params.project).databases.getUsage(period);
+
+    return sdk.forProject(params.region, params.project).grids.listDatabaseUsage(period);
 };
diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
index cbf9b76fe..44027867a 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte
@@ -134,7 +134,7 @@
                                 <Typography.Title>
                                     {formatNum($usage.documentsTotal ?? 0)}
                                 </Typography.Title>
-                                <Typography.Text>Documents</Typography.Text>
+                                <Typography.Text>Rows</Typography.Text>
                             </div>
                         </div>
                     </Card.Link>
diff --git a/src/routes/(console)/project-[region]-[project]/overview/api-keys/scopes.svelte b/src/routes/(console)/project-[region]-[project]/overview/api-keys/scopes.svelte
index d3a7601e6..f9c670fb0 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/api-keys/scopes.svelte
+++ b/src/routes/(console)/project-[region]-[project]/overview/api-keys/scopes.svelte
@@ -7,6 +7,33 @@
 
     export let scopes: string[];
 
+    const newScopes = ['tables.', 'columns.', 'rows.'];
+    const legacyScopes = ['attributes.', 'collections.', 'documents.'];
+
+    const isCreateMode = scopes.length === 0;
+
+    const hasLegacyScopes = !isCreateMode
+        ? scopes.some((scope) => legacyScopes.some((prefix) => scope?.startsWith(prefix)))
+        : false;
+
+    const filteredScopes = allScopes.filter((scope) => {
+        const val = scope.scope;
+
+        if (!val) return false;
+
+        if (isCreateMode) {
+            return !legacyScopes.some((prefix) => val.startsWith(prefix));
+        }
+
+        if (hasLegacyScopes) {
+            // In edit mode, if legacy scopes exist, exclude new ones
+            return !newScopes.some((prefix) => val.startsWith(prefix));
+        } else {
+            // In edit mode, if new scopes exist, exclude new ones
+            return !legacyScopes.some((prefix) => val.startsWith(prefix));
+        }
+    });
+
     enum Category {
         Auth = 'Auth',
         Database = 'Database',
@@ -50,7 +77,7 @@
     }
 
     function categoryState(category: string, s: string[]): boolean | 'indeterminate' {
-        const scopesByCategory = allScopes.filter((n) => n.category === category);
+        const scopesByCategory = filteredScopes.filter((n) => n.category === category);
         const filtered = scopesByCategory.filter((n) => s.includes(n.scope));
         if (filtered.length === 0) {
             return false;
@@ -63,14 +90,14 @@
 
     function onCategoryChange(event: CustomEvent<boolean | 'indeterminate'>, category: Category) {
         if (event.detail === 'indeterminate') return;
-        allScopes.forEach((s) => {
+        filteredScopes.forEach((s) => {
             if (s.category === category) {
                 activeScopes[s.scope] = event.detail;
             }
         });
     }
 
-    const activeScopes = allScopes.reduce((prev, next) => {
+    const activeScopes = filteredScopes.reduce((prev, next) => {
         prev[next.scope] = false;
 
         return prev;
@@ -78,12 +105,12 @@
 
     $: {
         if (mounted) {
-            const newScopes = allScopes
+            const newScopeSet = filteredScopes
                 .filter((scope) => activeScopes[scope.scope])
                 .map(({ scope }) => scope);
 
-            if (symmetricDifference(scopes, newScopes).length) {
-                scopes = newScopes;
+            if (symmetricDifference(scopes, newScopeSet).length) {
+                scopes = newScopeSet;
             }
         }
     }
@@ -103,7 +130,7 @@
         {#each categories as category, index}
             {@const checked = categoryState(category, scopes)}
             {@const isLastItem = index === categories.length - 1}
-            {@const scopesLength = allScopes.filter(
+            {@const scopesLength = filteredScopes.filter(
                 (n) => n.category === category && scopes.includes(n.scope)
             ).length}
             <Accordion
@@ -114,7 +141,7 @@
                 {checked}
                 on:change={(event) => onCategoryChange(event, category)}>
                 <Layout.Stack>
-                    {#each allScopes.filter((s) => s.category === category) as scope}
+                    {#each filteredScopes.filter((s) => s.category === category) as scope}
                         <Selector.Checkbox
                             size="s"
                             id={scope.scope}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
index 0315939a5..38def3870 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte
@@ -18,9 +18,10 @@
 
     const dispatch = createEventDispatcher();
 
+    // TODO: @itznotabug - check what needs to be changed here. we might need to do dual stuff to manage backwards compat?
     const labelMap = {
         users: { root: 'Users', teams: 'Include teams' },
-        databases: { root: 'Databases', documents: 'Include documents' },
+        databases: { root: 'Databases', rows: 'Include rows' },
         functions: {
             root: 'Functions',
             env: 'Include environment variables',
@@ -35,8 +36,8 @@
             teams: 'Import all teams and the team memberships of your users'
         },
         databases: {
-            root: 'Import all databases, including collections, indexes and attributes',
-            documents: 'Import all documents inside collections'
+            root: 'Import all databases, including tables, indexes and columns',
+            rows: 'Import all rows inside tables'
         },
         functions: {
             root: 'Import all functions and their active deployment',
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
index 1b885de3e..7be93b6e3 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte
@@ -95,10 +95,13 @@
                 'users.read',
                 'teams.read',
                 'databases.read',
-                'collections.read',
-                'attributes.read',
+                'collections.read' /* legacy */,
+                'attributes.read' /* legacy */,
                 'indexes.read',
-                'documents.read',
+                'documents.read' /* legacy */,
+                'tables.read',
+                'columns.read',
+                'rows.read',
                 'files.read',
                 'buckets.read',
                 'functions.read',
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte
index fd175d57d..9690345a6 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/details.svelte
@@ -33,7 +33,8 @@
     });
 
     type StatusCounters = {
-        [resource in 'Database' | 'Collection' | 'Function' | 'Users']?: StatusCounter;
+        // todo: does this need a change for tables api? i doubt
+        [resource in 'Database' | 'Table' | 'Function' | 'Users']?: StatusCounter;
     };
     type StatusCounter = {
         [statusType in 'pending' | 'success' | 'error' | 'skip' | 'processing' | 'warning']: number;
diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
index bbb1ebda7..dd1b6d1c0 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte
@@ -94,10 +94,13 @@
                 'users.read',
                 'teams.read',
                 'databases.read',
-                'collections.read',
-                'attributes.read',
+                'collections.read' /* legacy */,
+                'attributes.read' /* legacy */,
                 'indexes.read',
-                'documents.read',
+                'documents.read' /* legacy */,
+                'tables.read',
+                'columns.read',
+                'rows.read',
                 'files.read',
                 'buckets.read',
                 'functions.read',