diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/aside.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/aside.svelte
index c55d1d7b5..be42f9f44 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/aside.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/aside.svelte
@@ -21,7 +21,7 @@
         <Layout.Stack gap="l">
             {#if selectedRuntime?.name && !loading}
                 <Layout.Stack gap="xxxs">
-                    <Typography.Caption variant="400">Runtime</Typography.Caption>
+                    <Typography.Caption variant="400">FunctionRuntime</Typography.Caption>
                     <Layout.Stack gap="xxs" alignItems="center" direction="row">
                         {#if selectedRuntime?.key}
                             <SvgIcon iconSize="small" size={16} name={selectedRuntime.key} />
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte
index ac39b30fa..35f1a9295 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/(components)/details.svelte
@@ -59,7 +59,7 @@
             {:else}
                 <InputSelect
                     id="runtime"
-                    label="Runtime"
+                    label="FunctionRuntime"
                     placeholder="Select runtime"
                     bind:value={runtime}
                     required
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
index 1d593b69d..42c2c3269 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/deploy/+page.svelte
@@ -214,7 +214,7 @@
                     </Layout.Stack>
                     <Input.Select
                         id="runtime"
-                        label="Runtime"
+                        label="FunctionRuntime"
                         placeholder="Select runtime"
                         bind:value={runtime}
                         required
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
index 8b470ae31..819cc8637 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
@@ -161,7 +161,7 @@
                         {@render textGroup('Total size', `${totalSize.value} ${totalSize.unit}`)}
 
                         <Layout.Stack gap="xxs" inline>
-                            {@render titleSnippet('Runtime')}
+                            {@render titleSnippet('FunctionRuntime')}
                             <Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
                                 <Layout.Stack direction="row" gap="xxs" alignItems="center">
                                     <SvgIcon
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
index deb43acdc..c04d047ab 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/executeFunction.svelte
@@ -22,7 +22,7 @@
     <svelte:fragment slot="aside">
         <Layout.Stack gap="xxxl" direction="row" wrap="wrap">
             <Layout.Stack gap="xxxs" inline>
-                <Typography.Caption variant="400">Runtime</Typography.Caption>
+                <Typography.Caption variant="400">FunctionRuntime</Typography.Caption>
                 <Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
                     <Layout.Stack direction="row" gap="xxs" alignItems="center">
                         <SvgIcon size={16} iconSize="small" name={$func.runtime.split('-')[0]} />
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
index 5442bc065..1005bd39c 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateResourceLimits.svelte
@@ -111,7 +111,7 @@
                 </Tooltip>
             </InputSelect>
             <InputSelect
-                label="Runtime specification"
+                label="FunctionRuntime specification"
                 id="runtime-specification"
                 required
                 disabled={options.length < 1}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
index 69b87da06..b47a4715b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateRuntime.svelte
@@ -51,7 +51,7 @@
             });
             await invalidate(Dependencies.FUNCTION);
             addNotification({
-                message: 'Runtime settings have been updated',
+                message: 'FunctionRuntime settings have been updated',
                 type: 'success'
             });
             trackEvent(Submit.FunctionUpdateRuntime, { runtime });
@@ -69,7 +69,7 @@
 
 <Form onSubmit={updateRuntime}>
     <CardGrid>
-        <svelte:fragment slot="title">Runtime</svelte:fragment>
+        <svelte:fragment slot="title">FunctionRuntime</svelte:fragment>
         <Typography.Text>
             Select the runtime for executing your function and define its entrypoint. Version
             changes apply on redeploy and can be updated here. <Link external href="#"
@@ -79,7 +79,7 @@
         <svelte:fragment slot="aside">
             <Layout.Stack gap="l">
                 <InputSelect
-                    label="Runtime"
+                    label="FunctionRuntime"
                     id="runtime"
                     placeholder="Select runtime"
                     bind:value={runtime}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
index 99ab5d4f3..0042c4bd2 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/settings/updateScopes.svelte
@@ -10,11 +10,7 @@
     import { onMount } from 'svelte';
     import { func } from '../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
