diff --git a/idp/src/infra/error.ts b/idp/src/infra/error.ts
index 23c43aadf..a68744acf 100644
--- a/idp/src/infra/error.ts
+++ b/idp/src/infra/error.ts
@@ -53,8 +53,8 @@ const userMessages: { [key: string]: string } = {
   [ErrorCode.InvalidPassword]: 'Invalid password.',
   [ErrorCode.InvalidUsernameOrPassword]: 'Invalid username or password.',
   [ErrorCode.UserSuspended]: 'User suspended.',
-  [ErrorCode.MissingPermission]: 'You are not an admin',
-  [ErrorCode.OrphanError]: 'You cannot suspend last admin'
+  [ErrorCode.MissingPermission]: 'You are not an console',
+  [ErrorCode.OrphanError]: 'You cannot suspend last console'
 }
 
 export type ErrorData = {
diff --git a/ui/.env b/ui/.env
index 955fb43cc..e4717aa57 100644
--- a/ui/.env
+++ b/ui/.env
@@ -1,4 +1,4 @@
 PORT=3000
 API_URL="http://127.0.0.1:8080"
 IDP_URL="http://127.0.0.1:8081"
-ADMIN_URL="http://127.0.0.1:8086"
+CONSOLE_URL="http://127.0.0.1:8086"
diff --git a/ui/config/config.go b/ui/config/config.go
index 6c600652e..39bd2f6a7 100644
--- a/ui/config/config.go
+++ b/ui/config/config.go
@@ -34,5 +34,5 @@ func GetConfig() Config {
 func readURLs(config *Config) {
 	config.APIURL = os.Getenv("API_URL")
 	config.IDPURL = os.Getenv("IDP_URL")
-	config.AdminURL = os.Getenv("ADMIN_URL")
+	config.ConsoleUrl = os.Getenv("CONSOLE_URL")
 }
diff --git a/ui/config/types.go b/ui/config/types.go
index a9c737741..512d11d4a 100644
--- a/ui/config/types.go
+++ b/ui/config/types.go
@@ -14,5 +14,5 @@ type Config struct {
 	Port   int
 	APIURL string
 	IDPURL string
-	AdminURL string
+	ConsoleUrl string
 }
diff --git a/ui/main.go b/ui/main.go
index 8caccf326..70cc6ce50 100644
--- a/ui/main.go
+++ b/ui/main.go
@@ -78,15 +78,15 @@ func main() {
 		},
 	}))
 
-	adminProxy := e.Group("proxy/admin")
-	adminURL, err := url.Parse(cfg.AdminURL)
+	consoleProxy := e.Group("proxy/console")
+	consoleUrl, err := url.Parse(cfg.ConsoleUrl)
 	if err != nil {
 		e.Logger.Fatal(err)
 	}
