diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/_createAttribute.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/_createAttribute.svelte
index 99ef0dd92..f1279afdd 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/_createAttribute.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/_createAttribute.svelte
@@ -7,7 +7,7 @@
 
     export let showCreate = false;
 
-    let id: string = null;
+    let key: string = null;
     let selectedOption = '';
     let submitted = false;
 
@@ -26,10 +26,10 @@
         <svelte:fragment slot="header">Create Attribute</svelte:fragment>
         <FormList>
             <InputText
-                id="ID"
-                label="Attribute ID"
-                placeholder="Enter ID"
-                bind:value={id}
+                id="key"
+                label="Attribute Key"
+                placeholder="Enter Key"
+                bind:value={key}
                 autofocus
                 required />
 
@@ -50,7 +50,7 @@
             {#if selectedOption}
                 <svelte:component
                     this={$option.component}
-                    {id}
+                    {key}
                     bind:submitted
                     on:created={created}
                     on:close={() => ($option = null)} />
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes.svelte
index f08394dea..2e9bac995 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes.svelte
@@ -46,7 +46,7 @@
     {#if $collection?.attributes.length}
         <Table>
             <TableHeader>
-                <TableCellHead>ID</TableCellHead>
+                <TableCellHead>Key</TableCellHead>
                 <TableCellHead>Type</TableCellHead>
                 <TableCellHead>Default Value</TableCellHead>
                 <TableCellHead width={30} />
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_boolean.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_boolean.svelte
index b11b22d7c..13124ee14 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_boolean.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_boolean.svelte
@@ -7,7 +7,7 @@
     import type { Models } from '@aw-labs/appwrite-console';
 
     export let submitted = false;
-    export let id: string;
+    export let key: string;
     export let overview = false;
     export let selectedAttribute: Models.AttributeBoolean;
 
@@ -22,7 +22,7 @@
         try {
             const attribute = await sdkForProject.databases.createBooleanAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 xdefault ? xdefault : undefined,
                 array
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_email.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_email.svelte
index 5a0b2db26..216798a7c 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_email.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_email.svelte
@@ -6,7 +6,7 @@
     import { collection } from '../store';
     import type { Models } from '@aw-labs/appwrite-console';
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeEmail;
@@ -21,7 +21,7 @@
         try {
             const attribute = await sdkForProject.databases.createEmailAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 xdefault ? xdefault : undefined,
                 array
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_enum.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_enum.svelte
index d68f88e45..9f589ef8a 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_enum.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_enum.svelte
@@ -6,7 +6,7 @@
     import { collection } from '../store';
     import type { Models } from '@aw-labs/appwrite-console';
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeEnum;
@@ -21,7 +21,7 @@
         try {
             const attribute = await sdkForProject.databases.createEnumAttribute(
                 $collection.$id,
-                id,
+                key,
                 elements,
                 required,
                 xdefault ? xdefault : undefined,
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_float.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_float.svelte
index 35297b9f3..0f7e31b30 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_float.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_float.svelte
@@ -8,7 +8,7 @@
 
     const dispatch = createEventDispatcher();
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeFloat;
@@ -23,7 +23,7 @@
         try {
             const attribute = await sdkForProject.databases.createFloatAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 min,
                 max,
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_integer.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_integer.svelte
index 5a0fde47d..cf3b310d7 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_integer.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_integer.svelte
@@ -8,7 +8,7 @@
 
     const dispatch = createEventDispatcher();
 
-    export let id: string = null;
+    export let key: string = null;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeInteger;
@@ -23,7 +23,7 @@
         try {
             const attribute = await sdkForProject.databases.createIntegerAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 min,
                 max,
@@ -44,7 +44,6 @@
     }
 
     $: if (overview) {
-        //TODO: fix xdefault
         ({ required, array, min, max } = selectedAttribute);
         xdefault = selectedAttribute.default;
     }
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_ip.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_ip.svelte
index f30fde316..4f31e6e9a 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_ip.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_ip.svelte
@@ -6,7 +6,7 @@
     import { collection } from '../store';
     import type { Models } from '@aw-labs/appwrite-console';
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeIp;
@@ -20,7 +20,7 @@
         try {
             const attribute = await sdkForProject.databases.createIpAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 xdefault ? xdefault : undefined,
                 array
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_string.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_string.svelte
index 186013dd0..28a81fd3a 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_string.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_string.svelte
@@ -6,7 +6,7 @@
     import { collection } from '../store';
     import type { Models } from '@aw-labs/appwrite-console';
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeString;
@@ -21,7 +21,7 @@
         try {
             const attribute = await sdkForProject.databases.createStringAttribute(
                 $collection.$id,
-                id,
+                key,
                 size,
                 required,
                 xdefault ? xdefault : undefined,
diff --git a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_url.svelte b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_url.svelte
index 6a724f3e8..f172de05d 100644
--- a/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_url.svelte
+++ b/src/routes/console/[project]/databases/database/[database]/collection/[collection]/attributes/_url.svelte
@@ -6,7 +6,7 @@
     import { collection } from '../store';
     import type { Models } from '@aw-labs/appwrite-console';
 
-    export let id: string;
+    export let key: string;
     export let submitted = false;
     export let overview = false;
     export let selectedAttribute: Models.AttributeUrl;
@@ -20,7 +20,7 @@
         try {
             const attribute = await sdkForProject.databases.createUrlAttribute(
                 $collection.$id,
-                id,
+                key,
                 required,
                 xdefault ? xdefault : undefined,
                 array