-    import {
-        FunctionRuntime,
-        type ProjectKeyScopes,
-        type ProjectKeyScopes as FunctionScopes
-    } from '@appwrite.io/console';
+    import { FunctionRuntime, type ProjectKeyScopes } from '@appwrite.io/console';
     import Scopes from '$routes/(console)/project-[region]-[project]/overview/api-keys/scopes.svelte';
     import { symmetricDifference } from '$lib/helpers/array';
     import { Link } from '$lib/elements';
@@ -43,7 +39,7 @@
                 logging: $func.logging ?? undefined,
                 entrypoint: $func.entrypoint || undefined,
                 commands: $func.commands || undefined,
-                scopes: (functionScopes as unknown as FunctionScopes[]) || undefined,
+                scopes: functionScopes || undefined,
                 installationId: $func.installationId || undefined,
                 providerRepositoryId: $func.providerRepositoryId || undefined,
                 providerBranch: $func.providerBranch || undefined,
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
index 2ddb9f30d..9168a99f6 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/+page.svelte
@@ -105,7 +105,7 @@
                         {/each}
                     </Layout.Stack>
                 </Accordion>
-                <Accordion title="Runtime">
+                <Accordion title="FunctionRuntime">
                     <Layout.Stack>
                         {#each [...data.runtimes] as runtime}
                             <!-- {@const icon = getIconFromRuntime(runtime)} -->
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte
index 7bf4186e4..d7a9ff451 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte
@@ -52,7 +52,7 @@
             {#if framework?.name}
                 {@const frameworkIcon = getFrameworkIcon(framework.key)}
                 <Layout.Stack gap="xxxs">
-                    <Typography.Caption variant="400">Framework</Typography.Caption>
+                    <Typography.Caption variant="400">SiteFramework</Typography.Caption>
                     <Layout.Stack gap="xxs" alignItems="center" direction="row">
                         {#if frameworkIcon}
                             <SvgIcon iconSize="small" size={16} name={frameworkIcon} />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte
index f6d8129d6..dcf9de4e7 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/configuration.svelte
@@ -38,7 +38,7 @@
     <Layout.Stack gap="l">
         <InputSelect
             id="framework"
-            label="Framework"
+            label="SiteFramework"
             placeholder="Select framework"
             bind:value={frameworkId}
             options={frameworks.map((framework) => ({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
index e397e4e55..6be2c73f0 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploy/+page.svelte
@@ -56,7 +56,7 @@
     // Track if we have custom commands from URL
     let hasCustomCommands = $state(false);
 
-    // Framework options - dynamically generate from enum
+    // SiteFramework options - dynamically generate from enum
     const frameworkOptions = $derived(
         Object.values(SiteFramework).map((fw) => ({
             key: fw,
@@ -104,7 +104,7 @@
     onMount(() => {
         const preset = page.url.searchParams.get('preset') || 'nextjs';
 
-        // Map preset string to Framework enum
+        // Map preset string to SiteFramework enum
         framework = (Object.values(SiteFramework) as string[]).includes(preset.toLowerCase())
             ? (preset.toLowerCase() as SiteFramework)
             : SiteFramework.Nextjs;
@@ -262,7 +262,7 @@
                     </Layout.Stack>
                     <Input.Select
                         id="framework"
-                        label="Framework"
+                        label="SiteFramework"
                         placeholder="Select framework"
                         bind:value={framework}
                         options={frameworkSelectOptions} />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte
index 52c2ed3ba..45df06ee9 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/details.svelte
@@ -43,7 +43,7 @@
         {#if showFramework}
             <InputSelect
                 id="framework"
-                label="Framework"
+                label="SiteFramework"
                 placeholder="Select framework"
                 bind:value={framework.name}
                 {options} />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
index 7965e6c86..f9ffcebe1 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
@@ -111,7 +111,7 @@
                         {/each}
                     </Layout.Stack>
                 </Accordion>
-                <Accordion title="Framework" open>
+                <Accordion title="SiteFramework" open>
                     <Layout.Stack>
                         {#each [...data.frameworks] as framework}
                             <Layout.Stack direction="row" gap="s">
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
index 15112469e..083180177 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/updateBuildSettings.svelte
@@ -228,7 +228,7 @@
                 <InputSelect
                     required
                     id="framework"
-                    label="Framework"
+                    label="SiteFramework"
                     placeholder="Select framework"
                     bind:value={frameworkKey}
                     options={frameworks.map((framework) => ({