-	adminProxy.Use(middleware.ProxyWithConfig(middleware.ProxyConfig{
-		Balancer: middleware.NewRoundRobinBalancer([]*middleware.ProxyTarget{{URL: adminURL}}),
+	consoleProxy.Use(middleware.ProxyWithConfig(middleware.ProxyConfig{
+		Balancer: middleware.NewRoundRobinBalancer([]*middleware.ProxyTarget{{URL: consoleUrl}}),
 		Rewrite: map[string]string{
-			"^/proxy/admin/*": "/$1",
+			"^/proxy/console/*": "/$1",
 		},
 	}))
 
diff --git a/ui/src/client/admin/admin.ts b/ui/src/client/console/console.ts
similarity index 94%
rename from ui/src/client/admin/admin.ts
rename to ui/src/client/console/console.ts
index 17997c867..027cae65a 100644
--- a/ui/src/client/admin/admin.ts
+++ b/ui/src/client/console/console.ts
@@ -9,7 +9,7 @@
 // licenses/AGPL.txt.
 import useSWR, { SWRConfiguration } from 'swr'
 import { PermissionType } from '@/client/api/permission'
-import { adminFetcher } from '@/client/fetcher'
+import { consoleFetcher } from '@/client/fetcher'
 import { getConfig } from '@/config/config'
 
 export interface ListResponse {
@@ -197,9 +197,9 @@ export const emptyListResponseValue: emptyListResponse = {
   data: [],
 }
 
-export default class AdminApi {
+export default class ConsoleApi {
   static async checkIndexesAvailability() {
-    const response = await fetch(`${getConfig().adminURL}/index/all`, {
+    const response = await fetch(`${getConfig().consoleURL}/index/all`, {
       method: 'GET',
     })
     if (response) {
@@ -214,7 +214,7 @@ export default class AdminApi {
     return useSWR<IndexManagementList>(
       url,
       () =>
-        adminFetcher({
+        consoleFetcher({
           url,
           method: 'GET',
         }) as Promise<IndexManagementList>,
@@ -223,98 +223,98 @@ export default class AdminApi {
   }
 
   static async getUsersByOrganization(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/organization/users?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<UserOrganizationManagementList>
   }
 
   static async listGroups(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/group/all?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<GroupManagementList>
   }
 
   static async getGroupsByUser(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/user/groups?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<GroupUserManagementList>
   }
 
   static async getGroupsByOrganization(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/organization/groups?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<GroupManagementList>
   }
 
   static async listOrganizations(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/organization/all?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<OrganizationManagementList>
   }
 
   static async getOrganizationsByUser(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/user/organizations?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<OrganizationUserManagementList>
   }
 
   static async getOrganizationById(options: baseIdRequest) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/organization?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<OrganizationManagement>
   }
 
   static async listWorkspaces(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/workspace/all?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<WorkspaceManagementList>
   }
 
   static async getWorkspacesByUser(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/user/workspaces?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<WorkspaceUserManagementList>
   }
 
   static async getWorkspacesByOrganization(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/organization/workspaces?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<WorkspaceManagementList>
   }
 
   static async listInvitations(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/invitation/all?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<InvitationManagementList>
   }
 
   static async countObject(object: string) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/${object}/count`,
       method: 'GET',
     }) as Promise<CountResponse>
   }
 
   static async getComponentsVersions(options: ListOptions) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/overview/version/internal?${this.paramsFromListOptions(options)}`,
       method: 'GET',
     }) as Promise<ComponentVersion>
   }
 
   static async renameObject(options: baseIdNameRequest, object: string) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/${object}`,
       method: 'PATCH',
       body: JSON.stringify(options),
@@ -322,7 +322,7 @@ export default class AdminApi {
   }
 
   static async invitationChangeStatus(options: invitationStatusRequest) {
-    return adminFetcher({
+    return consoleFetcher({
       url: `/invitation`,
       method: 'PATCH',
       body: JSON.stringify(options),
diff --git a/ui/src/client/fetcher.ts b/ui/src/client/fetcher.ts
index 5270c9bc8..ae7eef2a9 100644
--- a/ui/src/client/fetcher.ts
+++ b/ui/src/client/fetcher.ts
@@ -34,10 +34,10 @@ export function idpFetcher<T>(options: FetcherOptions) {
   })
 }
 
-export function adminFetcher<T>(options: FetcherOptions) {
+export function consoleFetcher<T>(options: FetcherOptions) {
   return fetcher<T>({
     ...options,
-    url: `${getConfig().adminURL}${options.url}`,
+    url: `${getConfig().consoleURL}${options.url}`,
   })
 }
 
diff --git a/ui/src/client/idp/user.ts b/ui/src/client/idp/user.ts
index e6c9f772c..de0e43bcc 100644
--- a/ui/src/client/idp/user.ts
+++ b/ui/src/client/idp/user.ts
@@ -19,7 +19,7 @@ export type User = {
   pendingEmail?: string
 }
 
-export interface AdminUser extends User {
+export interface ConsoleUser extends User {
   isEmailConfirmed: boolean
   createTime: Date
   updateTime: Date
@@ -27,8 +27,8 @@ export interface AdminUser extends User {
   isActive: boolean
 }
 
-export interface AdminUsersResponse {
-  data: AdminUser[]
+export interface ConsoleUsersResponse {
+  data: ConsoleUser[]
   totalElements: number
   page: number
   size: number
@@ -93,14 +93,14 @@ export default class UserAPI {
     return idpFetcher({
       url: `/user/by_id?${this.paramsFromListOptions(options)}`,
       method: 'GET',
-    }) as Promise<AdminUser>
+    }) as Promise<ConsoleUser>
   }
 
   static async getAllUsers(options: ListOptions) {
     return idpFetcher({
       url: `/user/all?${this.paramsFromListOptions(options)}`,
       method: 'GET',
-    }) as Promise<AdminUsersResponse>
+    }) as Promise<ConsoleUsersResponse>
   }
 
   static async updateFullName(options: UpdateFullNameOptions) {
diff --git a/ui/src/components/app-bar/index.tsx b/ui/src/components/app-bar/index.tsx
index 2f8acf0c7..90481cb63 100644
--- a/ui/src/components/app-bar/index.tsx
+++ b/ui/src/components/app-bar/index.tsx
@@ -11,7 +11,7 @@ import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom'
 import cx from 'classnames'
 import AccountMenu from '@/components/account/menu'
-import AdminButton from '@/components/admin/admin-button'
+import ConsoleButton from '@/components/console/console-button'
 import TaskDrawer from '@/components/task/task-drawer'
 import { getAdminStatus } from '@/infra/token'
 import { useAppDispatch, useAppSelector } from '@/store/hook'
@@ -42,8 +42,8 @@ const AppBar = () => {
     if (location.pathname.startsWith('/workspace')) {
       dispatch(activeNavChanged(NavType.Workspaces))
     }
-    if (location.pathname.startsWith('/admin')) {
-      dispatch(activeNavChanged(NavType.Admin))
+    if (location.pathname.startsWith('/console')) {
+      dispatch(activeNavChanged(NavType.Console))
     }
   }, [location, dispatch])
 
@@ -68,7 +68,7 @@ const AppBar = () => {
         {activeNav === NavType.Organizations ? (
           <CreateOrganizationButton />
         ) : null}
-        {getAdminStatus() ? <AdminButton /> : null}
+        {getAdminStatus() ? <ConsoleButton /> : null}
         <UploadDrawer />
         <TaskDrawer />
         <AccountMenu />
diff --git a/ui/src/components/admin/admin-button.tsx b/ui/src/components/console/console-button.tsx
similarity index 83%
rename from ui/src/components/admin/admin-button.tsx
rename to ui/src/components/console/console-button.tsx
index 8a24a3daf..d9e75016c 100644
--- a/ui/src/components/admin/admin-button.tsx
+++ b/ui/src/components/console/console-button.tsx
@@ -12,16 +12,16 @@ import { Link } from 'react-router-dom'
 import { IconButton } from '@chakra-ui/react'
 import { IconAdmin, IconDeAdmin } from '@/lib/components/icons'
 
-const AdminButton = () => {
+const ConsoleButton = () => {
   const buttonRef = useRef<HTMLButtonElement>(null)
   return (
     <>
-      {location.pathname.startsWith('/admin') ? (
+      {location.pathname.startsWith('/console') ? (
         <Link to="/" title="User dashbaord">
           <IconButton ref={buttonRef} icon={<IconDeAdmin />} aria-label="" />
         </Link>
       ) : (
-        <Link to="/admin/dashboard" title="Admin dashbaord">
+        <Link to="/console/dashboard" title="Cloud console dashbaord">
           <IconButton ref={buttonRef} icon={<IconAdmin />} aria-label="" />
         </Link>
       )}
@@ -29,4 +29,4 @@ const AdminButton = () => {
   )
 }
 
-export default AdminButton
+export default ConsoleButton
diff --git a/ui/src/components/admin/admin-confirmation-modal.tsx b/ui/src/components/console/console-confirmation-modal.tsx
similarity index 93%
rename from ui/src/components/admin/admin-confirmation-modal.tsx
rename to ui/src/components/console/console-confirmation-modal.tsx
index 7a5389bc9..d94139223 100644
--- a/ui/src/components/admin/admin-confirmation-modal.tsx
+++ b/ui/src/components/console/console-confirmation-modal.tsx
@@ -20,7 +20,7 @@ import {
   ModalOverlay,
 } from '@chakra-ui/react'
 
-interface AdminConfirmationModalProps {
+interface ConsoleConfirmationModalProps {
   action: string | undefined
   closeConfirmationWindow: () => void
   isOpen: boolean
@@ -34,7 +34,7 @@ interface AdminConfirmationModalProps {
   target: string | undefined
 }
 
-const AdminConfirmationModal = (props: AdminConfirmationModalProps) => {
+const ConsoleConfirmationModal = (props: ConsoleConfirmationModalProps) => {
   useEffect(() => {
     if (
       props.isOpen &&
@@ -95,4 +95,4 @@ const AdminConfirmationModal = (props: AdminConfirmationModalProps) => {
   )
 }
 
-export default AdminConfirmationModal
+export default ConsoleConfirmationModal
diff --git a/ui/src/components/admin/admin-highlightable-tr.tsx b/ui/src/components/console/console-highlightable-tr.tsx
similarity index 76%
rename from ui/src/components/admin/admin-highlightable-tr.tsx
rename to ui/src/components/console/console-highlightable-tr.tsx
index 2021c8c9b..30679f4a3 100644
--- a/ui/src/components/admin/admin-highlightable-tr.tsx
+++ b/ui/src/components/console/console-highlightable-tr.tsx
@@ -2,13 +2,13 @@ import { CSSProperties, MouseEvent, ReactNode } from 'react'
 import { Tr } from '@chakra-ui/react'
 import { useColorModeValue } from '@chakra-ui/system'
 
-export interface AdminHighlightableProps {
+export interface ConsoleHighlightableProps {
   onClick: (event: MouseEvent) => void
   style?: CSSProperties
   children: ReactNode
 }
 
-const AdminHighlightableTr = (props: AdminHighlightableProps) => {
+const ConsoleHighlightableTr = (props: ConsoleHighlightableProps) => {
   const hoverBg = useColorModeValue('gray.300', 'gray.700')
 
   return (
@@ -24,4 +24,4 @@ const AdminHighlightableTr = (props: AdminHighlightableProps) => {
   )
 }
 
-export default AdminHighlightableTr
+export default ConsoleHighlightableTr
diff --git a/ui/src/components/admin/admin-rename-modal.tsx b/ui/src/components/console/console-rename-modal.tsx
similarity index 96%
rename from ui/src/components/admin/admin-rename-modal.tsx
rename to ui/src/components/console/console-rename-modal.tsx
index d0888a8fa..6fa4ed5bb 100644
--- a/ui/src/components/admin/admin-rename-modal.tsx
+++ b/ui/src/components/console/console-rename-modal.tsx
@@ -24,7 +24,7 @@ import {
 import { Field, FieldAttributes, FieldProps, Form, Formik } from 'formik'
 import * as Yup from 'yup'
 
-interface AdminRenameModalProps {
+interface ConsoleRenameModalProps {
   closeConfirmationWindow: () => void
   isOpen: boolean
   isSubmitting: boolean
@@ -42,7 +42,7 @@ interface AdminRenameModalProps {
     confirm: boolean,
   ) => Promise<void>
 }
-const AdminRenameModal = (props: AdminRenameModalProps) => {
+const ConsoleRenameModal = (props: ConsoleRenameModalProps) => {
   const inputRef = useRef<HTMLInputElement>(null)
   useEffect(() => {
     if (
@@ -126,4 +126,4 @@ const AdminRenameModal = (props: AdminRenameModalProps) => {
   )
 }
 
-export default AdminRenameModal
+export default ConsoleRenameModal
diff --git a/ui/src/components/admin/deadmin-button.tsx b/ui/src/components/console/deadmin-button.tsx
similarity index 100%
rename from ui/src/components/admin/deadmin-button.tsx
rename to ui/src/components/console/deadmin-button.tsx
diff --git a/ui/src/components/layout/layout-admin.tsx b/ui/src/components/layout/layout-console.tsx
similarity index 88%
rename from ui/src/components/layout/layout-admin.tsx
rename to ui/src/components/layout/layout-console.tsx
index 881c779dd..99e87a078 100644
--- a/ui/src/components/layout/layout-admin.tsx
+++ b/ui/src/components/layout/layout-console.tsx
@@ -27,7 +27,7 @@ import Shell from '@/lib/components/shell'
 import { useAppDispatch, useAppSelector } from '@/store/hook'
 import { errorCleared } from '@/store/ui/error'
 
-const LayoutAdmin = () => {
+const LayoutConsole = () => {
   const toast = useToast()
   const error = useAppSelector((state) => state.ui.error.value)
   const navigate = useNavigate()
@@ -61,43 +61,43 @@ const LayoutAdmin = () => {
       topBar={<AppBar />}
       items={[
         {
-          href: '/admin/dashboard',
+          href: '/console/dashboard',
           icon: <IconHome />,
-          primaryText: 'Admin overview',
+          primaryText: 'Cloud Console overview',
           secondaryText: 'Basic information about instance',
         },
         {
-          href: '/admin/users',
+          href: '/console/users',
           icon: <IconPerson />,
           primaryText: 'Users management',
           secondaryText: 'Manage users of your cloud instance',
         },
         {
-          href: '/admin/groups',
+          href: '/console/groups',
           icon: <IconGroup />,
           primaryText: 'Groups management',
           secondaryText: 'Manage groups of your cloud instance',
         },
         {
-          href: '/admin/workspaces',
+          href: '/console/workspaces',
           icon: <IconWorkspaces />,
           primaryText: 'Workspaces management',
           secondaryText: 'Manage workspaces of your cloud instance',
         },
         {
-          href: '/admin/organizations',
+          href: '/console/organizations',
           icon: <IconFlag />,
           primaryText: 'Organizations management',
           secondaryText: 'Manage workspaces of your cloud instance',
         },
         {
-          href: '/admin/invitations',
+          href: '/console/invitations',
           icon: <IconInvitations />,
           primaryText: 'Invitations management',
           secondaryText: 'Manage invitations of your cloud instance',
         },
         {
-          href: '/admin/database',
+          href: '/console/database',
           icon: <IconDatabase />,
           primaryText: 'Database management',
           secondaryText: 'Manage database of your cloud instance',
@@ -109,4 +109,4 @@ const LayoutAdmin = () => {
   )
 }
 
-export default LayoutAdmin
+export default LayoutConsole
diff --git a/ui/src/config/config.ts b/ui/src/config/config.ts
index cc97d143d..58d97a8ab 100644
--- a/ui/src/config/config.ts
+++ b/ui/src/config/config.ts
@@ -12,7 +12,7 @@ import { Config } from './types'
 const config: Config = {
   apiURL: '/proxy/api/v2',
   idpURL: '/proxy/idp/v2',
-  adminURL: '/proxy/admin/v1',
+  consoleURL: '/proxy/console/v1',
 }
 
 export function getConfig(): Config {
diff --git a/ui/src/config/types.ts b/ui/src/config/types.ts
index cc039e635..e0338d1d0 100644
--- a/ui/src/config/types.ts
+++ b/ui/src/config/types.ts
@@ -11,5 +11,5 @@
 export type Config = {
   apiURL: string
   idpURL: string
-  adminURL: string
+  consoleURL: string
 }
diff --git a/ui/src/infra/pagination.ts b/ui/src/infra/pagination.ts
index a3ce3a8c4..73e95969f 100644
--- a/ui/src/infra/pagination.ts
+++ b/ui/src/infra/pagination.ts
@@ -84,37 +84,37 @@ export function workspacePaginationStorage() {
   }
 }
 
-export function adminUsersPaginationStorage() {
+export function consoleUsersPaginationStorage() {
   return {
     prefix: 'voltaserve',
-    namespace: 'admin_users',
+    namespace: 'console_users',
   }
 }
 
-export function adminGroupsPaginationStorage() {
+export function consoleGroupsPaginationStorage() {
   return {
     prefix: 'voltaserve',
-    namespace: 'admin_groups',
+    namespace: 'console_groups',
   }
 }
 
-export function adminInvitationsPaginationStorage() {
+export function consoleInvitationsPaginationStorage() {
   return {
     prefix: 'voltaserve',
-    namespace: 'admin_invitations',
+    namespace: 'console_invitations',
   }
 }
 
-export function adminOrganizationsPaginationStorage() {
+export function consoleOrganizationsPaginationStorage() {
   return {
     prefix: 'voltaserve',
-    namespace: 'admin_organizations',
+    namespace: 'console_organizations',
   }
 }
 
-export function adminWorkspacesPaginationStorage() {
+export function consoleWorkspacesPaginationStorage() {
   return {
     prefix: 'voltaserve',
-    namespace: 'admin_workspaces',
+    namespace: 'console_workspaces',
   }
 }
diff --git a/ui/src/lib/components/drawer/index.tsx b/ui/src/lib/components/drawer/index.tsx
index 51953dc46..6a3be51d7 100644
--- a/ui/src/lib/components/drawer/index.tsx
+++ b/ui/src/lib/components/drawer/index.tsx
@@ -72,7 +72,7 @@ const Drawer = ({ children, storage, logo }: DrawerProps) => {
         >
           <Link
             to={
-              location.pathname.startsWith('/admin') ? '/admin/dashboard' : '/'
+              location.pathname.startsWith('/console') ? '/console/dashboard' : '/'
             }
           >
             <div className={cx('flex', 'h-[40px]')}>
diff --git a/ui/src/local-storage/index.ts b/ui/src/local-storage/index.ts
index c28823f8e..8df8753b0 100644
--- a/ui/src/local-storage/index.ts
+++ b/ui/src/local-storage/index.ts
@@ -110,18 +110,4 @@ export function loadTokenExpiry(): string | null {
 
 export function removeTokenExpiry() {
   return localStorage.removeItem(TOKEN_EXPIRY)
-}
-
-export const ADMIN_ACCESS_TOKEN = 'voltaserve_admin_access_token'
-
-export function saveAdminAccessToken(token: string) {
-  return localStorage.setItem(ADMIN_ACCESS_TOKEN, token)
-}
-
-export function removeAdminAccessToken() {
-  return localStorage.removeItem(ADMIN_ACCESS_TOKEN)
-}
-
-export function loadAdminAccessToken(): string | null {
-  return localStorage.getItem(ADMIN_ACCESS_TOKEN)
-}
+}
\ No newline at end of file
diff --git a/ui/src/pages/admin/admin-panel-database-indexes.tsx b/ui/src/pages/console/console-panel-database-indexes.tsx
similarity index 96%
rename from ui/src/pages/admin/admin-panel-database-indexes.tsx
rename to ui/src/pages/console/console-panel-database-indexes.tsx
index 70b57bb89..7f244423b 100644
--- a/ui/src/pages/admin/admin-panel-database-indexes.tsx
+++ b/ui/src/pages/console/console-panel-database-indexes.tsx
@@ -28,7 +28,7 @@ import {
 } from '@chakra-ui/react'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi from '@/client/admin/admin'
+import ConsoleApi from '@/client/console/console'
 import { swrConfig } from '@/client/options'
 import { organizationPaginationStorage } from '@/infra/pagination'
 import PagePagination from '@/lib/components/page-pagination'
@@ -38,7 +38,7 @@ import usePagePagination from '@/lib/hooks/page-pagination'
 import { useAppDispatch } from '@/store/hook'
 import { mutateUpdated } from '@/store/ui/indexes'
 
-const AdminPanelDatabaseIndexes = () => {
+const ConsolePanelDatabaseIndexes = () => {
   const navigate = useNavigate()
   const location = useLocation()
   const dispatch = useAppDispatch()
@@ -56,7 +56,7 @@ const AdminPanelDatabaseIndexes = () => {
     data: list,
     error,
     mutate,
-  } = AdminApi.useListIndexes({ page, size }, swrConfig())
+  } = ConsoleApi.useListIndexes({ page, size }, swrConfig())
 
   const sendRebuildRequest = (
     indexname: string | null,
@@ -195,4 +195,4 @@ const AdminPanelDatabaseIndexes = () => {
   )
 }
 
-export default AdminPanelDatabaseIndexes
+export default ConsolePanelDatabaseIndexes
diff --git a/ui/src/pages/admin/admin-panel-database-overview.tsx b/ui/src/pages/console/console-panel-database-overview.tsx
similarity index 91%
rename from ui/src/pages/admin/admin-panel-database-overview.tsx
rename to ui/src/pages/console/console-panel-database-overview.tsx
index 077ae7179..e32e0ca8b 100644
--- a/ui/src/pages/admin/admin-panel-database-overview.tsx
+++ b/ui/src/pages/console/console-panel-database-overview.tsx
@@ -10,7 +10,7 @@
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
 
-const AdminPanelDatabaseOverview = () => {
+const ConsolePanelDatabaseOverview = () => {
   // const [socket, setWebsocket] = useState<WebSocket>(new WebSocket('ws://192.168.1.254:20002'))
   // useEffect(() => {
   //   socket.addEventListener("open", event => {
@@ -30,4 +30,4 @@ const AdminPanelDatabaseOverview = () => {
   )
 }
 
-export default AdminPanelDatabaseOverview
+export default ConsolePanelDatabaseOverview
diff --git a/ui/src/pages/admin/admin-panel-database.tsx b/ui/src/pages/console/console-panel-database.tsx
similarity index 82%
rename from ui/src/pages/admin/admin-panel-database.tsx
rename to ui/src/pages/console/console-panel-database.tsx
index 5302c2aa8..4c0af7aee 100644
--- a/ui/src/pages/admin/admin-panel-database.tsx
+++ b/ui/src/pages/console/console-panel-database.tsx
@@ -11,9 +11,9 @@ import { useEffect, useState } from 'react'
 import { Outlet, useLocation, useNavigate } from 'react-router-dom'
 import { Heading, Tab, TabList, Tabs } from '@chakra-ui/react'
 import cx from 'classnames'
-import AdminApi from '@/client/admin/admin'
+import ConsoleApi from '@/client/console/console'
 
-const AdminPanelDatabase = () => {
+const ConsolePanelDatabase = () => {
   const location = useLocation()
   const navigate = useNavigate()
   const [tabIndex, setTabIndex] = useState(0)
@@ -30,7 +30,7 @@ const AdminPanelDatabase = () => {
   }, [location])
 
   useEffect(() => {
-    AdminApi.checkIndexesAvailability().then((value) => {
+    ConsoleApi.checkIndexesAvailability().then((value) => {
       setIndexesAvailable(value)
     })
   }, [])
@@ -42,11 +42,11 @@ const AdminPanelDatabase = () => {
       </Heading>
       <Tabs variant="solid-rounded" colorScheme="gray" index={tabIndex}>
         <TabList>
-          <Tab onClick={() => navigate(`/admin/database/overview`)}>
+          <Tab onClick={() => navigate(`/console/database/overview`)}>
             Overview
           </Tab>
           {indexesAvailable ? (
-            <Tab onClick={() => navigate(`/admin/database/indexes`)}>
+            <Tab onClick={() => navigate(`/console/database/indexes`)}>
               Indexes
             </Tab>
           ) : null}
@@ -57,4 +57,4 @@ const AdminPanelDatabase = () => {
   )
 }
 
-export default AdminPanelDatabase
+export default ConsolePanelDatabase
diff --git a/ui/src/pages/admin/admin-panel-groups.tsx b/ui/src/pages/console/console-panel-groups.tsx
similarity index 89%
rename from ui/src/pages/admin/admin-panel-groups.tsx
rename to ui/src/pages/console/console-panel-groups.tsx
index fb1b0c715..080ee670a 100644
--- a/ui/src/pages/admin/admin-panel-groups.tsx
+++ b/ui/src/pages/console/console-panel-groups.tsx
@@ -24,21 +24,21 @@ import {
 import * as Yup from 'yup'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, { GroupManagementList } from '@/client/admin/admin'
-import AdminRenameModal from '@/components/admin/admin-rename-modal'
-import { adminGroupsPaginationStorage } from '@/infra/pagination'
+import ConsoleApi, { GroupManagementList } from '@/client/console/console'
+import ConsoleRenameModal from '@/components/console/console-rename-modal'
+import { consoleGroupsPaginationStorage } from '@/infra/pagination'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 import usePagePagination from '@/lib/hooks/page-pagination'
 
-const AdminPanelGroups = () => {
+const ConsolePanelGroups = () => {
   const navigate = useNavigate()
   const location = useLocation()
   const [list, setList] = useState<GroupManagementList | undefined>(undefined)
   const { page, size, steps, setPage, setSize } = usePagePagination({
     navigate,
     location,
-    storage: adminGroupsPaginationStorage(),
+    storage: consoleGroupsPaginationStorage(),
   })
   const [confirmRenameWindowOpen, setConfirmRenameWindowOpen] = useState(false)
   const [isSubmitting, setSubmitting] = useState(false)
@@ -57,7 +57,7 @@ const AdminPanelGroups = () => {
     if (confirm && groupId !== undefined && newName !== null) {
       try {
         setSubmitting(true)
-        await AdminApi.renameObject({ id: groupId, name: newName }, 'group')
+        await ConsoleApi.renameObject({ id: groupId, name: newName }, 'group')
       } finally {
         closeConfirmationWindow()
       }
@@ -76,7 +76,7 @@ const AdminPanelGroups = () => {
   }
 
   useEffect(() => {
-    AdminApi.listGroups({ page: page, size: size }).then((value) =>
+    ConsoleApi.listGroups({ page: page, size: size }).then((value) =>
       setList(value),
     )
   }, [page, size, isSubmitting])
@@ -87,7 +87,7 @@ const AdminPanelGroups = () => {
 
   return (
     <>
-      <AdminRenameModal
+      <ConsoleRenameModal
         closeConfirmationWindow={closeConfirmationWindow}
         isOpen={confirmRenameWindowOpen}
         isSubmitting={isSubmitting}
@@ -123,7 +123,7 @@ const AdminPanelGroups = () => {
                       <Button
                         onClick={() => {
                           navigate(
-                            `/admin/organizations/${group.organization.id}`,
+                            `/console/organizations/${group.organization.id}`,
                           )
                         }}
                       >
@@ -172,4 +172,4 @@ const AdminPanelGroups = () => {
   )
 }
 
-export default AdminPanelGroups
+export default ConsolePanelGroups
diff --git a/ui/src/pages/admin/admin-panel-invitations.tsx b/ui/src/pages/console/console-panel-invitations.tsx
similarity index 92%
rename from ui/src/pages/admin/admin-panel-invitations.tsx
rename to ui/src/pages/console/console-panel-invitations.tsx
index a096f77e2..aa0b834d2 100644
--- a/ui/src/pages/admin/admin-panel-invitations.tsx
+++ b/ui/src/pages/console/console-panel-invitations.tsx
@@ -28,15 +28,15 @@ import {
 } from '@chakra-ui/react'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, { InvitationManagementList } from '@/client/admin/admin'
-import AdminConfirmationModal from '@/components/admin/admin-confirmation-modal'
-import { adminInvitationsPaginationStorage } from '@/infra/pagination'
+import ConsoleApi, { InvitationManagementList } from '@/client/console/console'
+import ConsoleConfirmationModal from '@/components/console/console-confirmation-modal'
+import { consoleInvitationsPaginationStorage } from '@/infra/pagination'
 import { IconChevronDown, IconChevronUp } from '@/lib/components/icons'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 import usePagePagination from '@/lib/hooks/page-pagination'
 
-const AdminPanelInvitations = () => {
+const ConsolePanelInvitations = () => {
   const navigate = useNavigate()
   const location = useLocation()
   const [list, setList] = useState<InvitationManagementList | undefined>(
@@ -58,7 +58,7 @@ const AdminPanelInvitations = () => {
   const { page, size, steps, setPage, setSize } = usePagePagination({
     navigate,
     location,
-    storage: adminInvitationsPaginationStorage(),
+    storage: consoleInvitationsPaginationStorage(),
   })
 
   const changeInvitationStatus = async (
@@ -70,7 +70,7 @@ const AdminPanelInvitations = () => {
     if (confirm && invitationId && actionState !== undefined) {
       setSubmitting(true)
       try {
-        await AdminApi.invitationChangeStatus({
+        await ConsoleApi.invitationChangeStatus({
           id: invitationId,
           accept: actionState,
         })
@@ -95,7 +95,7 @@ const AdminPanelInvitations = () => {
   }
 
   useEffect(() => {
-    AdminApi.listInvitations({ page: page, size: size }).then((value) =>
+    ConsoleApi.listInvitations({ page: page, size: size }).then((value) =>
       setList(value),
     )
   }, [page, size, isSubmitting])
@@ -106,7 +106,7 @@ const AdminPanelInvitations = () => {
 
   return (
     <>
-      <AdminConfirmationModal
+      <ConsoleConfirmationModal
         isOpen={confirmInvitationWindowOpen}
         action={confirmWindowAction}
         target={invitationDetails}
@@ -139,7 +139,7 @@ const AdminPanelInvitations = () => {
                       <Button
                         onClick={() => {
                           navigate(
-                            `/admin/organizations/${invitation.organization.id}`,
+                            `/console/organizations/${invitation.organization.id}`,
                           )
                         }}
                       >
@@ -244,4 +244,4 @@ const AdminPanelInvitations = () => {
   )
 }
 
-export default AdminPanelInvitations
+export default ConsolePanelInvitations
diff --git a/ui/src/pages/admin/admin-panel-organization.tsx b/ui/src/pages/console/console-panel-organization.tsx
similarity index 94%
rename from ui/src/pages/admin/admin-panel-organization.tsx
rename to ui/src/pages/console/console-panel-organization.tsx
index 5ce1fad63..d6b46479d 100644
--- a/ui/src/pages/admin/admin-panel-organization.tsx
+++ b/ui/src/pages/console/console-panel-organization.tsx
@@ -24,16 +24,16 @@ import {
 } from '@chakra-ui/react'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, {
+import ConsoleApi, {
   GroupManagementList,
   OrganizationManagement,
   UserOrganizationManagementList,
   WorkspaceManagementList,
-} from '@/client/admin/admin'
+} from '@/client/console/console'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 
-const AdminPanelOrganization = () => {
+const ConsolePanelOrganization = () => {
   const [organizationData, setOrganizationData] = useState<
     OrganizationManagement | undefined
   >(undefined)
@@ -53,24 +53,24 @@ const AdminPanelOrganization = () => {
 
   useEffect(() => {
     if (id) {
-      AdminApi.getOrganizationById({ id: id }).then((value) => {
+      ConsoleApi.getOrganizationById({ id: id }).then((value) => {
         setOrganizationData(value)
       })
-      AdminApi.getUsersByOrganization({
+      ConsoleApi.getUsersByOrganization({
         id: id,
         page: usersPage,
         size: 5,
       }).then((value) => {
         setUsersData(value)
       })
-      AdminApi.getWorkspacesByOrganization({
+      ConsoleApi.getWorkspacesByOrganization({
         id: id,
         page: workspacesPage,
         size: 5,
       }).then((value) => {
         setWorkspacesData(value)
       })
-      AdminApi.getGroupsByOrganization({
+      ConsoleApi.getGroupsByOrganization({
         id: id,
         page: workspacesPage,
         size: 5,
@@ -82,7 +82,7 @@ const AdminPanelOrganization = () => {
 
   useEffect(() => {
     if (id) {
-      AdminApi.getUsersByOrganization({
+      ConsoleApi.getUsersByOrganization({
         id: id,
         page: usersPage,
         size: 5,
@@ -94,7 +94,7 @@ const AdminPanelOrganization = () => {
 
   useEffect(() => {
     if (id) {
-      AdminApi.getGroupsByOrganization({
+      ConsoleApi.getGroupsByOrganization({
         id: id,
         page: groupsPage,
         size: 5,
@@ -105,7 +105,7 @@ const AdminPanelOrganization = () => {
   }, [groupsPage])
 
   useEffect(() => {
-    AdminApi.getWorkspacesByOrganization({
+    ConsoleApi.getWorkspacesByOrganization({
       id: id,
       page: workspacesPage,
       size: 5,
@@ -278,4 +278,4 @@ const AdminPanelOrganization = () => {
   )
 }
 
-export default AdminPanelOrganization
+export default ConsolePanelOrganization
diff --git a/ui/src/pages/admin/admin-panel-organizations.tsx b/ui/src/pages/console/console-panel-organizations.tsx
similarity index 87%
rename from ui/src/pages/admin/admin-panel-organizations.tsx
rename to ui/src/pages/console/console-panel-organizations.tsx
index 803633503..f402418dd 100644
--- a/ui/src/pages/admin/admin-panel-organizations.tsx
+++ b/ui/src/pages/console/console-panel-organizations.tsx
@@ -24,15 +24,15 @@ import {
 import * as Yup from 'yup'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, { OrganizationManagementList } from '@/client/admin/admin'
-import AdminHighlightableTr from '@/components/admin/admin-highlightable-tr'
-import AdminRenameModal from '@/components/admin/admin-rename-modal'
-import { adminOrganizationsPaginationStorage } from '@/infra/pagination'
+import ConsoleApi, { OrganizationManagementList } from '@/client/console/console'
+import ConsoleHighlightableTr from '@/components/console/console-highlightable-tr'
+import ConsoleRenameModal from '@/components/console/console-rename-modal'
+import { consoleOrganizationsPaginationStorage } from '@/infra/pagination'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 import usePagePagination from '@/lib/hooks/page-pagination'
 
-const AdminPanelOrganizations = () => {
+const ConsolePanelOrganizations = () => {
   const navigate = useNavigate()
   const location = useLocation()
   const [list, setList] = useState<OrganizationManagementList | undefined>(
@@ -41,7 +41,7 @@ const AdminPanelOrganizations = () => {
   const { page, size, steps, setPage, setSize } = usePagePagination({
     navigate,
     location,
-    storage: adminOrganizationsPaginationStorage(),
+    storage: consoleOrganizationsPaginationStorage(),
   })
   const [confirmRenameWindowOpen, setConfirmRenameWindowOpen] = useState(false)
   const [isSubmitting, setSubmitting] = useState(false)
@@ -62,7 +62,7 @@ const AdminPanelOrganizations = () => {
     if (confirm && organizationId !== undefined && newName !== null) {
       try {
         setSubmitting(true)
-        await AdminApi.renameObject(
+        await ConsoleApi.renameObject(
           { id: organizationId, name: newName },
           'organization',
         )
@@ -84,7 +84,7 @@ const AdminPanelOrganizations = () => {
   }
 
   useEffect(() => {
-    AdminApi.listOrganizations({ page: page, size: size }).then((value) =>
+    ConsoleApi.listOrganizations({ page: page, size: size }).then((value) =>
       setList(value),
     )
   }, [page, size, isSubmitting])
@@ -95,7 +95,7 @@ const AdminPanelOrganizations = () => {
 
   return (
     <>
-      <AdminRenameModal
+      <ConsoleRenameModal
         closeConfirmationWindow={closeConfirmationWindow}
         isOpen={confirmRenameWindowOpen}
         isSubmitting={isSubmitting}
@@ -124,7 +124,7 @@ const AdminPanelOrganizations = () => {
               </Thead>
               <Tbody>
                 {list.data.map((organization) => (
-                  <AdminHighlightableTr
+                  <ConsoleHighlightableTr
                     key={organization.id}
                     onClick={(event) => {
                       if (
@@ -132,7 +132,7 @@ const AdminPanelOrganizations = () => {
                         !(event.target instanceof HTMLSpanElement) &&
                         !(event.target instanceof HTMLParagraphElement)
                       ) {
-                        navigate(`/admin/organizations/${organization.id}`)
+                        navigate(`/console/organizations/${organization.id}`)
                       }
                     }}
                   >
@@ -162,7 +162,7 @@ const AdminPanelOrganizations = () => {
                         Rename
                       </Button>
                     </Td>
-                  </AdminHighlightableTr>
+                  </ConsoleHighlightableTr>
                 ))}
               </Tbody>
             </Table>
@@ -187,4 +187,4 @@ const AdminPanelOrganizations = () => {
   )
 }
 
-export default AdminPanelOrganizations
+export default ConsolePanelOrganizations
diff --git a/ui/src/pages/admin/admin-panel-overview.tsx b/ui/src/pages/console/console-panel-overview.tsx
similarity index 92%
rename from ui/src/pages/admin/admin-panel-overview.tsx
rename to ui/src/pages/console/console-panel-overview.tsx
index b547fef9b..477a2424e 100644
--- a/ui/src/pages/admin/admin-panel-overview.tsx
+++ b/ui/src/pages/console/console-panel-overview.tsx
@@ -25,7 +25,7 @@ import {
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
 import semver from 'semver'
-import AdminApi, { ComponentVersion } from '@/client/admin/admin'
+import ConsoleApi, { ComponentVersion } from '@/client/console/console'
 import {
   IconChevronRight,
   IconFlag,
@@ -44,13 +44,13 @@ const internalComponents = [
   { id: 'webdav' },
   { id: 'idp' },
   { id: 'mosaic' },
-  { id: 'admin' },
+  { id: 'console' },
   { id: 'conversion' },
 ]
 const compareFn = (a: ComponentVersion, b: ComponentVersion) =>
   a.name > b.name ? 1 : 0
 
-const AdminPanelOverview = () => {
+const ConsolePanelOverview = () => {
   const [usersAmount, setUsersAmount] = useState<number | undefined>(undefined)
   const [groupsAmount, setGroupsAmount] = useState<number | undefined>(
     undefined,
@@ -64,20 +64,20 @@ const AdminPanelOverview = () => {
   const [componentsData, setComponentsData] = useState<ComponentVersion[]>([])
 
   useEffect(() => {
-    AdminApi.countObject('user').then((value) => {
+    ConsoleApi.countObject('user').then((value) => {
       setUsersAmount(value.count)
     })
-    AdminApi.countObject('organization').then((value) => {
+    ConsoleApi.countObject('organization').then((value) => {
       setOrganizationsAmount(value.count)
     })
-    AdminApi.countObject('group').then((value) => {
+    ConsoleApi.countObject('group').then((value) => {
       setGroupsAmount(value.count)
     })
-    AdminApi.countObject('workspace').then((value) => {
+    ConsoleApi.countObject('workspace').then((value) => {
       setWorkspacesAmount(value.count)
     })
     internalComponents.map((component) => {
-      AdminApi.getComponentsVersions(component).then((value) => {
+      ConsoleApi.getComponentsVersions(component).then((value) => {
         if (component.id == 'ui') {
           value.currentVersion = uiCurrentVersion.version
           value.updateAvailable = semver.gt(
@@ -98,7 +98,7 @@ const AdminPanelOverview = () => {
   return (
     <>
       <Helmet>
-        <title>Admin Panel</title>
+        <title>Console Panel</title>
       </Helmet>
       <div className={cx('flex', 'flex-col', 'gap-3.5', 'pb-3.5')}>
         <Heading className={cx('text-heading')}>Cloud Panel</Heading>
@@ -221,4 +221,4 @@ const AdminPanelOverview = () => {
   )
 }
 
-export default AdminPanelOverview
+export default ConsolePanelOverview
diff --git a/ui/src/pages/admin/admin-panel-user.tsx b/ui/src/pages/console/console-panel-user.tsx
similarity index 95%
rename from ui/src/pages/admin/admin-panel-user.tsx
rename to ui/src/pages/console/console-panel-user.tsx
index df144b242..b6ff1a6b9 100644
--- a/ui/src/pages/admin/admin-panel-user.tsx
+++ b/ui/src/pages/console/console-panel-user.tsx
@@ -27,12 +27,12 @@ import {
 } from '@chakra-ui/react'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, {
+import ConsoleApi, {
   GroupUserManagementList,
   OrganizationUserManagementList,
   WorkspaceUserManagementList,
-} from '@/client/admin/admin'
-import UserAPI, { AdminUser } from '@/client/idp/user'
+} from '@/client/console/console'
+import UserAPI, { ConsoleUser } from '@/client/idp/user'
 import { IconClose, IconEdit, IconWarning } from '@/lib/components/icons'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
@@ -45,7 +45,7 @@ const EditButton = (props: IconButtonProps) => (
   />
 )
 
-const AdminPanelUser = () => {
+const ConsolePanelUser = () => {
   const sectionClassName = cx('flex', 'flex-col', 'gap-1', 'py-1.5')
   const rowClassName = cx(
     'flex',
@@ -54,7 +54,7 @@ const AdminPanelUser = () => {
     'gap-1',
     `h-[40px]`,
   )
-  const [userData, setUserData] = useState<AdminUser | undefined>(undefined)
+  const [userData, setUserData] = useState<ConsoleUser | undefined>(undefined)
   const [organizationsData, setOrganizationsData] = useState<
     OrganizationUserManagementList | undefined
   >(undefined)
@@ -74,19 +74,19 @@ const AdminPanelUser = () => {
       UserAPI.getUserById({ id: id }).then((value) => {
         setUserData(value)
       })
-      AdminApi.getGroupsByUser({ id: id, page: groupsPage, size: 5 }).then(
+      ConsoleApi.getGroupsByUser({ id: id, page: groupsPage, size: 5 }).then(
         (value) => {
           setGroupsData(value)
         },
       )
-      AdminApi.getOrganizationsByUser({
+      ConsoleApi.getOrganizationsByUser({
         id: id,
         page: organizationsPage,
         size: 5,
       }).then((value) => {
         setOrganizationsData(value)
       })
-      AdminApi.getWorkspacesByUser({
+      ConsoleApi.getWorkspacesByUser({
         id: id,
         page: workspacesPage,
         size: 5,
@@ -98,7 +98,7 @@ const AdminPanelUser = () => {
 
   useEffect(() => {
     if (id) {
-      AdminApi.getOrganizationsByUser({
+      ConsoleApi.getOrganizationsByUser({
         id: id,
         page: organizationsPage,
         size: 5,
@@ -110,7 +110,7 @@ const AdminPanelUser = () => {
 
   useEffect(() => {
     if (id) {
-      AdminApi.getGroupsByUser({ id: id, page: groupsPage, size: 5 }).then(
+      ConsoleApi.getGroupsByUser({ id: id, page: groupsPage, size: 5 }).then(
         (value) => {
           setGroupsData(value)
         },
@@ -119,7 +119,7 @@ const AdminPanelUser = () => {
   }, [groupsPage])
 
   useEffect(() => {
-    AdminApi.getWorkspacesByUser({
+    ConsoleApi.getWorkspacesByUser({
       id: id,
       page: workspacesPage,
       size: 5,
@@ -383,4 +383,4 @@ const AdminPanelUser = () => {
   )
 }
 
-export default AdminPanelUser
+export default ConsolePanelUser
diff --git a/ui/src/pages/admin/admin-panel-users.tsx b/ui/src/pages/console/console-panel-users.tsx
similarity index 92%
rename from ui/src/pages/admin/admin-panel-users.tsx
rename to ui/src/pages/console/console-panel-users.tsx
index fc7736f25..06bb4509d 100644
--- a/ui/src/pages/admin/admin-panel-users.tsx
+++ b/ui/src/pages/console/console-panel-users.tsx
@@ -29,20 +29,20 @@ import {
 } from '@chakra-ui/react'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import UserAPI, { AdminUsersResponse } from '@/client/idp/user'
-import AdminConfirmationModal from '@/components/admin/admin-confirmation-modal'
-import AdminHighlightableTr from '@/components/admin/admin-highlightable-tr'
-import { adminUsersPaginationStorage } from '@/infra/pagination'
+import UserAPI, { ConsoleUsersResponse } from '@/client/idp/user'
+import ConsoleConfirmationModal from '@/components/console/console-confirmation-modal'
+import ConsoleHighlightableTr from '@/components/console/console-highlightable-tr'
+import { consoleUsersPaginationStorage } from '@/infra/pagination'
 import { getUserId } from '@/infra/token'
 import { IconChevronDown, IconChevronUp } from '@/lib/components/icons'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 import usePagePagination from '@/lib/hooks/page-pagination'
 
-const AdminPanelUsers = () => {
+const ConsolePanelUsers = () => {
   const navigate = useNavigate()
   const location = useLocation()
-  const [list, setList] = useState<AdminUsersResponse | undefined>(undefined)
+  const [list, setList] = useState<ConsoleUsersResponse | undefined>(undefined)
   const [isSubmitting, setSubmitting] = useState(false)
   const [userId, setUserId] = useState<string | undefined>(undefined)
   const [userEmail, setUserEmail] = useState<string | undefined>(undefined)
@@ -56,7 +56,7 @@ const AdminPanelUsers = () => {
   const { page, size, steps, setPage, setSize } = usePagePagination({
     navigate,
     location,
-    storage: adminUsersPaginationStorage(),
+    storage: consoleUsersPaginationStorage(),
   })
 
   const suspendUser = async (
@@ -122,7 +122,7 @@ const AdminPanelUsers = () => {
 
   return (
     <>
-      <AdminConfirmationModal
+      <ConsoleConfirmationModal
         isOpen={confirmSuspendWindowOpen}
         action={confirmWindowAction}
         target={userEmail}
@@ -130,7 +130,7 @@ const AdminPanelUsers = () => {
         isSubmitting={isSubmitting}
         request={suspendUser}
       />
-      <AdminConfirmationModal
+      <ConsoleConfirmationModal
         isOpen={confirmAdminWindowOpen}
         action={confirmWindowAction}
         target={userEmail}
@@ -159,7 +159,7 @@ const AdminPanelUsers = () => {
               </Thead>
               <Tbody>
                 {list.data.map((user) => (
-                  <AdminHighlightableTr
+                  <ConsoleHighlightableTr
                     key={user.id}
                     onClick={(event) => {
                       if (
@@ -167,7 +167,7 @@ const AdminPanelUsers = () => {
                         !(event.target instanceof HTMLSpanElement) &&
                         !(event.target instanceof HTMLParagraphElement)
                       ) {
-                        navigate(`/admin/users/${user.id}`)
+                        navigate(`/console/users/${user.id}`)
                       }
                     }}
                   >
@@ -262,7 +262,7 @@ const AdminPanelUsers = () => {
                                   <MenuItem
                                     onClick={async () => {
                                       setConfirmWindowAction(
-                                        'remove admin rights from',
+                                        'remove console rights from',
                                       )
                                       await makeAdminUser(
                                         user.id,
@@ -277,7 +277,7 @@ const AdminPanelUsers = () => {
                                   <MenuItem
                                     onClick={async () => {
                                       setConfirmWindowAction(
-                                        'grant admin rights to',
+                                        'grant console rights to',
                                       )
                                       await makeAdminUser(
                                         user.id,
@@ -295,7 +295,7 @@ const AdminPanelUsers = () => {
                         </Menu>
                       )}
                     </Td>
-                  </AdminHighlightableTr>
+                  </ConsoleHighlightableTr>
                 ))}
               </Tbody>
             </Table>
@@ -320,4 +320,4 @@ const AdminPanelUsers = () => {
   )
 }
 
-export default AdminPanelUsers
+export default ConsolePanelUsers
diff --git a/ui/src/pages/admin/admin-panel-workspaces.tsx b/ui/src/pages/console/console-panel-workspaces.tsx
similarity index 91%
rename from ui/src/pages/admin/admin-panel-workspaces.tsx
rename to ui/src/pages/console/console-panel-workspaces.tsx
index e6fbd4ae7..54537d155 100644
--- a/ui/src/pages/admin/admin-panel-workspaces.tsx
+++ b/ui/src/pages/console/console-panel-workspaces.tsx
@@ -28,16 +28,16 @@ import {
 import * as Yup from 'yup'
 import cx from 'classnames'
 import { Helmet } from 'react-helmet-async'
-import AdminApi, { WorkspaceManagementList } from '@/client/admin/admin'
-import AdminRenameModal from '@/components/admin/admin-rename-modal'
-import { adminWorkspacesPaginationStorage } from '@/infra/pagination'
+import ConsoleApi, { WorkspaceManagementList } from '@/client/console/console'
+import ConsoleRenameModal from '@/components/console/console-rename-modal'
+import { consoleWorkspacesPaginationStorage } from '@/infra/pagination'
 import { IconChevronDown, IconChevronUp } from '@/lib/components/icons'
 import PagePagination from '@/lib/components/page-pagination'
 import SectionSpinner from '@/lib/components/section-spinner'
 import prettyBytes from '@/lib/helpers/pretty-bytes'
 import usePagePagination from '@/lib/hooks/page-pagination'
 
-const AdminPanelWorkspaces = () => {
+const ConsolePanelWorkspaces = () => {
   const navigate = useNavigate()
   const location = useLocation()
   const [list, setList] = useState<WorkspaceManagementList | undefined>(
@@ -46,7 +46,7 @@ const AdminPanelWorkspaces = () => {
   const { page, size, steps, setPage, setSize } = usePagePagination({
     navigate,
     location,
-    storage: adminWorkspacesPaginationStorage(),
+    storage: consoleWorkspacesPaginationStorage(),
   })
   const [confirmRenameWindowOpen, setConfirmRenameWindowOpen] = useState(false)
   const [isSubmitting, setSubmitting] = useState(false)
@@ -65,7 +65,7 @@ const AdminPanelWorkspaces = () => {
     if (confirm && workspaceId !== undefined && newName !== null) {
       try {
         setSubmitting(true)
-        await AdminApi.renameObject(
+        await ConsoleApi.renameObject(
           { id: workspaceId, name: newName },
           'workspace',
         )
@@ -87,7 +87,7 @@ const AdminPanelWorkspaces = () => {
   }
 
   useEffect(() => {
-    AdminApi.listWorkspaces({ page: page, size: size }).then((value) =>
+    ConsoleApi.listWorkspaces({ page: page, size: size }).then((value) =>
       setList(value),
     )
   }, [page, size, isSubmitting])
@@ -98,7 +98,7 @@ const AdminPanelWorkspaces = () => {
 
   return (
     <>
-      <AdminRenameModal
+      <ConsoleRenameModal
         closeConfirmationWindow={closeConfirmationWindow}
         isOpen={confirmRenameWindowOpen}
         isSubmitting={isSubmitting}
@@ -135,7 +135,7 @@ const AdminPanelWorkspaces = () => {
                       <Button
                         onClick={() => {
                           navigate(
-                            `/admin/organizations/${workspace.organization.id}`,
+                            `/console/organizations/${workspace.organization.id}`,
                           )
                         }}
                       >
@@ -211,4 +211,4 @@ const AdminPanelWorkspaces = () => {
   )
 }
 
-export default AdminPanelWorkspaces
+export default ConsolePanelWorkspaces
diff --git a/ui/src/router.tsx b/ui/src/router.tsx
index 2d1968c04..35bfdd6d1 100644
--- a/ui/src/router.tsx
+++ b/ui/src/router.tsx
@@ -8,21 +8,21 @@
 // by the GNU Affero General Public License v3.0 only, included in the file
 // licenses/AGPL.txt.
 import { createBrowserRouter } from 'react-router-dom'
-import LayoutAdmin from '@/components/layout/layout-admin'
+import LayoutConsole from '@/components/layout/layout-console'
 import AccountInvitationsPage from '@/pages/account/account-invitations-page'
 import AccountLayout from '@/pages/account/account-layout'
 import AccountSettingsPage from '@/pages/account/account-settings-page'
-import AdminPanelDatabase from '@/pages/admin/admin-panel-database'
-import AdminPanelDatabaseIndexes from '@/pages/admin/admin-panel-database-indexes'
-import AdminPanelDatabaseOverview from '@/pages/admin/admin-panel-database-overview'
-import AdminPanelGroups from '@/pages/admin/admin-panel-groups'
-import AdminPanelInvitations from '@/pages/admin/admin-panel-invitations'
-import AdminPanelOrganization from '@/pages/admin/admin-panel-organization'
-import AdminPanelOrganizations from '@/pages/admin/admin-panel-organizations'
-import AdminPanelOverview from '@/pages/admin/admin-panel-overview'
-import AdminPanelUser from '@/pages/admin/admin-panel-user'
-import AdminPanelUsers from '@/pages/admin/admin-panel-users'
-import AdminPanelWorkspaces from '@/pages/admin/admin-panel-workspaces'
+import ConsolePanelDatabase from '@/pages/console/console-panel-database'
+import ConsolePanelDatabaseIndexes from '@/pages/console/console-panel-database-indexes'
+import ConsolePanelDatabaseOverview from '@/pages/console/console-panel-database-overview'
+import ConsolePanelGroups from '@/pages/console/console-panel-groups'
+import ConsolePanelInvitations from '@/pages/console/console-panel-invitations'
+import ConsolePanelOrganization from '@/pages/console/console-panel-organization'
+import ConsolePanelOrganizations from '@/pages/console/console-panel-organizations'
+import ConsolePanelOverview from '@/pages/console/console-panel-overview'
+import ConsolePanelUser from '@/pages/console/console-panel-user'
+import ConsolePanelUsers from '@/pages/console/console-panel-users'
+import ConsolePanelWorkspaces from '@/pages/console/console-panel-workspaces'
 import ConfirmEmailPage from '@/pages/confirm-email-page'
 import ForgotPasswordPage from '@/pages/forgot-password-page'
 import GroupLayout from '@/pages/group/group-layout'
@@ -177,54 +177,54 @@ const router = createBrowserRouter([
         element: <UpdateEmailPage />,
       },
       {
-        element: <LayoutAdmin />,
+        element: <LayoutConsole />,
         children: [
           {
-            path: '/admin/dashboard',
-            element: <AdminPanelOverview />,
+            path: '/console/dashboard',
+            element: <ConsolePanelOverview />,
           },
           {
-            path: '/admin/users',
-            element: <AdminPanelUsers />,
+            path: '/console/users',
+            element: <ConsolePanelUsers />,
           },
           {
-            path: '/admin/users/:id',
-            element: <AdminPanelUser />,
+            path: '/console/users/:id',
+            element: <ConsolePanelUser />,
           },
           {
-            path: 'admin/workspaces',
-            element: <AdminPanelWorkspaces />,
+            path: '/console/workspaces',
+            element: <ConsolePanelWorkspaces />,
           },
           {
-            path: 'admin/invitations',
-            element: <AdminPanelInvitations />,
+            path: '/console/invitations',
+            element: <ConsolePanelInvitations />,
           },
           {
-            path: 'admin/organizations',
-            element: <AdminPanelOrganizations />,
+            path: '/console/organizations',
+            element: <ConsolePanelOrganizations />,
           },
           {
-            path: 'admin/organizations/:id',
-            element: <AdminPanelOrganization />,
+            path: '/console/organizations/:id',
+            element: <ConsolePanelOrganization />,
           },
           {
-            path: 'admin/groups',
-            element: <AdminPanelGroups />,
+            path: '/console/groups',
+            element: <ConsolePanelGroups />,
           },
           {
-            element: <AdminPanelDatabase />,
+            element: <ConsolePanelDatabase />,
             children: [
               {
-                path: 'admin/database',
-                element: <AdminPanelDatabaseOverview />,
+                path: '/console/database',
+                element: <ConsolePanelDatabaseOverview />,
               },
               {
-                path: 'admin/database/overview',
-                element: <AdminPanelDatabaseOverview />,
+                path: '/console/database/overview',
+                element: <ConsolePanelDatabaseOverview />,
               },
               {
-                path: 'admin/database/indexes',
-                element: <AdminPanelDatabaseIndexes />,
+                path: '/console/database/indexes',
+                element: <ConsolePanelDatabaseIndexes />,
               },
             ],
           },
diff --git a/ui/src/store/ui/indexes.ts b/ui/src/store/ui/indexes.ts
index ab14cddcc..9d460508f 100644
--- a/ui/src/store/ui/indexes.ts
+++ b/ui/src/store/ui/indexes.ts
@@ -9,7 +9,7 @@
 // licenses/AGPL.txt.
 import { KeyedMutator } from 'swr'
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { IndexManagementList } from '@/client/admin/admin'
+import { IndexManagementList } from '@/client/console/console'
 
 type IndexesState = {
   mutate?: KeyedMutator<IndexManagementList>
diff --git a/ui/src/store/ui/nav.ts b/ui/src/store/ui/nav.ts
index b83994b48..0523e6b49 100644
--- a/ui/src/store/ui/nav.ts
+++ b/ui/src/store/ui/nav.ts
@@ -18,7 +18,7 @@ export enum NavType {
   Workspaces = 'workspaces',
   Groups = 'groups',
   Organizations = 'organizations',
-  Admin = 'admin',
+  Console = 'console',
 }
 
 const initialState: NavState = {
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index 0c3b4ed13..10e6d8632 100644
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -29,10 +29,10 @@ const config = ({ mode }) => {
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/proxy\/idp/, ''),
         },
-        '/proxy/admin/v1': {
-          target: process.env.ADMIN_URL,
+        '/proxy/console/v1': {
+          target: process.env.CONSOLE_URL,
           changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/proxy\/admin/, ''),
+          rewrite: (path) => path.replace(/^\/proxy\/console/, ''),
         },
       },
     },