diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte
index 586c523d3f..dfd2311e8e 100644
--- a/src/lib/commandCenter/panels/ai.svelte
+++ b/src/lib/commandCenter/panels/ai.svelte
@@ -23,6 +23,7 @@
         credentials: 'include'
     });
 
+    // TODO: change collections to tables after docs are updated!
     const examples = [
         'How to add platform in the console?',
         'How can I manage users, permissions, and access control in Appwrite?',
diff --git a/src/lib/commandCenter/panels/createAttribute.svelte b/src/lib/commandCenter/panels/createAttribute.svelte
index 950d4af723..6e330a75d0 100644
--- a/src/lib/commandCenter/panels/createAttribute.svelte
+++ b/src/lib/commandCenter/panels/createAttribute.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { initCreateAttribute } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
-    import { attributeOptions } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store';
+    import { initCreateAttribute } from '$routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.svelte';
+    import { attributeOptions } from '$routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/store';
     import Template from './template.svelte';
 
     let search = '';
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
index 8a3a9ed546..b8bbc67a02 100644
--- a/src/lib/commandCenter/searchers/collections.ts
+++ b/src/lib/commandCenter/searchers/collections.ts
@@ -20,7 +20,7 @@ export const collectionsSearcher = (async (query: string) => {
                     label: col.name,
                     callback: () => {
                         goto(
-                            `${base}/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}`
+                            `${base}/project-${projectId}/databases/database-${databaseId}/table-${col.$id}`
                         );
                     }
                 }) as const
diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte
index 37c1640ad8..ae6401a7f0 100644
--- a/src/lib/components/columnSelector.svelte
+++ b/src/lib/components/columnSelector.svelte
@@ -20,7 +20,7 @@
 
     onMount(async () => {
         if (isCustomCollection) {
-            const prefs = preferences.getCustomCollectionColumns(page.params.collection);
+            const prefs = preferences.getCustomCollectionColumns(page.params.table);
             columns.set(
                 $columns.map((column) => {
                     column.hide = prefs?.includes(column.id) ?? false;
diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte
index db94a71424..44ccee2847 100644
--- a/src/lib/components/eventModal.svelte
+++ b/src/lib/components/eventModal.svelte
@@ -212,6 +212,7 @@
             if (selected.service) {
                 fields.push(selected.service.name, '*');
             }
+            // TODO: change collections and documents terminology later
             if (selected.resource?.name === 'documents') {
                 fields.push('collections', '*');
             }
diff --git a/src/routes/(console)/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration-wizard)/resource-form.svelte
index da3de89161..16f7b1ef3c 100644
--- a/src/routes/(console)/(migration-wizard)/resource-form.svelte
+++ b/src/routes/(console)/(migration-wizard)/resource-form.svelte
@@ -298,7 +298,7 @@
                 {/if}
             </div>
             <div></div>
-            <span>Import all databases, including collections, indexes and attributes</span>
+            <span>Import all databases, including tables, indexes and columns</span>
 
             {#if resources?.includes('document')}
                 <ul>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
index fac2acd326..8d1dc7a2ae 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
@@ -25,13 +25,13 @@
         $showCreate = false;
         await invalidate(Dependencies.DATABASE);
         await goto(
-            `${base}/project-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
+            `${base}/project-${project}/databases/database-${databaseId}/table-${event.detail.$id}`
         );
     }
 
     $: $registerCommands([
         {
-            label: 'Create collection',
+            label: 'Create table',
             callback() {
                 $showCreate = true;
                 if (!page.url.pathname.endsWith(databaseId)) {
@@ -39,7 +39,7 @@
                 }
             },
             keys: page.url.pathname.endsWith(databaseId) ? ['c'] : ['c', 'c'],
-            disabled: page.url.pathname.includes('collection-') || !$canWriteCollections,
+            disabled: page.url.pathname.includes('table-') || !$canWriteCollections,
             group: 'databases',
             icon: IconPlus
         },
@@ -70,12 +70,12 @@
             rank: page.url.pathname.endsWith('backups') ? 10 : 0
         },
         {
-            label: 'Go to collections',
+            label: 'Go to tables',
             callback() {
                 goto(`${base}/project-${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'
         },
@@ -84,8 +84,7 @@
             callback() {
                 goto(`${base}/project-${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'
         },
@@ -95,7 +94,7 @@
                 goto(`${base}/project-${project}/databases/database-${databaseId}/backups`);
             },
             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'
         },
@@ -106,13 +105,13 @@
             },
             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);
             },
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
index b7e886be57..0d01a58e56 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
@@ -25,9 +25,9 @@
                 hideColumns={!data.collections.total}
                 hideView={!data.collections.total} />
             {#if $canWriteCollections}
-                <Button on:click={() => ($showCreate = true)} event="create_collection">
+                <Button on:click={() => ($showCreate = true)} event="create_table">
                     <Icon icon={IconPlus} slot="start" size="s" />
-                    Create collection
+                    Create table
                 </Button>
             {/if}
         </Layout.Stack>
@@ -41,16 +41,17 @@
         {/if}
 
         <PaginationWithLimit
-            name="Collections"
+            name="Tables"
             limit={data.limit}
             offset={data.offset}
             total={data.collections.total} />
     {:else}
+        <!-- TODO: update collections docs url and content later -->
         <Empty
             single
             allowCreate={$canWriteCollections}
             href="https://appwrite.io/docs/products/databases/collections"
-            target="collection"
+            target="table"
             on:click={() => ($showCreate = true)} />
     {/if}
 </Container>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
deleted file mode 100644
index e4b58dfd1c..0000000000
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script lang="ts">
-    import { base } from '$app/paths';
-    import { page } from '$app/state';
-    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 { isTabletViewport } from '$lib/stores/viewport';
-
-    $: projectId = page.params.project;
-    $: databaseId = page.params.database;
-    $: collectionId = page.params.collection;
-    $: path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`;
-    $: tabs = [
-        {
-            href: path,
-            title: 'Documents',
-            event: 'documents',
-            hasChildren: true
-        },
-        {
-            href: `${path}/attributes`,
-            title: 'Attributes',
-            event: 'attributes'
-        },
-        {
-            href: `${path}/indexes`,
-            title: 'Indexes',
-            event: 'indexes'
-        },
-        {
-            href: `${path}/activity`,
-            title: 'Activity',
-            event: 'activity',
-            hasChildren: true
-        },
-        {
-            href: `${path}/usage`,
-            title: 'Usage',
-            event: 'usage',
-            hasChildren: true
-        },
-        {
-            href: `${path}/settings`,
-            title: 'Settings',
-            event: 'settings',
-            disabled: !$canWriteCollections
-        }
-    ].filter((tab) => !tab.disabled);
-</script>
-
-<div style:margin-top={$isTabletViewport ? '48px' : 0}>
-    <Cover>
-        <svelte:fragment slot="header">
-            <CoverTitle href={`${base}/project-${projectId}/databases/database-${databaseId}`}>
-                {$collection?.name}
-            </CoverTitle>
-            {#key $collection?.$id}
-                <Id value={$collection?.$id}>{$collection?.$id}</Id>
-            {/key}
-        </svelte:fragment>
-
-        <Tabs>
-            {#each tabs as tab}
-                <Tab
-                    href={tab.href}
-                    selected={isTabSelected(tab, page.url.pathname, path, tabs)}
-                    event={tab.event}>
-                    {tab.title}
-                </Tab>
-            {/each}
-        </Tabs>
-    </Cover>
-</div>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
index 5e1d77b0e3..a3805a239b 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
@@ -53,11 +53,11 @@
     }
 </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 />
@@ -68,10 +68,10 @@
                 size="s"
                 on:click={() => {
                     showCustomId = true;
-                }}><Icon icon={IconPencil} /> Collection ID</Tag>
+                }}><Icon icon={IconPencil} /> Table ID</Tag>
         </div>
     {/if}
-    <CustomId autofocus bind:show={showCustomId} name="Collection" bind:id />
+    <CustomId autofocus bind:show={showCustomId} name="Table" bind:id />
 
     <svelte:fragment slot="footer">
         <Button secondary on:click={() => (showCreate = false)}>Cancel</Button>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
index a3ea156e80..5c15256f8f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
@@ -15,10 +15,10 @@
     disableEmpty={!$canWriteCollections}
     total={data.collections.total}
     on:click={() => (showCreate = true)}
-    event="collection">
+    event="table">
     {#each data.collections.collections as collection}
         <GridItem1
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${collection.$id}`}>
             <svelte:fragment slot="title">{collection.name}</svelte:fragment>
             <svelte:fragment slot="status">
                 {#if !collection.enabled}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
index 1cb81a36e8..fd47f3de1a 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
+++ b/src/routes/(console)/project-[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-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
index 88c8b2372d..6d47d571ca 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
+++ b/src/routes/(console)/project-[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;
@@ -93,21 +94,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>
+                            <span class="u-flex u-gap-8">
+                                {#await loadCollectionCount()}
+                                    <Skeleton variant="line" width="100%" height={19.5} />
+                                {:then count}
+                                    {count} {count === 1 ? 'Table' : 'Tables'}
+                                {/await}
+                            </span>
+                        </Layout.Stack>
                     </svelte:fragment>
                 </BoxAvatar>
             </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.svelte
similarity index 80%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.svelte
index d7aa06cc7f..7487bdf416 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -23,7 +23,7 @@
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import CreateAttribute from './createAttribute.svelte';
     import { writable } from 'svelte/store';
-    import type { Option } from './attributes/store';
+    import type { Option } from './columns/store';
     import { CreateAttributePanel } from '$lib/commandCenter/panels';
     import { database } from '../store';
     import { project } from '$routes/(console)/project-[project]/store';
@@ -36,6 +36,7 @@
     let unsubscribe: { (): void };
 
     onMount(() => {
+        // TODO: change the events once terminologies are changed on the backend
         unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
             if (
                 response.events.includes('databases.*.collections.*.attributes.*') ||
@@ -54,100 +55,100 @@
 
     $: $registerCommands([
         {
-            label: 'Create document',
+            label: 'Create row',
             keys: page.url.pathname.endsWith($collection.$id) ? ['c'] : ['c', 'd'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/create`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/create`
                 );
             },
             icon: IconPlus,
-            group: 'documents'
+            group: 'rows'
         },
         {
-            label: 'Create attribute',
+            label: 'Create column',
             keys: page.url.pathname.endsWith('attributes') ? ['c'] : ['c', 'a'],
             callback() {
                 addSubPanel(CreateAttributePanel);
             },
             icon: IconPlus,
-            group: 'attributes',
+            group: 'columns',
             disabled: !$canWriteCollections
         },
         {
-            label: 'Go to documents',
+            label: 'Go to rows',
             keys: ['g', 'd'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}`
                 );
             },
             disabled: page.url.pathname.endsWith($collection.$id),
-            group: 'collections'
+            group: 'tables'
         },
         {
-            label: 'Go to attributes',
+            label: 'Go to columns',
             keys: ['g', 'a'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/attributes`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/columns`
                 );
             },
             disabled: page.url.pathname.endsWith('attributes'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to indexes',
             keys: ['g', 'i'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/indexes`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/indexes`
                 );
             },
             disabled: page.url.pathname.endsWith('indexes'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to activity',
             keys: ['g', 'c'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/activity`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/activity`
                 );
             },
             disabled: page.url.pathname.endsWith('activity'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to usage',
             keys: ['g', 'u'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/usage`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/usage`
                 );
             },
             disabled: page.url.pathname.endsWith('usage'),
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Go to settings',
             keys: ['g', 's'],
             callback() {
                 goto(
-                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/settings`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/settings`
                 );
             },
             disabled: page.url.pathname.endsWith('settings') || !$canWriteCollections,
-            group: 'collections'
+            group: 'tables'
         },
         {
             label: 'Display Name',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/table-${$collection.$id}/settings#display-name`
                 );
             },
-            group: 'collections',
+            group: 'tables',
             disabled:
                 page.url.pathname.endsWith('display-name') ||
                 page.url.pathname.endsWith('settings') ||
@@ -158,10 +159,10 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/table-${$collection.$id}/settings#permissions`
                 );
             },
-            group: 'collections',
+            group: 'tables',
             disabled:
                 page.url.pathname.endsWith('permissions') ||
                 page.url.pathname.endsWith('settings') ||
@@ -169,15 +170,15 @@
             icon: IconPuzzle
         },
         {
-            label: 'Document security',
+            label: 'Row security',
             async callback() {
                 await goto(
-                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/table-${$collection.$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,
             icon: IconLockClosed
@@ -203,7 +204,7 @@
 </script>
 
 <svelte:head>
-    <title>{$collection?.name ?? 'Collection'} - Appwrite</title>
+    <title>{$collection?.name ?? 'Table'} - Appwrite</title>
 </svelte:head>
 
 <slot />
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.ts
similarity index 97%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.ts
index 5f71632d25..0c1bd68db9 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+layout.ts
@@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.COLLECTION);
     try {
         const [collection, allCollections] = await Promise.all([
-            sdk.forProject.databases.getCollection(params.database, params.collection),
+            sdk.forProject.databases.getCollection(params.database, params.table),
             sdk.forProject.databases.listCollections(params.database, [
                 Query.orderDesc(''),
                 Query.limit(100)
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.svelte
similarity index 88%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.svelte
index 160af2230a..7205a29eb7 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.svelte
@@ -10,8 +10,8 @@
     import { canWriteCollections, canWriteDocuments } from '$lib/stores/roles';
     import { Card, Icon, Layout, Empty as PinkEmpty } from '@appwrite.io/pink-svelte';
     import type { PageData } from './$types';
-    import CreateAttributeDropdown from './attributes/createAttributeDropdown.svelte';
-    import type { Option } from './attributes/store';
+    import CreateAttributeDropdown from './columns/createAttributeDropdown.svelte';
+    import type { Option } from './columns/store';
     import CreateAttribute from './createAttribute.svelte';
     import { collection, columns } from './store';
     import Table from './table.svelte';
@@ -24,7 +24,7 @@
     let showCreateAttribute = false;
     let selectedAttribute: Option['name'] = null;
 
-    $: selected = preferences.getCustomCollectionColumns(page.params.collection);
+    $: selected = preferences.getCustomCollectionColumns(page.params.table);
     $: columns.set(
         $collection.attributes.map((attribute) => ({
             id: attribute.key,
@@ -40,7 +40,7 @@
     $: hasValidAttributes = $collection?.attributes?.some((attr) => attr.status === 'available');
 </script>
 
-{#key page.params.collection}
+{#key page.params.table}
     <Container>
         <Layout.Stack direction="row" justifyContent="space-between">
             <Filters
@@ -52,10 +52,10 @@
                 <ViewSelector view={data.view} {columns} hideView />
                 <Button
                     disabled={!(hasAttributes && hasValidAttributes)}
-                    href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/create`}
+                    href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/create`}
                     event="create_document">
                     <Icon icon={IconPlus} slot="start" size="s" />
-                    Create document
+                    Create row
                 </Button>
             </Layout.Stack>
         </Layout.Stack>
@@ -65,7 +65,7 @@
                 <Table {data} />
 
                 <PaginationWithLimit
-                    name="Documents"
+                    name="Rows"
                     limit={data.limit}
                     offset={data.offset}
                     total={data.documents.total} />
@@ -73,8 +73,8 @@
                 <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
@@ -92,11 +92,12 @@
                     </div>
                 </EmptySearch>
             {:else}
+                <!-- TODO: change the docs link later -->
                 <Empty
                     allowCreate={$canWriteDocuments}
                     single
                     href="https://appwrite.io/docs/products/databases/documents"
-                    target="document">
+                    target="row">
                     <svelte:fragment slot="actions">
                         <Button
                             external
@@ -106,11 +107,11 @@
                             size="s"
                             ariaLabel="create document">Documentation</Button>
                         <Button
-                            href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/create`}
+                            href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/create`}
                             secondary
                             disabled={!$canWriteDocuments}
                             size="s">
-                            Create document
+                            Create row
                         </Button>
                     </svelte:fragment>
                 </Empty>
@@ -118,9 +119,10 @@
         {:else}
             <Card.Base padding="none">
                 <PinkEmpty
-                    title="Create an attribute to get started."
+                    title="Create a column to get started."
                     description="Need a hand? Learn more in our documentation.">
                     <slot name="actions" slot="actions">
+                        <!-- TODO: change the docs link later -->
                         <Button
                             external
                             href="https://appwrite.io/docs/products/databases/collections#attributes"
@@ -133,7 +135,7 @@
                                 bind:showCreate={showCreateAttribute}
                                 let:toggle>
                                 <Button secondary event="create_attribute" on:click={toggle}>
-                                    Create attribute
+                                    Create column
                                 </Button>
                             </CreateAttributeDropdown>
                         {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.ts
similarity index 79%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.ts
index 22d618aacf..f2e46c779f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/+page.ts
@@ -22,15 +22,11 @@ export const load: PageLoad = async ({ params, depends, url, route }) => {
         limit,
         view,
         query,
-        documents: await sdk.forProject.databases.listDocuments(
-            params.database,
-            params.collection,
-            [
-                Query.limit(limit),
-                Query.offset(offset),
-                Query.orderDesc(''),
-                ...parsedQueries.values()
-            ]
-        )
+        documents: await sdk.forProject.databases.listDocuments(params.database, params.table, [
+            Query.limit(limit),
+            Query.offset(offset),
+            Query.orderDesc(''),
+            ...parsedQueries.values()
+        ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/activity/+page.ts
similarity index 81%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/activity/+page.ts
index 3698e62235..b3e495a977 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/activity/+page.ts
@@ -12,10 +12,9 @@ export const load: PageLoad = async ({ params, url, route }) => {
     return {
         offset,
         limit,
-        logs: await sdk.forProject.databases.listCollectionLogs(
-            params.database,
-            params.collection,
-            [Query.limit(limit), Query.offset(offset)]
-        )
+        logs: await sdk.forProject.databases.listCollectionLogs(params.database, params.table, [
+            Query.limit(limit),
+            Query.offset(offset)
+        ])
     };
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
similarity index 92%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
index 2e54f9fd68..ab70e2dd85 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/breadcrumbs.svelte
@@ -18,7 +18,7 @@
             title: $database?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}`,
             title: $collection?.name
         }
     ];
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
index 3964598097..cac1a6852c 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/+page.svelte
@@ -16,7 +16,7 @@
         Typography
     } from '@appwrite.io/pink-svelte';
     import Create from '../createAttribute.svelte';
-    import { isRelationship } from '../document-[document]/attributes/store';
+    import { isRelationship } from '../row-[row]/columns/store';
     import FailedModal from '../failedModal.svelte';
     import CreateIndex from '../indexes/createIndex.svelte';
     import { attributes, type Attributes } from '../store';
@@ -73,7 +73,7 @@
 
 <Container>
     <Layout.Stack direction="row" justifyContent="space-between">
-        <Typography.Title>Attributes</Typography.Title>
+        <Typography.Title>Columns</Typography.Title>
         {#if $canWriteCollections}
             <CreateAttributeDropdown bind:selectedOption bind:showCreate />
         {/if}
@@ -140,7 +140,7 @@
                             {#if isRelationship(attribute)}
                                 <span>
                                     with <a
-                                        href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
+                                        href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${attribute?.relatedCollection}`}
                                         ><b data-private>{attribute?.key}</b></a>
                                 </span>
                             {/if}
@@ -199,8 +199,9 @@
             {/each}
         </Table.Root>
     {:else}
-        <Empty single target="attribute">
+        <Empty single target="column">
             <svelte:fragment slot="actions">
+                <!-- TODO: change the docs link later -->
                 <Button
                     external
                     href="https://appwrite.io/docs/products/databases/collections#attributes"
@@ -210,7 +211,7 @@
                 {#if $canWriteCollections}
                     <CreateAttributeDropdown bind:selectedOption bind:showCreate let:toggle>
                         <Button secondary event="create_attribute" on:click={toggle}>
-                            Create attribute
+                            Create column
                         </Button>
                     </CreateAttributeDropdown>
                 {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/arrow-one.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/arrow-one.svg
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/arrow-two.svg
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/arrow-two.svg
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/createAttributeDropdown.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/createAttributeDropdown.svelte
index 650da61408..eddb27b69b 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/createAttributeDropdown.svelte
@@ -12,7 +12,7 @@
     <slot {toggle}>
         <Button on:click={toggle} event="create_attribute">
             <Icon icon={IconPlus} slot="start" size="s" />
-            Create attribute
+            Create column
         </Button>
     </slot>
     <ActionMenu.Root slot="tooltip">
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/deleteAttribute.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/deleteAttribute.svelte
index ab7aecd57e..e97138e4fb 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/deleteAttribute.svelte
@@ -9,7 +9,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Dependencies } from '$lib/constants';
     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';
 
     export let showDelete = false;
@@ -28,11 +28,11 @@
             showDelete = false;
             addNotification({
                 type: 'success',
-                message: `Attribute has been deleted`
+                message: `Column has been deleted`
             });
             trackEvent(Submit.AttributeDelete);
             await goto(
-                `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${page.params.collection}/attributes`
+                `${base}/project-${page.params.project}/databases/database-${databaseId}/table-${page.params.table}/columns`
             );
         } catch (e) {
             error = e.message;
@@ -47,7 +47,7 @@
 <Confirm
     bind:open={showDelete}
     onSubmit={handleDelete}
-    title="Delete attribute"
+    title="Delete column"
     bind:error
     disabled={isDeleteBtnDisabled}>
     <p>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
index dd4fbd74aa..f23f535922 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/edit.svelte
@@ -15,7 +15,7 @@
     export let selectedAttribute: Attributes;
 
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
+    const collectionId = page.params.table;
     let originalKey = '';
 
     let error: string;
@@ -37,7 +37,7 @@
             await invalidate(Dependencies.COLLECTION);
             if (!page.url.pathname.includes('attributes')) {
                 await goto(
-                    `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${page.params.project}/databases/database-${databaseId}/table-${collectionId}/columns`
                 );
             }
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/email.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/email.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/enum.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/float.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/float.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/integer.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/ip.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
similarity index 98%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
index 133074fa55..af5a4ce822 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte
@@ -155,8 +155,8 @@
 <InputSelect
     required
     id="related"
-    label="Related collection"
-    placeholder="Select a collection"
+    label="Related table"
+    placeholder="Select a table"
     bind:value={data.relatedCollection}
     on:change={updateKeyName}
     options={collections?.map((n) => ({ value: n.$id, label: `${n.name} (${n.$id})` })) ?? []} />
@@ -197,7 +197,7 @@
                 {#if data.twoWay}
                     <img src={arrowTwo} alt={'Two way relationship'} />
                 {:else}
-                    <img src={arrowOne} alt={'One way realationship'} />
+                    <img src={arrowOne} alt={'One way relationship'} />
                 {/if}
                 <span>{data.key}</span>
             </div>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/string.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/string.svelte
index 78a1c94a3d..d316046be6 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/string.svelte
@@ -104,12 +104,12 @@
     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 should act as an array, with the default value set as an empty
+    description="Indicate whether this column should act as an array, with the default value set as an empty
     array." />
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/url.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/url.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/create/+page.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/create/+page.svelte
index c4d939cf0e..19e551e9ad 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/create/+page.svelte
@@ -10,7 +10,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { addNotification } from '$lib/stores/notifications';
     import { writable } from 'svelte/store';
-    import AttributeForm from '../document-[document]/attributeForm.svelte';
+    import AttributeForm from '../row-[row]/attributeForm.svelte';
     import { Permissions } from '$lib/components/permissions';
     import type { PageData } from './$types';
     import type { Attributes } from '../store';
@@ -55,7 +55,7 @@
         try {
             const { $id } = await sdk.forProject.databases.createDocument(
                 page.params.database,
-                page.params.collection,
+                page.params.table,
                 $createDocument.id ?? ID.unique(),
                 $createDocument.document,
                 $createDocument.permissions
@@ -69,7 +69,7 @@
                 customId: !!$createDocument.id
             });
             goto(
-                `${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/document-${$id}`
+                `${base}/project-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/row-${$id}`
             );
         } catch (error) {
             addNotification({
@@ -82,8 +82,8 @@
 </script>
 
 <Wizard
-    title="Create document"
-    href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/`}
+    title="Create row"
+    href={`${base}/project-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/`}
     bind:showExitModal
     column
     columnSize="s"
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/createAttribute.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/createAttribute.svelte
index 2a3770d9aa..dcf5a2793a 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/createAttribute.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
     import { Modal } from '$lib/components';
-    import { option, attributeOptions, type Option } from './attributes/store';
+    import {
+        option,
+        attributeOptions,
+        type Option
+    } from '$routes/(console)/project-[project]/databases/database-[database]/table-[table]/columns/store';
     import { Button, InputText } from '$lib/elements/forms';
     import { goto, invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
@@ -14,7 +18,7 @@
     export let showCreate = false;
     export let selectedOption: Option['name'] = null;
     const databaseId = page.params.database;
-    $: collectionId = page.params.collection;
+    $: collectionId = page.params.table;
 
     let key: string = null;
     let data: Partial<Attributes> = {
@@ -32,14 +36,14 @@
             selectedColumns.push(key ?? data?.key);
             preferences.setCustomCollectionColumns(selectedColumns);
             await invalidate(Dependencies.COLLECTION);
-            if (!page.url.pathname.includes('attributes')) {
+            if (!page.url.pathname.includes('columns')) {
                 await goto(
-                    `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${page.params.project}/databases/database-${databaseId}/table-${collectionId}/columns`
                 );
             }
             addNotification({
                 type: 'success',
-                message: `Attribute ${key ?? data?.key} has been created`
+                message: `Column ${key ?? data?.key} has been created`
             });
             showCreate = false;
             trackEvent(Submit.AttributeCreate);
@@ -65,14 +69,14 @@
         };
     }
 
-    $: title = `Create ${attributeOptions.find((option) => option.name === selectedOption)?.sentenceName ?? ''} attribute`;
+    $: title = `Create ${attributeOptions.find((option) => option.name === selectedOption)?.sentenceName ?? ''} column`;
 </script>
 
 <Modal {error} bind:show={showCreate} onSubmit={submit} {title}>
     {#if selectedOption !== 'Relationship'}
         <InputText
             id="key"
-            label="Attribute key"
+            label="Column key"
             placeholder="Enter key"
             bind:value={key}
             autofocus
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/failedModal.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/failedModal.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/header.svelte
new file mode 100644
index 0000000000..a8dae583ae
--- /dev/null
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/header.svelte
@@ -0,0 +1,81 @@
+<script lang="ts">
+    import { base } from '$app/paths';
+    import { page } from '$app/state';
+    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 { isTabletViewport } from '$lib/stores/viewport';
+
+    let projectId = $derived(page.params.project);
+    let databaseId = $derived(page.params.database);
+    let collectionId = $derived(page.params.table);
+
+    let path = $derived(
+        `${base}/project-${projectId}/databases/database-${databaseId}/table-${collectionId}`
+    );
+
+    let tabs = $derived.by(() =>
+        [
+            {
+                href: path,
+                title: 'Rows',
+                event: 'rows',
+                hasChildren: true
+            },
+            {
+                href: `${path}/columns`,
+                title: 'Columns',
+                event: 'columns'
+            },
+            {
+                href: `${path}/indexes`,
+                title: 'Indexes',
+                event: 'indexes'
+            },
+            {
+                href: `${path}/activity`,
+                title: 'Activity',
+                event: 'activity',
+                hasChildren: true
+            },
+            {
+                href: `${path}/usage`,
+                title: 'Usage',
+                event: 'usage',
+                hasChildren: true
+            },
+            {
+                href: `${path}/settings`,
+                title: 'Settings',
+                event: 'settings',
+                disabled: !$canWriteCollections
+            }
+        ].filter((tab) => !tab.disabled)
+    );
+</script>
+
+<div style:margin-top={$isTabletViewport ? '48px' : 0}>
+    <Cover>
+        <svelte:fragment slot="header">
+            <CoverTitle href={`${base}/project-${projectId}/databases/database-${databaseId}`}>
+                {$collection?.name}
+            </CoverTitle>
+            {#key $collection?.$id}
+                <Id value={$collection?.$id}>{$collection?.$id}</Id>
+            {/key}
+        </svelte:fragment>
+
+        <Tabs>
+            {#each tabs as tab (tab.href)}
+                <Tab
+                    href={tab.href}
+                    selected={isTabSelected(tab, page.url.pathname, path, tabs)}
+                    event={tab.event}>
+                    {tab.title}
+                </Tab>
+            {/each}
+        </Tabs>
+    </Cover>
+</div>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
index c04b733653..4ae4770709 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/+page.svelte
@@ -8,8 +8,8 @@
     import CreateAttribute from '../createAttribute.svelte';
     import type { Models } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
-    import CreateAttributeDropdown from '../attributes/createAttributeDropdown.svelte';
-    import type { Option } from '../attributes/store';
+    import CreateAttributeDropdown from '../columns/createAttributeDropdown.svelte';
+    import type { Option } from '../columns/store';
     import FailedModal from '../failedModal.svelte';
     import { canWriteCollections } from '$lib/stores/roles';
     import {
@@ -77,14 +77,14 @@
                 columns={[
                     { id: 'key' },
                     { id: 'type' },
-                    { id: 'attributes' },
+                    { id: 'columns' },
                     { id: 'orders' },
                     { id: 'actions', width: 40 }
                 ]}>
                 <svelte:fragment slot="header" let:root>
                     <Table.Header.Cell column="key" {root}>Key</Table.Header.Cell>
                     <Table.Header.Cell column="type" {root}>Type</Table.Header.Cell>
-                    <Table.Header.Cell column="attributes" {root}>Attributes</Table.Header.Cell>
+                    <Table.Header.Cell column="columns" {root}>Columns</Table.Header.Cell>
                     <Table.Header.Cell column="orders" {root}>Asc/Desc</Table.Header.Cell>
                     <Table.Header.Cell column="actions" {root} />
                 </svelte:fragment>
@@ -112,7 +112,7 @@
                             </Layout.Stack>
                         </Table.Cell>
                         <Table.Cell column="type" {root}>{index.type}</Table.Cell>
-                        <Table.Cell column="attributes" {root}>
+                        <Table.Cell column="columns" {root}>
                             {index.attributes}
                         </Table.Cell>
                         <Table.Cell column="orders" {root}>
@@ -152,21 +152,21 @@
                 on:click={() => (showCreateIndex = true)} />
         {/if}
     {:else}
-        <Empty single target="attribute">
+        <Empty single target="column">
             <svelte:fragment slot="actions">
                 <Button
                     external
                     href="https://appwrite.io/docs/products/databases/collections#attributes"
                     text
                     event="empty_documentation"
-                    ariaLabel={`create {target}`}>Documentation</Button>
+                    ariaLabel={`create column`}>Documentation</Button>
                 {#if $canWriteCollections}
                     <CreateAttributeDropdown
                         bind:selectedOption={selectedAttribute}
                         bind:showCreate={showCreateAttribute}
                         let:toggle>
                         <Button secondary event="create_attribute" on:click={toggle}>
-                            Create attribute
+                            Create column
                         </Button>
                     </CreateAttributeDropdown>
                 {/if}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
index 99d742c3d0..f98acdfd4f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte
@@ -10,7 +10,7 @@
     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 { isRelationship } from '../row-[row]/columns/store';
     import { type Attributes, collection, indexes } from '../store';
     import { Icon, Layout } from '@appwrite.io/pink-svelte';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
@@ -86,7 +86,7 @@
             ]);
 
             goto(
-                `${base}/project-${page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
+                `${base}/project-${page.params.project}/databases/database-${databaseId}/table-${$collection.$id}/indexes`
             );
 
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/overviewIndex.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/indexes/select.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
index 6ca050ddfb..504dcbdef1 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte
@@ -43,7 +43,7 @@
                     {#each paginatedItems as doc}
                         <Table.Row.Link
                             {root}
-                            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
+                            href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${selectedRelationship.relatedCollection}/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-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
index ea8663adcf..b625d38850 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts
@@ -13,8 +13,8 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => {
     try {
         const document = await sdk.forProject.databases.getDocument(
             params.database,
-            params.collection,
-            params.document
+            params.table,
+            params.row
         );
 
         /**
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
index ca38a4945c..6e72563216 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts
@@ -14,8 +14,8 @@ export const load: PageLoad = async ({ params, url, route }) => {
         limit,
         logs: await sdk.forProject.databases.listDocumentLogs(
             params.database,
-            params.collection,
-            params.document,
+            params.table,
+            params.row,
             [Query.limit(limit), Query.offset(offset)]
         )
     };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attribute.svelte
similarity index 79%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attribute.svelte
index 0c464a49a4..8667a2b68f 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attribute.svelte
@@ -1,12 +1,12 @@
 <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';
+    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;
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attributeForm.svelte
similarity index 94%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attributeForm.svelte
index aa49a04413..8c26cc2567 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attributeForm.svelte
@@ -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-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attributeItem.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/attributeItem.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
index 0ba31c3432..5b0831fd17 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/breadcrumbs.svelte
@@ -15,11 +15,11 @@
             title: $database?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}`,
             title: $collection?.name
         },
         {
-            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/table-${$collection?.$id}/row-${$doc?.$id}`,
             title: $doc?.$id
         }
     ];
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/boolean.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/boolean.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/datetime.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/datetime.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/email.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/email.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/enum.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/enum.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/integer.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/integer.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/string.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/string.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/url.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/columns/url.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/data/+page.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/data/+page.svelte
index 1e1c10da61..164ae27688 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/data/+page.svelte
@@ -14,12 +14,12 @@
     import { Container } from '$lib/layout';
     import AttributeItem from '../attributeItem.svelte';
     import { symmetricDifference } from '$lib/helpers/array';
-    import { isRelationship, isRelationshipToMany } from '../attributes/store';
+    import { isRelationship, isRelationshipToMany } from '../columns/store';
     import { deepClone } from '$lib/helpers/object';
 
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
+    const collectionId = page.params.table;
+    const documentId = page.params.row;
     const editing = true;
 
     function initWork() {
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
index 9c5e893023..cfb914fb50 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte
@@ -9,7 +9,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Alert, Selector, Table } from '@appwrite.io/pink-svelte';
     import { attributes, collection } from '../store';
-    import { isRelationship } from './attributes/store';
+    import { isRelationship } from './columns/store';
     import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
@@ -20,8 +20,8 @@
         try {
             await sdk.forProject.databases.deleteDocument(
                 databaseId,
-                page.params.collection,
-                page.params.document
+                page.params.table,
+                page.params.row
             );
             showDelete = false;
             addNotification({
@@ -30,7 +30,7 @@
             });
             trackEvent(Submit.DocumentDelete);
             await goto(
-                `${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}`
+                `${base}/project-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/document.svelte
similarity index 96%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/document.svelte
index e086813d5f..14a82ba3ca 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/document.svelte
@@ -17,8 +17,8 @@
     let disableUpdate = true;
     let currentDoc: string;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
+    const collectionId = page.params.table;
+    const documentId = page.params.row;
 
     const work = writable(
         Object.keys($doc)
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
similarity index 83%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
index 7879409eb0..ceb0aedea4 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/header.svelte
@@ -8,9 +8,9 @@
 
     const projectId = page.params.project;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
-    const documentId = page.params.document;
-    const path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
+    const collectionId = page.params.table;
+    const documentId = page.params.row;
+    const path = `${base}/project-${projectId}/databases/database-${databaseId}/table-${collectionId}/row-${documentId}`;
     const tabs = [
         {
             href: path,
@@ -35,10 +35,10 @@
 <Cover>
     <svelte:fragment slot="header">
         <CoverTitle
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${collectionId}`}>
             {$doc?.$id}
         </CoverTitle>
-        <Id value={$doc?.$id} event="document">Document ID</Id>
+        <Id value={$doc?.$id} event="row">Row ID</Id>
     </svelte:fragment>
 
     <Tabs>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/row-[row]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/+page.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
similarity index 84%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
index 493e376679..90a0d039c4 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/dangerZone.svelte
@@ -10,9 +10,8 @@
 </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">
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/deleteCollection.svelte
similarity index 93%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/deleteCollection.svelte
index 59bd9f240b..55b13bb675 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/deleteCollection.svelte
@@ -35,7 +35,7 @@
     }
 </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>?
     </Typography.Text>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
similarity index 91%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
index a60fc24893..de3075c08c 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte
@@ -13,7 +13,7 @@
     import { Icon, Layout } from '@appwrite.io/pink-svelte';
     import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte';
 
-    const collectionId = page.params.collection;
+    const collectionId = page.params.table;
     let names: string[] = [...(preferences.getDisplayNames()?.[collectionId] ?? [])];
 
     async function updateDisplayName() {
@@ -57,13 +57,13 @@
 <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} />
@@ -75,7 +75,7 @@
                         <Layout.Stack direction="row" gap="xxs">
                             <InputSelect
                                 id={name}
-                                placeholder="Select attribute"
+                                placeholder="Select column"
                                 bind:value={names[i]}
                                 disabled={!!names[i] && names.length > i + 1}
                                 {options} />
@@ -100,7 +100,7 @@
                             names = names;
                         }}>
                         <Icon icon={IconPlus} slot="start" size="s" />
-                        Add attribute
+                        Add column
                     </Button>
                 </div>
             </Layout.Stack>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
index 16d39d4905..9045b1e389 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte
@@ -56,7 +56,7 @@
 
 <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">
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
similarity index 76%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
index f155b6f40d..16962f25c8 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte
@@ -45,21 +45,18 @@
 </script>
 
 <CardGrid>
-    <svelte:fragment slot="title">Document security</svelte:fragment>
+    <svelte:fragment slot="title">Row security</svelte:fragment>
     <svelte:fragment slot="aside">
-        <InputSwitch
-            bind:value={collectionDocumentSecurity}
-            id="security"
-            label="Document security" />
+        <InputSwitch bind:value={collectionDocumentSecurity} id="security" label="Row 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>.
+            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 document security is disabled, users can access documents <b
-                >only if they have collection permissions</b
-            >. Document permissions will be ignored.
+            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">
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/store.ts
similarity index 100%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/store.ts
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/subNavigation.svelte
similarity index 95%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/subNavigation.svelte
index e391fd5b63..155e8733c2 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/subNavigation.svelte
@@ -17,14 +17,14 @@
     let data = $derived(page.data) as PageData;
     let project = $derived(page.params.project);
     let databaseId = $derived(page.params.database);
-    let collectionId = $derived(page.params.collection);
+    let collectionId = $derived(page.params.table);
 
     const sortedCollections = $derived.by(() =>
         data?.allCollections?.collections?.slice().sort((a, b) => a.name.localeCompare(b.name))
     );
 
     const selectedCollection = $derived.by(() =>
-        sortedCollections()?.find((collection) => collection.$id === collectionId)
+        sortedCollections?.find((collection) => collection.$id === collectionId)
     );
 
     let openBottomSheet = $state(false);
@@ -44,13 +44,13 @@
                 href={`${base}/project-${project}/databases/database-${databaseId}`}
                 class="database-name u-flex u-cross-center body-text-2 u-gap-8 is-not-mobile is-selected">
                 <Icon icon={IconDatabase} size="s" color="--fgcolor-neutral-weak" />
-                {data.database.name}
+                {data.database?.name}
             </a>
             <div class="collection-content">
                 {#if data?.allCollections?.total}
                     <ul class="drop-list u-margin-inline-start-8 u-margin-block-start-8">
                         {#each sortedCollections as collection}
-                            {@const href = `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
+                            {@const href = `${base}/project-${project}/databases/database-${databaseId}/table-${collection.$id}`}
                             {@const isSelected = collectionId === collection.$id}
                             <li class:is-selected={isSelected}>
                                 <a
@@ -77,7 +77,7 @@
                         $showSubNavigation = false;
                     }}
                     leadingIcon={IconPlus}>
-                    Create collection
+                    Create table
                 </ActionMenu.Item.Button>
             </ActionMenu.Root>
         </section>
@@ -94,7 +94,7 @@
                 <button
                     type="button"
                     class="trigger"
-                    aria-label="Open collections"
+                    aria-label="Open tables"
                     onclick={() => {
                         openBottomSheet = !openBottomSheet;
                     }}>
@@ -114,7 +114,7 @@
                     return {
                         name: collection.name,
                         leadingIcon: IconTable,
-                        href: `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`
+                        href: `${base}/project-${project}/databases/database-${databaseId}/table-${collection.$id}`
                     };
                 })
             },
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/table.svelte
similarity index 97%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/table.svelte
index 391baefcfd..559829d0b4 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/table.svelte
@@ -12,7 +12,7 @@
     import type { Models } from '@appwrite.io/console';
     import { afterUpdate, onMount } from 'svelte';
     import type { PageData } from './$types';
-    import { isRelationship, isRelationshipToMany } from './document-[document]/attributes/store';
+    import { isRelationship, isRelationshipToMany } from './row-[row]/columns/store';
     import RelationshipsModal from './relationshipsModal.svelte';
     import { attributes, collection, columns } from './store';
     import type { ColumnType } from '$lib/helpers/types';
@@ -30,7 +30,7 @@
 
     const projectId = page.params.project;
     const databaseId = page.params.database;
-    const collectionId = page.params.collection;
+    const collectionId = page.params.table;
     let showRelationships = false;
     let selectedRelationship: Models.AttributeRelationship = null;
     let relationshipData: Partial<Models.Document>[];
@@ -93,7 +93,7 @@
         };
     }
 
-    $: selected = preferences.getCustomCollectionColumns(page.params.collection);
+    $: selected = preferences.getCustomCollectionColumns(page.params.table);
 
     $: {
         columns.set(
@@ -170,7 +170,7 @@
         <Table.Row.Link
             {root}
             id={document.$id}
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${$collection.$id}/row-${document.$id}`}>
             <Table.Cell column="$id" {root}>
                 {#key document.$id}
                     <Id value={document.$id}>
@@ -193,7 +193,7 @@
                                         e.preventDefault();
                                         e.stopPropagation();
                                         goto(
-                                            `${base}/project-${projectId}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}`
+                                            `${base}/project-${projectId}/databases/database-${databaseId}/table-${attr.relatedCollection}/row-${related.$id}`
                                         );
                                     }}>
                                     {#each args as arg, i}
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
similarity index 77%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
index 40e6af73ec..d7b58d32b3 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.svelte
@@ -12,11 +12,11 @@
 
 <Container>
     <Usage
-        path={`${base}/project-${page.params.project}/databases/database-${page.params.database}/collection-${page.params.collection}/usage`}
+        path={`${base}/project-${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>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
similarity index 92%
rename from src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
index 4d876b8846..a03c6039fa 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts
@@ -7,5 +7,5 @@ export const load: PageLoad = async ({ params }) => {
     const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
         ? params.period
         : DatabaseUsageRange.ThirtyDays;
-    return sdk.forProject.databases.getCollectionUsage(params.database, params.collection, period);
+    return sdk.forProject.databases.getCollectionUsage(params.database, params.table, period);
 };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
index a7f0bbdc2e..52a718706c 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
@@ -34,7 +34,7 @@
             trackEvent(Submit.CollectionDelete);
             addNotification({
                 type: 'success',
-                message: `${selectedRows.length} collection${selectedRows.length > 1 ? 's' : ''} deleted`
+                message: `${selectedRows.length} table${selectedRows.length > 1 ? 's' : ''} deleted`
             });
             invalidate(Dependencies.COLLECTIONS);
         } catch (error) {
@@ -60,7 +60,7 @@
         <Table.Row.Link
             {root}
             id={collection.$id}
-            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/table-${collection.$id}`}>
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === '$id'}
@@ -83,7 +83,7 @@
         <svelte:fragment slot="start">
             <Badge content={selectedRows.length.toString()} />
             <span>
-                {selectedRows.length > 1 ? 'collections' : 'collection'}
+                {selectedRows.length > 1 ? 'tables' : 'table'}
                 selected
             </span>
         </svelte:fragment>
@@ -94,13 +94,9 @@
     </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'}?
+        {selectedRows.length > 1 ? 'tables' : 'table'}?
     </Typography.Text>
 </Confirm>