diff --git a/src/KcApp.tsx b/src/KcApp.tsx
index e5ca6a8f..9c04548d 100644
--- a/src/KcApp.tsx
+++ b/src/KcApp.tsx
@@ -1,6 +1,6 @@
 import { lazy, Suspense } from "react";
 import { __unsafe_useI18n as useI18n } from "./i18n";
-import type { KcContextBase } from "./kcContext/KcContextBase";
+import type { KcContext } from "./kcContext/KcContext";
 import type { PageProps } from "keycloakify/pages/PageProps";
 import type { I18nBase } from "./i18n";
 import type { SetOptional } from "./tools/SetOptional";
@@ -29,7 +29,7 @@ const LogoutConfirm = lazy(() => import("keycloakify/pages/LogoutConfirm"));
 const UpdateUserProfile = lazy(() => import("keycloakify/pages/UpdateUserProfile"));
 const IdpReviewUserProfile = lazy(() => import("keycloakify/pages/IdpReviewUserProfile"));
 
-export default function KcApp(props_: SetOptional<PageProps<KcContextBase, I18nBase>, "Template">) {
+export default function KcApp(props_: SetOptional<PageProps<KcContext, I18nBase>, "Template">) {
     const { kcContext, i18n: userProvidedI18n, Template = DefaultTemplate, ...kcProps } = props_;
 
     const i18n = (function useClosure() {
diff --git a/src/Template.tsx b/src/Template.tsx
index 69aaa314..8ca049ac 100644
--- a/src/Template.tsx
+++ b/src/Template.tsx
@@ -3,7 +3,7 @@ import { clsx } from "keycloakify/tools/clsx";
 import { usePrepareTemplate } from "keycloakify/lib/usePrepareTemplate";
 import { type TemplateProps, defaultTemplateClasses } from "keycloakify/TemplateProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-type KcContext = import("./kcContext/KcContextBase").KcContextBase.Common;
+type KcContext = import("./kcContext/KcContext").KcContext.Common;
 import type { I18nBase as I18n } from "./i18n";
 
 export default function Template(props: TemplateProps<KcContext, I18n>) {
diff --git a/src/TemplateProps.ts b/src/TemplateProps.ts
index bc13f9b7..0ce86ccc 100644
--- a/src/TemplateProps.ts
+++ b/src/TemplateProps.ts
@@ -1,8 +1,8 @@
 import type { ReactNode } from "react";
-import type { KcContextBase } from "keycloakify/kcContext";
+import type { KcContext } from "keycloakify/kcContext";
 import type { I18nBase } from "keycloakify/i18n";
 
-export type TemplateProps<KcContext extends KcContextBase.Common, I18n extends I18nBase> = {
+export type TemplateProps<KcContext extends KcContext.Common, I18n extends I18nBase> = {
     kcContext: KcContext;
     i18n: I18n;
     doUseDefaultCss: boolean;
diff --git a/src/i18n/i18n.tsx b/src/i18n/i18n.tsx
index d2d4adab..19ecd29c 100644
--- a/src/i18n/i18n.tsx
+++ b/src/i18n/i18n.tsx
@@ -3,7 +3,7 @@ import "minimal-polyfills/Object.fromEntries";
 import { useEffect, useState, useRef } from "react";
 import type baseMessages from "./generated_messages/18.0.1/login/en";
 import { assert } from "tsafe/assert";
-import type { KcContextBase as KcContext } from "../kcContext/KcContextBase";
+import type { KcContext } from "../kcContext/KcContext";
 import { Markdown } from "../tools/Markdown";
 
 export const fallbackLanguageTag = "en";
diff --git a/src/kcContext/KcContextBase.ts b/src/kcContext/KcContext.ts
similarity index 94%
rename from src/kcContext/KcContextBase.ts
rename to src/kcContext/KcContext.ts
index d77c1ce0..a497c2fc 100644
--- a/src/kcContext/KcContextBase.ts
+++ b/src/kcContext/KcContext.ts
@@ -9,30 +9,30 @@ type ExtractAfterStartingWith<Prefix extends string, StrEnum> = StrEnum extends
  * Some values might be undefined on some pages.
  * (ex: url.loginAction is undefined on error.ftl)
  */
-export type KcContextBase =
-    | KcContextBase.Login
-    | KcContextBase.Register
-    | KcContextBase.RegisterUserProfile
-    | KcContextBase.Info
-    | KcContextBase.Error
-    | KcContextBase.LoginResetPassword
-    | KcContextBase.LoginVerifyEmail
-    | KcContextBase.Terms
-    | KcContextBase.LoginOtp
-    | KcContextBase.LoginUsername
-    | KcContextBase.WebauthnAuthenticate
-    | KcContextBase.LoginPassword
-    | KcContextBase.LoginUpdatePassword
-    | KcContextBase.LoginUpdateProfile
-    | KcContextBase.LoginIdpLinkConfirm
-    | KcContextBase.LoginIdpLinkEmail
-    | KcContextBase.LoginPageExpired
-    | KcContextBase.LoginConfigTotp
-    | KcContextBase.LogoutConfirm
-    | KcContextBase.UpdateUserProfile
-    | KcContextBase.IdpReviewUserProfile;
+export type KcContext =
+    | KcContext.Login
+    | KcContext.Register
+    | KcContext.RegisterUserProfile
+    | KcContext.Info
+    | KcContext.Error
+    | KcContext.LoginResetPassword
+    | KcContext.LoginVerifyEmail
+    | KcContext.Terms
+    | KcContext.LoginOtp
+    | KcContext.LoginUsername
+    | KcContext.WebauthnAuthenticate
+    | KcContext.LoginPassword
+    | KcContext.LoginUpdatePassword
+    | KcContext.LoginUpdateProfile
+    | KcContext.LoginIdpLinkConfirm
+    | KcContext.LoginIdpLinkEmail
+    | KcContext.LoginPageExpired
+    | KcContext.LoginConfigTotp
+    | KcContext.LogoutConfirm
+    | KcContext.UpdateUserProfile
+    | KcContext.IdpReviewUserProfile;
 
-export declare namespace KcContextBase {
+export declare namespace KcContext {
     export type Common = {
         url: {
             loginAction: string;
@@ -496,4 +496,4 @@ export declare namespace Validators {
     };
 }
 
-assert<Equals<KcContextBase["pageId"], PageId>>();
+assert<Equals<KcContext["pageId"], PageId>>();
diff --git a/src/kcContext/getKcContext.ts b/src/kcContext/getKcContext.ts
index f2fe0fe4..c0d96c36 100644
--- a/src/kcContext/getKcContext.ts
+++ b/src/kcContext/getKcContext.ts
@@ -1,24 +1,24 @@
-import type { KcContextBase, Attribute } from "./KcContextBase";
+import type { KcContext, Attribute } from "./KcContext";
 import { kcContextMocks, kcContextCommonMock } from "./kcContextMocks";
 import type { DeepPartial } from "../tools/DeepPartial";
 import { deepAssign } from "../tools/deepAssign";
 import { id } from "tsafe/id";
 import { exclude } from "tsafe/exclude";
 import { assert } from "tsafe/assert";
-import type { ExtendsKcContextBase } from "./getKcContextFromWindow";
+import type { ExtendsKcContext } from "./getKcContextFromWindow";
 import { getKcContextFromWindow } from "./getKcContextFromWindow";
 import { pathJoin } from "../bin/tools/pathJoin";
 import { pathBasename } from "../tools/pathBasename";
 import { mockTestingResourcesCommonPath } from "../bin/mockTestingResourcesPath";
 import { symToStr } from "tsafe/symToStr";
 
-export function getKcContext<KcContextExtended extends { pageId: string } = never>(params?: {
-    mockPageId?: ExtendsKcContextBase<KcContextExtended>["pageId"];
-    mockData?: readonly DeepPartial<ExtendsKcContextBase<KcContextExtended>>[];
-}): { kcContext: ExtendsKcContextBase<KcContextExtended> | undefined } {
+export function getKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
+    mockPageId?: ExtendsKcContext<KcContextExtension>["pageId"];
+    mockData?: readonly DeepPartial<ExtendsKcContext<KcContextExtension>>[];
+}): { kcContext: ExtendsKcContext<KcContextExtension> | undefined } {
     const { mockPageId, mockData } = params ?? {};
 
-    const realKcContext = getKcContextFromWindow<KcContextExtended>();
+    const realKcContext = getKcContextFromWindow<KcContextExtension>();
 
     if (mockPageId !== undefined && realKcContext === undefined) {
         //TODO maybe trow if no mock fo custom page
@@ -71,11 +71,11 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
 
                 const { attributes } = kcContextDefaultMock.profile;
 
-                id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributes = [];
-                id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributesByName = {};
+                id<KcContext.RegisterUserProfile>(kcContext).profile.attributes = [];
+                id<KcContext.RegisterUserProfile>(kcContext).profile.attributesByName = {};
 
                 const partialAttributes = [
-                    ...((partialKcContextCustomMock as DeepPartial<KcContextBase.RegisterUserProfile>).profile?.attributes ?? [])
+                    ...((partialKcContextCustomMock as DeepPartial<KcContext.RegisterUserProfile>).profile?.attributes ?? [])
                 ].filter(exclude(undefined));
 
                 attributes.forEach(attribute => {
@@ -97,8 +97,8 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
                         });
                     }
 
-                    id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributes.push(augmentedAttribute);
-                    id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributesByName[augmentedAttribute.name] = augmentedAttribute;
+                    id<KcContext.RegisterUserProfile>(kcContext).profile.attributes.push(augmentedAttribute);
+                    id<KcContext.RegisterUserProfile>(kcContext).profile.attributesByName[augmentedAttribute.name] = augmentedAttribute;
                 });
 
                 partialAttributes
@@ -108,8 +108,8 @@ export function getKcContext<KcContextExtended extends { pageId: string } = neve
 
                         assert(name !== undefined, "If you define a mock attribute it must have at least a name");
 
-                        id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributes.push(partialAttribute as any);
-                        id<KcContextBase.RegisterUserProfile>(kcContext).profile.attributesByName[name] = partialAttribute as any;
+                        id<KcContext.RegisterUserProfile>(kcContext).profile.attributes.push(partialAttribute as any);
+                        id<KcContext.RegisterUserProfile>(kcContext).profile.attributesByName[name] = partialAttribute as any;
                     });
             }
         }
diff --git a/src/kcContext/getKcContextFromWindow.ts b/src/kcContext/getKcContextFromWindow.ts
index 93d2aeab..8bd73867 100644
--- a/src/kcContext/getKcContextFromWindow.ts
+++ b/src/kcContext/getKcContextFromWindow.ts
@@ -1,11 +1,11 @@
-import type { KcContextBase } from "./KcContextBase";
+import type { KcContext } from "./KcContext";
 import type { AndByDiscriminatingKey } from "../tools/AndByDiscriminatingKey";
 import { ftlValuesGlobalName } from "../bin/keycloakify/ftlValuesGlobalName";
 
-export type ExtendsKcContextBase<KcContextExtended extends { pageId: string }> = [KcContextExtended] extends [never]
-    ? KcContextBase
-    : AndByDiscriminatingKey<"pageId", KcContextExtended & KcContextBase.Common, KcContextBase>;
+export type ExtendsKcContext<KcContextExtension extends { pageId: string }> = [KcContextExtension] extends [never]
+    ? KcContext
+    : AndByDiscriminatingKey<"pageId", KcContextExtension & KcContext.Common, KcContext>;
 
-export function getKcContextFromWindow<KcContextExtended extends { pageId: string } = never>(): ExtendsKcContextBase<KcContextExtended> | undefined {
+export function getKcContextFromWindow<KcContextExtension extends { pageId: string } = never>(): ExtendsKcContext<KcContextExtension> | undefined {
     return typeof window === "undefined" ? undefined : (window as any)[ftlValuesGlobalName];
 }
diff --git a/src/kcContext/index.ts b/src/kcContext/index.ts
index 54458cdc..3afd0aff 100644
--- a/src/kcContext/index.ts
+++ b/src/kcContext/index.ts
@@ -1,3 +1,3 @@
-export type { KcContextBase, Attribute, Validators } from "./KcContextBase";
-export type { ExtendsKcContextBase } from "./getKcContextFromWindow";
+export type { KcContext, Attribute, Validators } from "./KcContext";
+export type { ExtendsKcContext } from "./getKcContextFromWindow";
 export { getKcContext } from "./getKcContext";
diff --git a/src/kcContext/kcContextMocks.ts b/src/kcContext/kcContextMocks.ts
index 2d703d32..c3d33d46 100644
--- a/src/kcContext/kcContextMocks.ts
+++ b/src/kcContext/kcContextMocks.ts
@@ -1,5 +1,5 @@
 import "minimal-polyfills/Object.fromEntries";
-import type { KcContextBase, Attribute } from "./KcContextBase";
+import type { KcContext, Attribute } from "./KcContext";
 //NOTE: Aside because we want to be able to import them from node
 import { mockTestingResourcesCommonPath, mockTestingResourcesPath } from "../bin/mockTestingResourcesPath";
 import { id } from "tsafe/id";
@@ -101,7 +101,7 @@ const attributes: Attribute[] = [
 
 const attributesByName = Object.fromEntries(attributes.map(attribute => [attribute.name, attribute])) as any;
 
-export const kcContextCommonMock: KcContextBase.Common = {
+export const kcContextCommonMock: KcContext.Common = {
     "url": {
         "loginAction": "#",
         "resourcesPath": pathJoin(PUBLIC_URL, mockTestingResourcesPath),
@@ -244,8 +244,8 @@ const loginUrl = {
     "registrationUrl": "/auth/realms/myrealm/login-actions/registration?client_id=account&tab_id=HoAx28ja4xg"
 };
 
-export const kcContextMocks: KcContextBase[] = [
-    id<KcContextBase.Login>({
+export const kcContextMocks: KcContext[] = [
+    id<KcContext.Login>({
         ...kcContextCommonMock,
         "pageId": "login.ftl",
         "url": loginUrl,
@@ -268,7 +268,7 @@ export const kcContextMocks: KcContextBase[] = [
         "registrationDisabled": false
     }),
     ...(() => {
-        const registerCommon: KcContextBase.RegisterUserProfile.CommonWithLegacy = {
+        const registerCommon: KcContext.RegisterUserProfile.CommonWithLegacy = {
             ...kcContextCommonMock,
             "url": {
                 ...loginUrl,
@@ -285,14 +285,14 @@ export const kcContextMocks: KcContextBase[] = [
         };
 
         return [
-            id<KcContextBase.Register>({
+            id<KcContext.Register>({
                 "pageId": "register.ftl",
                 ...registerCommon,
                 "register": {
                     "formData": {}
                 }
             }),
-            id<KcContextBase.RegisterUserProfile>({
+            id<KcContext.RegisterUserProfile>({
                 "pageId": "register-user-profile.ftl",
                 ...registerCommon,
                 "profile": {
@@ -303,7 +303,7 @@ export const kcContextMocks: KcContextBase[] = [
             })
         ];
     })(),
-    id<KcContextBase.Info>({
+    id<KcContext.Info>({
         ...kcContextCommonMock,
         "pageId": "info.ftl",
         "messageHeader": "<Message header>",
@@ -315,7 +315,7 @@ export const kcContextMocks: KcContextBase[] = [
             "baseUrl": "#"
         }
     }),
-    id<KcContextBase.Error>({
+    id<KcContext.Error>({
         ...kcContextCommonMock,
         "pageId": "error.ftl",
         "client": {
@@ -327,7 +327,7 @@ export const kcContextMocks: KcContextBase[] = [
             "summary": "This is the error message"
         }
     }),
-    id<KcContextBase.LoginResetPassword>({
+    id<KcContext.LoginResetPassword>({
         ...kcContextCommonMock,
         "pageId": "login-reset-password.ftl",
         "realm": {
@@ -335,18 +335,18 @@ export const kcContextMocks: KcContextBase[] = [
             "loginWithEmailAllowed": false
         }
     }),
-    id<KcContextBase.LoginVerifyEmail>({
+    id<KcContext.LoginVerifyEmail>({
         ...kcContextCommonMock,
         "pageId": "login-verify-email.ftl",
         "user": {
             "email": "john.doe@gmail.com"
         }
     }),
-    id<KcContextBase.Terms>({
+    id<KcContext.Terms>({
         ...kcContextCommonMock,
         "pageId": "terms.ftl"
     }),
-    id<KcContextBase.LoginOtp>({
+    id<KcContext.LoginOtp>({
         ...kcContextCommonMock,
         "pageId": "login-otp.ftl",
         "otpLogin": {
@@ -362,7 +362,7 @@ export const kcContextMocks: KcContextBase[] = [
             ]
         }
     }),
-    id<KcContextBase.LoginUsername>({
+    id<KcContext.LoginUsername>({
         ...kcContextCommonMock,
         "pageId": "login-username.ftl",
         "url": loginUrl,
@@ -383,7 +383,7 @@ export const kcContextMocks: KcContextBase[] = [
         },
         "registrationDisabled": false
     }),
-    id<KcContextBase.LoginPassword>({
+    id<KcContext.LoginPassword>({
         ...kcContextCommonMock,
         "pageId": "login-password.ftl",
         "url": loginUrl,
@@ -396,7 +396,7 @@ export const kcContextMocks: KcContextBase[] = [
         },
         "login": {}
     }),
-    id<KcContextBase.WebauthnAuthenticate>({
+    id<KcContext.WebauthnAuthenticate>({
         ...kcContextCommonMock,
         "pageId": "webauthn-authenticate.ftl",
         "url": loginUrl,
@@ -417,12 +417,12 @@ export const kcContextMocks: KcContextBase[] = [
         },
         "login": {}
     }),
-    id<KcContextBase.LoginUpdatePassword>({
+    id<KcContext.LoginUpdatePassword>({
         ...kcContextCommonMock,
         "pageId": "login-update-password.ftl",
         "username": "anUsername"
     }),
-    id<KcContextBase.LoginUpdateProfile>({
+    id<KcContext.LoginUpdateProfile>({
         ...kcContextCommonMock,
         "pageId": "login-update-profile.ftl",
         "user": {
@@ -433,12 +433,12 @@ export const kcContextMocks: KcContextBase[] = [
             "lastName": "aLastName"
         }
     }),
-    id<KcContextBase.LoginIdpLinkConfirm>({
+    id<KcContext.LoginIdpLinkConfirm>({
         ...kcContextCommonMock,
         "pageId": "login-idp-link-confirm.ftl",
         "idpAlias": "FranceConnect"
     }),
-    id<KcContextBase.LoginIdpLinkEmail>({
+    id<KcContext.LoginIdpLinkEmail>({
         ...kcContextCommonMock,
         "pageId": "login-idp-link-email.ftl",
         "idpAlias": "FranceConnect",
@@ -446,7 +446,7 @@ export const kcContextMocks: KcContextBase[] = [
             "username": "anUsername"
         }
     }),
-    id<KcContextBase.LoginConfigTotp>({
+    id<KcContext.LoginConfigTotp>({
         ...kcContextCommonMock,
         "pageId": "login-config-totp.ftl",
         totp: {
@@ -467,7 +467,7 @@ export const kcContextMocks: KcContextBase[] = [
             }
         }
     }),
-    id<KcContextBase.LogoutConfirm>({
+    id<KcContext.LogoutConfirm>({
         ...kcContextCommonMock,
         "pageId": "logout-confirm.ftl",
         "url": {
@@ -480,7 +480,7 @@ export const kcContextMocks: KcContextBase[] = [
         },
         "logoutConfirm": { "code": "123", skipLink: false }
     }),
-    id<KcContextBase.UpdateUserProfile>({
+    id<KcContext.UpdateUserProfile>({
         ...kcContextCommonMock,
         "pageId": "update-user-profile.ftl",
         "profile": {
@@ -488,7 +488,7 @@ export const kcContextMocks: KcContextBase[] = [
             attributesByName
         }
     }),
-    id<KcContextBase.IdpReviewUserProfile>({
+    id<KcContext.IdpReviewUserProfile>({
         ...kcContextCommonMock,
         "pageId": "idp-review-user-profile.ftl",
         "profile": {
diff --git a/src/lib/useDownloadTerms.ts b/src/lib/useDownloadTerms.ts
index 20ece8f7..2ffe063e 100644
--- a/src/lib/useDownloadTerms.ts
+++ b/src/lib/useDownloadTerms.ts
@@ -4,7 +4,7 @@ import { fallbackLanguageTag } from "../i18n";
 import { useConst } from "../tools/useConst";
 import { useConstCallback } from "../tools/useConstCallback";
 import { assert } from "tsafe/assert";
-import { KcContextBase as KcContext } from "../kcContext";
+import { KcContext } from "../kcContext";
 import { Evt } from "evt";
 
 export const evtTermMarkdown = Evt.create<string | undefined>(undefined);
diff --git a/src/lib/useFormValidation.tsx b/src/lib/useFormValidation.tsx
index 73190cf1..a84bb2f9 100644
--- a/src/lib/useFormValidation.tsx
+++ b/src/lib/useFormValidation.tsx
@@ -5,7 +5,7 @@ import type { MessageKeyBase } from "keycloakify/i18n";
 import type { Attribute, Validators } from "keycloakify/kcContext";
 import { useConstCallback } from "keycloakify/tools/useConstCallback";
 import { emailRegexp } from "keycloakify/tools/emailRegExp";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 /**
diff --git a/src/pages/Error.tsx b/src/pages/Error.tsx
index 477ca9ed..090789f1 100644
--- a/src/pages/Error.tsx
+++ b/src/pages/Error.tsx
@@ -1,5 +1,5 @@
 import { type PageProps } from "keycloakify/pages/PageProps";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function Error(props: PageProps<Extract<KcContext, { pageId: "error.ftl" }>, I18n>) {
diff --git a/src/pages/IdpReviewUserProfile.tsx b/src/pages/IdpReviewUserProfile.tsx
index b9f51ae0..3220c4e9 100644
--- a/src/pages/IdpReviewUserProfile.tsx
+++ b/src/pages/IdpReviewUserProfile.tsx
@@ -3,7 +3,7 @@ import { clsx } from "keycloakify/tools/clsx";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function IdpReviewUserProfile(props: PageProps<Extract<KcContext, { pageId: "idp-review-user-profile.ftl" }>, I18n>) {
diff --git a/src/pages/Info.tsx b/src/pages/Info.tsx
index 6ec09bcd..d3cfbf1d 100644
--- a/src/pages/Info.tsx
+++ b/src/pages/Info.tsx
@@ -1,6 +1,6 @@
 import { assert } from "../tools/assert";
 import { type PageProps } from "keycloakify/pages/PageProps";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function Info(props: PageProps<Extract<KcContext, { pageId: "info.ftl" }>, I18n>) {
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 3edc7c0d..f372aab1 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -3,7 +3,7 @@ import { clsx } from "keycloakify/tools/clsx";
 import { useConstCallback } from "../tools/useConstCallback";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function Login(props: PageProps<Extract<KcContext, { pageId: "login.ftl" }>, I18n>) {
diff --git a/src/pages/LoginConfigTotp.tsx b/src/pages/LoginConfigTotp.tsx
index 1d34ee95..33199959 100644
--- a/src/pages/LoginConfigTotp.tsx
+++ b/src/pages/LoginConfigTotp.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginConfigTotp(props: PageProps<Extract<KcContext, { pageId: "login-config-totp.ftl" }>, I18n>) {
diff --git a/src/pages/LoginIdpLinkConfirm.tsx b/src/pages/LoginIdpLinkConfirm.tsx
index 88923487..288c1f75 100644
--- a/src/pages/LoginIdpLinkConfirm.tsx
+++ b/src/pages/LoginIdpLinkConfirm.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginIdpLinkConfirm(props: PageProps<Extract<KcContext, { pageId: "login-idp-link-confirm.ftl" }>, I18n>) {
diff --git a/src/pages/LoginIdpLinkEmail.tsx b/src/pages/LoginIdpLinkEmail.tsx
index eb78889c..07342081 100644
--- a/src/pages/LoginIdpLinkEmail.tsx
+++ b/src/pages/LoginIdpLinkEmail.tsx
@@ -1,4 +1,4 @@
-import type { KcContextBase as KcContext } from "keycloakify/kcContext";
+import type { KcContext } from "keycloakify/kcContext";
 import { type PageProps } from "keycloakify/pages/PageProps";
 import type { I18nBase as I18n } from "keycloakify/i18n";
 
diff --git a/src/pages/LoginOtp.tsx b/src/pages/LoginOtp.tsx
index fbdddb83..55250e25 100644
--- a/src/pages/LoginOtp.tsx
+++ b/src/pages/LoginOtp.tsx
@@ -4,7 +4,7 @@ import { pathJoin } from "../bin/tools/pathJoin";
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginOtp(props: PageProps<Extract<KcContext, { pageId: "login-otp.ftl" }>, I18n>) {
diff --git a/src/pages/LoginPageExpired.tsx b/src/pages/LoginPageExpired.tsx
index 62800daa..7fe89fe0 100644
--- a/src/pages/LoginPageExpired.tsx
+++ b/src/pages/LoginPageExpired.tsx
@@ -1,5 +1,5 @@
 import { type PageProps } from "keycloakify/pages/PageProps";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginPageExpired(props: PageProps<Extract<KcContext, { pageId: "login-page-expired.ftl" }>, I18n>) {
diff --git a/src/pages/LoginPassword.tsx b/src/pages/LoginPassword.tsx
index c0e88760..a18000cc 100644
--- a/src/pages/LoginPassword.tsx
+++ b/src/pages/LoginPassword.tsx
@@ -4,7 +4,7 @@ import { useConstCallback } from "../tools/useConstCallback";
 import type { FormEventHandler } from "react";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginPassword(props: PageProps<Extract<KcContext, { "pageId": "login-password.ftl" }>, I18n>) {
diff --git a/src/pages/LoginResetPassword.tsx b/src/pages/LoginResetPassword.tsx
index 5c67ef20..0507690b 100644
--- a/src/pages/LoginResetPassword.tsx
+++ b/src/pages/LoginResetPassword.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginResetPassword(props: PageProps<Extract<KcContext, { pageId: "login-reset-password.ftl" }>, I18n>) {
diff --git a/src/pages/LoginUpdatePassword.tsx b/src/pages/LoginUpdatePassword.tsx
index 7b9289d3..c62affb6 100644
--- a/src/pages/LoginUpdatePassword.tsx
+++ b/src/pages/LoginUpdatePassword.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginUpdatePassword(props: PageProps<Extract<KcContext, { pageId: "login-update-password.ftl" }>, I18n>) {
diff --git a/src/pages/LoginUpdateProfile.tsx b/src/pages/LoginUpdateProfile.tsx
index 64f00125..193719d7 100644
--- a/src/pages/LoginUpdateProfile.tsx
+++ b/src/pages/LoginUpdateProfile.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginUpdateProfile(props: PageProps<Extract<KcContext, { pageId: "login-update-profile.ftl" }>, I18n>) {
diff --git a/src/pages/LoginUsername.tsx b/src/pages/LoginUsername.tsx
index dc1c4027..2e87715a 100644
--- a/src/pages/LoginUsername.tsx
+++ b/src/pages/LoginUsername.tsx
@@ -4,7 +4,7 @@ import { useConstCallback } from "../tools/useConstCallback";
 import type { FormEventHandler } from "react";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginUsername(props: PageProps<Extract<KcContext, { pageId: "login-username.ftl" }>, I18n>) {
diff --git a/src/pages/LoginVerifyEmail.tsx b/src/pages/LoginVerifyEmail.tsx
index fa5c4288..d16af376 100644
--- a/src/pages/LoginVerifyEmail.tsx
+++ b/src/pages/LoginVerifyEmail.tsx
@@ -1,5 +1,5 @@
 import { type PageProps } from "keycloakify/pages/PageProps";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LoginVerifyEmail(props: PageProps<Extract<KcContext, { pageId: "login-verify-email.ftl" }>, I18n>) {
diff --git a/src/pages/LogoutConfirm.tsx b/src/pages/LogoutConfirm.tsx
index 3e114f07..463717c4 100644
--- a/src/pages/LogoutConfirm.tsx
+++ b/src/pages/LogoutConfirm.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function LogoutConfirm(props: PageProps<Extract<KcContext, { pageId: "logout-confirm.ftl" }>, I18n>) {
diff --git a/src/pages/Register.tsx b/src/pages/Register.tsx
index 82a47178..f880233c 100644
--- a/src/pages/Register.tsx
+++ b/src/pages/Register.tsx
@@ -1,7 +1,7 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function Register(props: PageProps<Extract<KcContext, { pageId: "register.ftl" }>, I18n>) {
diff --git a/src/pages/RegisterUserProfile.tsx b/src/pages/RegisterUserProfile.tsx
index 1127c52f..814baf3d 100644
--- a/src/pages/RegisterUserProfile.tsx
+++ b/src/pages/RegisterUserProfile.tsx
@@ -3,7 +3,7 @@ import { clsx } from "keycloakify/tools/clsx";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function RegisterUserProfile(props: PageProps<Extract<KcContext, { pageId: "register-user-profile.ftl" }>, I18n>) {
diff --git a/src/pages/Terms.tsx b/src/pages/Terms.tsx
index ba4ff869..e536462f 100644
--- a/src/pages/Terms.tsx
+++ b/src/pages/Terms.tsx
@@ -4,7 +4,7 @@ import { Markdown } from "../tools/Markdown";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
 import { evtTermMarkdown } from "keycloakify/lib/useDownloadTerms";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function Terms(props: PageProps<Extract<KcContext, { pageId: "terms.ftl" }>, I18n>) {
diff --git a/src/pages/UpdateUserProfile.tsx b/src/pages/UpdateUserProfile.tsx
index e0fbf5f8..7b540ddc 100644
--- a/src/pages/UpdateUserProfile.tsx
+++ b/src/pages/UpdateUserProfile.tsx
@@ -3,7 +3,7 @@ import { clsx } from "keycloakify/tools/clsx";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function UpdateUserProfile(props: PageProps<Extract<KcContext, { pageId: "update-user-profile.ftl" }>, I18n>) {
diff --git a/src/pages/WebauthnAuthenticate.tsx b/src/pages/WebauthnAuthenticate.tsx
index 62b48e97..98d4e231 100644
--- a/src/pages/WebauthnAuthenticate.tsx
+++ b/src/pages/WebauthnAuthenticate.tsx
@@ -5,7 +5,7 @@ import { base64url } from "rfc4648";
 import { useConstCallback } from "../tools/useConstCallback";
 import { type PageProps, defaultClasses } from "keycloakify/pages/PageProps";
 import { useGetClassName } from "keycloakify/lib/useGetClassName";
-import type { KcContextBase as KcContext } from "../kcContext";
+import type { KcContext } from "../kcContext";
 import type { I18nBase as I18n } from "../i18n";
 
 export default function WebauthnAuthenticate(props: PageProps<Extract<KcContext, { pageId: "webauthn-authenticate.ftl" }>, I18n>) {
diff --git a/test/lib/getKcContext.ts b/test/lib/getKcContext.ts
index 71f7b6e6..1485d9bf 100644
--- a/test/lib/getKcContext.ts
+++ b/test/lib/getKcContext.ts
@@ -1,6 +1,6 @@
 import { getKcContext } from "../../src/kcContext";
-import type { KcContextBase } from "../../src/kcContext";
-import type { ExtendsKcContextBase } from "../../src/kcContext";
+import type { KcContext } from "../../src/kcContext";
+import type { ExtendsKcContext } from "../../src/kcContext";
 import { same } from "evt/tools/inDepth";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
@@ -32,7 +32,7 @@ import { deepClone } from "../../src/tools/deepClone";
               aNonStandardValue2: string;
           };
 
-    const getKcContextProxy = (params: { mockPageId: ExtendsKcContextBase<KcContextExtended>["pageId"] }) => {
+    const getKcContextProxy = (params: { mockPageId: ExtendsKcContext<KcContextExtended>["pageId"] }) => {
         const { mockPageId } = params;
 
         const { kcContext } = getKcContext<KcContextExtended>({
@@ -67,7 +67,7 @@ import { deepClone } from "../../src/tools/deepClone";
 
         assert(kcContext?.pageId === pageId);
 
-        assert<Equals<typeof kcContext, KcContextBase.Login>>();
+        assert<Equals<typeof kcContext, KcContext.Login>>();
 
         assert(
             same(
@@ -97,7 +97,7 @@ import { deepClone } from "../../src/tools/deepClone";
         assert<
             Equals<
                 typeof kcContext,
-                KcContextBase.Info & {
+                KcContext.Info & {
                     pageId: typeof pageId;
                     aNonStandardValue1: string;
                 }
@@ -131,7 +131,7 @@ import { deepClone } from "../../src/tools/deepClone";
         assert<
             Equals<
                 typeof kcContext,
-                KcContextBase.Register & {
+                KcContext.Register & {
                     pageId: typeof pageId;
                     authorizedMailDomains: string[];
                 }
@@ -164,7 +164,7 @@ import { deepClone } from "../../src/tools/deepClone";
         assert<
             Equals<
                 typeof kcContext,
-                KcContextBase.Common & {
+                KcContext.Common & {
                     pageId: typeof pageId;
                     aNonStandardValue2: string;
                 }
@@ -198,7 +198,7 @@ import { deepClone } from "../../src/tools/deepClone";
 
         assert(kcContext?.pageId === pageId);
 
-        assert<Equals<typeof kcContext, KcContextBase.Common & { pageId: typeof pageId }>>();
+        assert<Equals<typeof kcContext, KcContext.Common & { pageId: typeof pageId }>>();
 
         assert(
             same(
@@ -224,7 +224,7 @@ import { deepClone } from "../../src/tools/deepClone";
         "mockPageId": pageId
     });
 
-    assert<Equals<typeof kcContext, KcContextBase | undefined>>();
+    assert<Equals<typeof kcContext, KcContext | undefined>>();
 
     assert(same(deepClone(kcContext), deepClone(kcContextMocks.find(({ pageId: pageId_i }) => pageId_i === pageId)!)));
 
@@ -234,7 +234,7 @@ import { deepClone } from "../../src/tools/deepClone";
 {
     const { kcContext } = getKcContext();
 
-    assert<Equals<typeof kcContext, KcContextBase | undefined>>();
+    assert<Equals<typeof kcContext, KcContext | undefined>>();
 
     assert(kcContext === undefined);
 
diff --git a/test/lib/index.ts b/test/lib/index.ts
index 1bffaa17..8df0b5d4 100644
--- a/test/lib/index.ts
+++ b/test/lib/index.ts
@@ -1 +1 @@
-import "./kcContext";
+import "./getKcContext";