diff --git a/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte
index 365782e6b4..cf67fd335b 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/(providers)/mainOAuth.svelte
@@ -5,7 +5,7 @@
     import { onMount } from 'svelte';
     import { updateOAuth } from '../updateOAuth';
     import type { Models } from '@appwrite.io/console';
-    import { oAuthProviders, type Provider } from '$lib/stores/oauth-providers';
+    import { oAuthProviders, Provider } from '$lib/stores/oauth-providers';
     import { Link, Alert } from '@appwrite.io/pink-svelte';
     import { getApiEndpoint } from '$lib/stores/sdk';
 
@@ -52,7 +52,7 @@
     <InputSwitch id="state" bind:value={enabled} label={enabled ? 'Enabled' : 'Disabled'} />
     <InputText
         id="appID"
-        label="App ID"
+        label={provider.key === 'github' || provider.key === 'githubenterprise' ? 'Client ID' : 'App ID'}
         autofocus={true}
         placeholder="Enter ID"
         bind:value={appId}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
index dadfff8f73..b6f970c3ab 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte
@@ -58,7 +58,8 @@
     {onDelete}>
     {#snippet header(root)}
         {#each $tableViewColumns as { id, title } (id)}
-            <Table.Header.Cell column={id} {root}>{title}</Table.Header.Cell>
+            {@const safeId = id === 'actions' ? '__actions' : id}
+            <Table.Header.Cell column={safeId} {root}>{title}</Table.Header.Cell>
         {/each}
     {/snippet}
 
@@ -69,7 +70,8 @@
                 id={entity.$id}
                 href={buildEntityRoute(page, entitySingular, entity.$id)}>
                 {#each $tableViewColumns as column}
-                    <Table.Cell column={column.id} {root}>
+                    {@const safeId = column.id === 'actions' ? '__actions' : column.id}
+                    <Table.Cell column={safeId} {root}>
                         {#if column.id === '$id'}
                             {#key $tableViewColumns}
                                 <Id value={entity.$id}>{entity.$id}</Id>