diff --git a/src/apps/auth/routes/_index.tsx b/src/apps/auth/routes/_index.tsx
index 8bf612af5..6e9f186b6 100644
--- a/src/apps/auth/routes/_index.tsx
+++ b/src/apps/auth/routes/_index.tsx
@@ -15,7 +15,7 @@ const restActions = async (ctx: IExtRemixCtx) => {
       const { data, errors } = await GQLServerHandler(
         ctx.request
       ).setRemoteAuthHeader({
-        loginId: cookie.get('cliLogin'),
+        loginId: cookie.get('cliLogin') || '',
         authHeader: ctx?.request?.headers?.get('cookie'),
       });
 
diff --git a/src/apps/console/components/commons.tsx b/src/apps/console/components/commons.tsx
index f4e32ac69..70e5ecdcc 100644
--- a/src/apps/console/components/commons.tsx
+++ b/src/apps/console/components/commons.tsx
@@ -5,8 +5,8 @@ import { WorkspacesLogo } from '~/components/branding/workspace-logo';
 import useClipboard from '~/root/lib/client/hooks/use-clipboard';
 import { generateKey, titleCase } from '~/components/utils';
 import {
-  Kloudlite__Io___Pkg___Types__SyncStatusState as SyncState,
-  Kloudlite__Io___Pkg___Types__SyncStatusAction as SyncAction,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusState as SyncState,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusAction as SyncAction,
 } from '~/root/src/generated/gql/server';
 import Tooltip from '~/components/atoms/tooltip';
 import { Link } from '@remix-run/react';
diff --git a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx b/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
index 2b109580d..487e47def 100644
--- a/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
+++ b/src/apps/console/routes/_.$account.settings.user-management/handle-user.tsx
@@ -8,7 +8,7 @@ import { useConsoleApi } from '~/console/server/gql/api-provider';
 import useForm from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 import { handleError } from '~/root/lib/utils/common';
-import { Kloudlite__Io___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
+import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
 import { parseName } from '~/console/server/r-utils/common';
 import { IAccountContext } from '../_.$account';
 
diff --git a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx b/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
index 3cf0e7290..cfa28d76d 100644
--- a/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
+++ b/src/apps/console/routes/_a.onboarding.$a.invite-team-members.tsx
@@ -10,7 +10,7 @@ import { titleCase, useMapper } from '~/components/utils';
 import useForm from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';
 import { handleError } from '~/root/lib/utils/common';
-import { Kloudlite__Io___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
+import { Github__Com___Kloudlite___Api___Apps___Iam___Types__Role as Role } from '~/root/src/generated/gql/server';
 import { ListBody, ListItem } from '../components/console-list-components';
 import DynamicPagination from '../components/dynamic-pagination';
 import List from '../components/list';
diff --git a/src/apps/console/server/r-utils/common.ts b/src/apps/console/server/r-utils/common.ts
index 77f537cc1..23628d569 100644
--- a/src/apps/console/server/r-utils/common.ts
+++ b/src/apps/console/server/r-utils/common.ts
@@ -6,8 +6,8 @@ import {
   Github__Com___Kloudlite___Operator___Apis___Common____Types__CloudProvider as CloudProvider,
   Github__Com___Kloudlite___Operator___Apis___Clusters___V1__ClusterSpecAvailabilityMode as AvailabilityMode,
   ProjectId,
-  Kloudlite__Io___Pkg___Types__SyncStatusAction as SyncStatusAction,
-  Kloudlite__Io___Pkg___Types__SyncStatusState as SyncStatusState,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusAction as SyncStatusAction,
+  Github__Com___Kloudlite___Api___Pkg___Types__SyncStatusState as SyncStatusState,
   WorkspaceOrEnvId,
 } from '~/root/src/generated/gql/server';