diff --git a/src/lib/components/emptyBucket.svelte b/src/lib/components/emptyGridItem.svelte
similarity index 100%
rename from src/lib/components/emptyBucket.svelte
rename to src/lib/components/emptyGridItem.svelte
diff --git a/src/lib/components/bucket.svelte b/src/lib/components/gridItem1.svelte
similarity index 100%
rename from src/lib/components/bucket.svelte
rename to src/lib/components/gridItem1.svelte
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index 250b75ec7..55469257d 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -23,5 +23,5 @@ export { default as AvatarGroup } from './avatarGroup.svelte';
 export { default as Alert } from './alert.svelte';
 export { default as Box } from './box.svelte';
 export { default as Search } from './search.svelte';
-export { default as Bucket } from './bucket.svelte';
-export { default as EmptyBucket } from './emptyBucket.svelte';
+export { default as GridItem1 } from './gridItem1.svelte';
+export { default as EmptyGridItem } from './emptyGridItem.svelte';
diff --git a/src/routes/console/organization-[organization]/index.svelte b/src/routes/console/organization-[organization]/index.svelte
index dca00d712..8e8921b34 100644
--- a/src/routes/console/organization-[organization]/index.svelte
+++ b/src/routes/console/organization-[organization]/index.svelte
@@ -2,7 +2,7 @@
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { Pill } from '$lib/elements';
-    import { Bucket, EmptyBucket, Empty, Pagination } from '$lib/components';
+    import { GridItem1, EmptyGridItem, Empty, Pagination } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import type { Models } from '@aw-labs/appwrite-console';
@@ -79,7 +79,7 @@
             };`}>
             {#each projects as project, index}
                 {#if index >= offset && index < limit + offset}
-                    <Bucket href={`${base}/console/project-${project.$id}`}>
+                    <GridItem1 href={`${base}/console/project-${project.$id}`}>
                         <svelte:fragment slot="eyebrow"
                             >{project?.platforms?.length ? project?.platforms?.length : 'No'} apps</svelte:fragment>
                         <svelte:fragment slot="title">
@@ -102,11 +102,11 @@
                                 +{project.platforms.length - 3}
                             </Pill>
                         {/if}
-                    </Bucket>
+                    </GridItem1>
                 {/if}
             {/each}
             {#if projects.length < limit + offset && (projects.length % 2 !== 0 || projects.length % 4 === 0)}
-                <EmptyBucket on:click={() => (showCreate = true)}>
+                <EmptyGridItem on:click={() => (showCreate = true)}>
                     <div class="common-section">
                         <Button secondary round>
                             <i class="icon-plus" />
@@ -115,7 +115,7 @@
                     <div class="common-section">
                         <p>Create a new project</p>
                     </div>
-                </EmptyBucket>
+                </EmptyGridItem>
             {/if}
         </ul>
 
diff --git a/src/routes/console/project-[project]/storage/index.svelte b/src/routes/console/project-[project]/storage/index.svelte
index 9d0fbfad0..dff6be811 100644
--- a/src/routes/console/project-[project]/storage/index.svelte
+++ b/src/routes/console/project-[project]/storage/index.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { goto } from '$app/navigation';
     import { Button } from '$lib/elements/forms';
-    import { Empty, Pagination, Copy, Bucket, EmptyBucket } from '$lib/components';
+    import { Empty, Pagination, Copy, GridItem1, EmptyGridItem } from '$lib/components';
     import { Pill } from '$lib/elements';
     import type { Models } from '@aw-labs/appwrite-console';
     import Create from './_create.svelte';
@@ -42,7 +42,7 @@
                 $bucketList.total > 3 ? '22rem' : '25rem'
             };`}>
             {#each $bucketList.buckets as bucket}
-                <Bucket href={`${base}/console/project-${project}/storage/bucket/${bucket.$id}`}>
+                <GridItem1 href={`${base}/console/project-${project}/storage/bucket/${bucket.$id}`}>
                     <svelte:fragment slot="eyebrow">XX Files</svelte:fragment>
                     <svelte:fragment slot="title">{bucket.name}</svelte:fragment>
                     <svelte:fragment slot="status">
@@ -79,10 +79,10 @@
                                 }} />
                         </li>
                     </svelte:fragment>
-                </Bucket>
+                </GridItem1>
             {/each}
             {#if $bucketList.total % 2 !== 0}
-                <EmptyBucket on:click={() => (showCreate = true)}>
+                <EmptyGridItem on:click={() => (showCreate = true)}>
                     <div class="common-section">
                         <Button secondary round>
                             <i class="icon-plus" />
@@ -91,7 +91,7 @@
                     <div class="common-section">
                         <p>Add a new bucket</p>
                     </div>
-                </EmptyBucket>
+                </EmptyGridItem>
             {/if}
         </ul>