diff --git a/.changeset/mosaic-localization-key-tree.md b/.changeset/mosaic-localization-key-tree.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/mosaic-localization-key-tree.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/mosaic/ARCHITECTURE.md b/packages/mosaic/ARCHITECTURE.md
index 4e892d1270e..2236b7ca16a 100644
--- a/packages/mosaic/ARCHITECTURE.md
+++ b/packages/mosaic/ARCHITECTURE.md
@@ -204,8 +204,10 @@ user-button.styles.ts        // `stylex.create` atoms (see the StyleX authoring
 model nor the view owns it, and the two cannot drift.
 
 `*.messages.ts` holds strings only, exported as one `<feature>Messages` object
-declared `as const` and registered under a namespace in `src/localization/registry.ts`.
-Views read their namespace inside the component with `useMessages('userButton')`, so
+declared `as const` and mounted in `src/localization/registry.ts` under the public
+component it belongs to, such as `userProfile.mfa.backupCodes`. A root is a public
+component or a shared block, never a file name. Views read their root inside the
+component with `useMessages('userProfile').mfa`, so
 the `localization` prop on `MosaicProvider` can replace any string; a module-level
 helper takes the messages as a parameter rather than importing them.
 
@@ -243,6 +245,19 @@ so a consumer's overrides type-check against the real keys, as a dot path
 Renaming or moving a key breaks every override that names it; treat it like renaming
 a prop.
 
+The key tree follows what the user sees, so a key can be found from the screen:
+
+- A root is a public component (`userProfile`) or a shared block (`form`, `errors`).
+  There is no `common` root. The same English in two components is two keys,
+  because a translation may need to differ by context.
+- Below the root, keys nest by section, then by the dialog or step inside it:
+  `userProfile.email.addDialog`, `userProfile.email.removeDialog`.
+- Copy that several views render through one shared component belongs to that
+  component (`userProfile.contact` for the row both email and phone use).
+- Every segment is camelCase. A map keyed by data ids (`errors`, `roles`,
+  `userProfile.mfa.methods`) keeps the ids as its keys;
+  `src/localization/__tests__/registry.test.ts` lists those maps and checks the rest.
+
 ### Composition
 
 Two shapes, chosen by whether the slice fetches its own data.
diff --git a/packages/mosaic/docs/views.md b/packages/mosaic/docs/views.md
index 9b58f75ec1e..3d20e6fb13f 100644
--- a/packages/mosaic/docs/views.md
+++ b/packages/mosaic/docs/views.md
@@ -48,13 +48,26 @@ Every string a view renders comes from the feature's `*.messages.ts`, shaped the
 way `@clerk/i18n` takes a base definition. A plural message is its forms; a
 parameterized one is its template.
 
-Register the file as a namespace in `src/localization/registry.ts`, then read it
-with `useMessages` in the view or controller that renders it:
+To add copy for a new section, step or dialog:
+
+1. Put the strings in the `*.messages.ts` next to the view that renders them. Name
+   each key for what the string is (`label`, `resend`, `confirm`), not where it
+   sits in the markup.
+2. Mount the object in `src/localization/registry.ts` under the public component
+   the user sees it in: a section of `UserProfile` goes at `userProfile.<section>`,
+   and a dialog inside it at `userProfile.<section>.addDialog` or `.removeDialog`.
+   Copy two views share goes under the component that renders it, never under a
+   new `common` root.
+3. Read it with `useMessages` and the root, in the view or controller that
+   renders it:
 
 ```tsx
-const m = useMessages('userButton');
+const m = useMessages('userProfile').mfa;
 ```
 
+The rules behind these steps are in [ARCHITECTURE.md](../ARCHITECTURE.md), and
+`src/localization/__tests__/registry.test.ts` fails on a key that is not camelCase.
+
 Never import a `*.messages.ts` directly. A direct import skips the customer's
 locale and overrides, so the copy can't be localized.
 
diff --git a/packages/mosaic/src/features/api-keys/__tests__/api-keys-table.feature.test.tsx b/packages/mosaic/src/features/api-keys/__tests__/api-keys-table.feature.test.tsx
index 9da43587fb7..44d86062fd8 100644
--- a/packages/mosaic/src/features/api-keys/__tests__/api-keys-table.feature.test.tsx
+++ b/packages/mosaic/src/features/api-keys/__tests__/api-keys-table.feature.test.tsx
@@ -247,9 +247,9 @@ describe('APIKeysTable', () => {
         <MosaicProvider
           localization={{
             overrides: {
-              'apiKeysTable.search': 'Find a key',
-              'apiKeysTable.expires': 'Expiration: {expiresDate}',
-              'apiKeysTable.revokeTitle': 'Retirer {name} ?',
+              'apiKeys.search': 'Find a key',
+              'apiKeys.expires': 'Expiration: {expiresDate}',
+              'apiKeys.revokeTitle': 'Retirer {name} ?',
             },
           }}
         >
diff --git a/packages/mosaic/src/features/api-keys/api-keys-table.messages.ts b/packages/mosaic/src/features/api-keys/api-keys-table.messages.ts
index eedc49ae070..37e2f21d815 100644
--- a/packages/mosaic/src/features/api-keys/api-keys-table.messages.ts
+++ b/packages/mosaic/src/features/api-keys/api-keys-table.messages.ts
@@ -69,7 +69,7 @@ export const apiKeysTableMessages = {
 } as const;
 
 export function resolveAPIKeysTableMessages(
-  catalog: MosaicMessages['apiKeysTable'],
+  catalog: MosaicMessages['apiKeys'],
   subjectKind: APIKeysTableSubjectKind,
   overrides?: Partial<APIKeysTableMessages>,
 ): APIKeysTableMessages {
diff --git a/packages/mosaic/src/features/api-keys/api-keys-table.tsx b/packages/mosaic/src/features/api-keys/api-keys-table.tsx
index d89ff58592f..264dc047e80 100644
--- a/packages/mosaic/src/features/api-keys/api-keys-table.tsx
+++ b/packages/mosaic/src/features/api-keys/api-keys-table.tsx
@@ -38,7 +38,7 @@ function SubjectAPIKeysTable({
   fallback,
 }: APIKeysTableProps) {
   const messages = resolveAPIKeysTableMessages(
-    useMessages('apiKeysTable'),
+    useMessages('apiKeys'),
     isOrganizationId(subject) ? 'organization' : 'user',
     overrides,
   );
diff --git a/packages/mosaic/src/features/api-keys/api-keys-table.types.ts b/packages/mosaic/src/features/api-keys/api-keys-table.types.ts
index 7611966a521..165fb1ca52c 100644
--- a/packages/mosaic/src/features/api-keys/api-keys-table.types.ts
+++ b/packages/mosaic/src/features/api-keys/api-keys-table.types.ts
@@ -20,7 +20,7 @@ export type APIKeysTableSubjectKind = 'user' | 'organization';
 
 type Strings<T> = { readonly [K in keyof T]: T[K] extends string ? string : Strings<T[K]> };
 
-export type APIKeysTableMessages = Strings<Omit<MosaicMessages['apiKeysTable'], 'noKeysDescription'>> & {
+export type APIKeysTableMessages = Strings<Omit<MosaicMessages['apiKeys'], 'noKeysDescription'>> & {
   readonly noKeysDescription: string;
 };
 
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-danger-section/organization-profile-danger-section.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-danger-section/organization-profile-danger-section.view.tsx
index c078bde9677..bd02789857e 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-danger-section/organization-profile-danger-section.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-danger-section/organization-profile-danger-section.view.tsx
@@ -17,7 +17,7 @@ export function OrganizationProfileDangerSectionView({
   leave,
   destroy,
 }: OrganizationProfileDangerSectionViewProps) {
-  const m = useMessages('organizationProfileDangerSection');
+  const m = useMessages('organizationProfile').danger;
   const locale = useLocale();
 
   if (!leave && !destroy) {
@@ -78,7 +78,7 @@ function DangerRow({
   dialogTitle: string;
   dialogDescription: string;
 }) {
-  const m = useMessages('organizationProfileDangerSection');
+  const m = useMessages('organizationProfile').danger;
 
   return (
     <Section.Row>
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.controller.ts b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.controller.ts
index 1942999e2d9..b0985c9318d 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.controller.ts
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.controller.ts
@@ -12,7 +12,7 @@ export function useInvitationsTableController(
 ): InvitationsTableTabViewProps {
   const locale = useLocale();
   const roleNames = useMessages('roles');
-  const m = useMessages('invitationsTableTab');
+  const m = useMessages('organizationProfile').members.invitations;
   const invitations = model.rows.map(({ id, emailAddress, createdAt, role, roleName }) => ({
     id,
     email: emailAddress,
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.skeleton.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.skeleton.tsx
index 7b08548ce8c..fdcfe5ee358 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.skeleton.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.skeleton.tsx
@@ -44,7 +44,7 @@ export function InvitationsTableTabSkeleton({
   hasRevoke: boolean;
   hasBulkAction: boolean;
 }) {
-  const m = useMessages('invitationsTableTab');
+  const m = useMessages('organizationProfile').members.invitations;
   return (
     <div
       {...mergeStyleProps(themeProps('invitations-table-tab'), stylex.props(tableTabStyles.root))}
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.view.tsx
index 5024f01e290..3b6dab7aa36 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/invitations-table-tab.view.tsx
@@ -38,7 +38,7 @@ export function InvitationsTableTabView({
   isError = false,
   onRetry,
 }: InvitationsTableTabViewProps) {
-  const m = useMessages('invitationsTableTab');
+  const m = useMessages('organizationProfile').members.invitations;
   const showPagination = Math.ceil(totalCount / pageSize) > 1;
   return (
     <>
@@ -136,7 +136,7 @@ function InvitationsTableBody({
   onRevokeClick?: (invitation: OrganizationProfileInvitation) => void;
   registerTrigger: (id: string) => Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('invitationsTableTab');
+  const m = useMessages('organizationProfile').members.invitations;
   return (
     <Table.Body
       items={invitations}
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.controller.ts b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.controller.ts
index 9c5485d0794..a6e76306b05 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.controller.ts
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.controller.ts
@@ -15,7 +15,7 @@ export function useMembersTableController(
   { roles, isLoading: isLoadingRoles }: MembersRolesState,
 ) {
   const locale = useLocale();
-  const messages = useMessages('membersTableTab');
+  const messages = useMessages('organizationProfile').members.list;
   const roleNames = useMessages('roles');
   const roleAction = usePendingAction({ errorFallback: messages.roleChangeError });
   const members = model.rows.map(({ joinedAt, ...member }) => ({
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.skeleton.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.skeleton.tsx
index 61aa25a8cdc..7dd767af098 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.skeleton.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.skeleton.tsx
@@ -51,7 +51,7 @@ export function MembersTableTabSkeleton({
   hasRemove: boolean;
   hasBulkAction: boolean;
 }) {
-  const m = useMessages('membersTableTab');
+  const m = useMessages('organizationProfile').members.list;
   return (
     <div {...mergeStyleProps(themeProps('members-table-tab'), stylex.props(tableTabStyles.root))}>
       <VisuallyHidden role='status'>{m.loading}</VisuallyHidden>
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.view.tsx
index b03344c1354..a7d88647dfb 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/members-table-tab.view.tsx
@@ -51,7 +51,7 @@ export function MembersTableTabView({
   isChangingRole = false,
   roleError,
 }: MembersTableTabViewProps) {
-  const m = useMessages('membersTableTab');
+  const m = useMessages('organizationProfile').members.list;
   const query = searchValue.trim();
   const showPagination = Math.ceil(totalCount / pageSize) > 1;
   return (
@@ -148,7 +148,7 @@ function MembersTableNotices({
   hasRoleSetMigration,
   roleError,
 }: Pick<MembersTableTabViewProps, 'hasRoleSetMigration' | 'roleError'>) {
-  const m = useMessages('membersTableTab');
+  const m = useMessages('organizationProfile').members.list;
   return (
     <>
       {hasRoleSetMigration ? (
@@ -194,7 +194,7 @@ function MembersTableBody({
   onRemoveClick?: (member: OrganizationProfileMember) => void;
   registerTrigger: (id: string) => Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('membersTableTab');
+  const m = useMessages('organizationProfile').members.list;
   return (
     <Table.Body
       items={members}
@@ -253,7 +253,7 @@ function MemberRow({
   onRemoveClick?: () => void;
   triggerRef?: Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('membersTableTab');
+  const m = useMessages('organizationProfile').members.list;
   const manageable = canManageMember(member);
   return (
     <Table.Row
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller.ts b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller.ts
index 9bdb4e1ae87..4435f1359d4 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller.ts
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller.ts
@@ -20,7 +20,7 @@ export interface InviteMembersControllerOptions {
 }
 
 export function useInviteMembersController({ roles, defaultRole, invite }: InviteMembersControllerOptions) {
-  const m = useMessages('organizationProfileInviteMembers');
+  const m = useMessages('organizationProfile').members.invite;
   const roleNames = useMessages('roles');
   const locale = useLocale();
   const toast = useToastManager();
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog.tsx
index 354b21a4fba..86dd842b45a 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog.tsx
@@ -46,7 +46,7 @@ export function OrganizationProfileInviteMembersDialog({
   error,
   onSubmit,
 }: OrganizationProfileInviteMembersDialogProps) {
-  const m = useMessages('organizationProfileInviteMembers');
+  const m = useMessages('organizationProfile').members.invite;
   const formId = useId();
   const emailInput = useRef<HTMLInputElement>(null);
   const isValid = (value: string) => isEmail(value) && !rejectedEmailAddresses.includes(value);
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-members-panel.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-members-panel.view.tsx
index e8d6be44698..d54f6353367 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-members-panel.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-members-panel.view.tsx
@@ -31,9 +31,9 @@ export function OrganizationProfileMembersPanelView({
   inviteDialog,
 }: OrganizationProfileMembersPanelViewProps) {
   const m = useMessages('organizationProfile');
-  const membersMessages = useMessages('membersTableTab');
-  const invitationsMessages = useMessages('invitationsTableTab');
-  const requestsMessages = useMessages('requestsTableTab');
+  const membersMessages = useMessages('organizationProfile').members.list;
+  const invitationsMessages = useMessages('organizationProfile').members.invitations;
+  const requestsMessages = useMessages('organizationProfile').members.requests;
   const tabs = [
     {
       id: 'members',
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.skeleton.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.skeleton.tsx
index e7aaa456273..69b5d27dada 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.skeleton.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.skeleton.tsx
@@ -47,7 +47,7 @@ export function RequestsTableTabSkeleton({
   hasDecline: boolean;
   hasBulkAction: boolean;
 }) {
-  const m = useMessages('requestsTableTab');
+  const m = useMessages('organizationProfile').members.requests;
   const hasActions = hasAccept || hasDecline;
   return (
     <div
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.view.tsx
index 1f6b669d394..ca733275f51 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-members-panel/requests-table-tab.view.tsx
@@ -42,7 +42,7 @@ export function RequestsTableTabView({
   isError = false,
   onRetry,
 }: RequestsTableTabViewProps) {
-  const m = useMessages('requestsTableTab');
+  const m = useMessages('organizationProfile').members.requests;
   const showPagination = Math.ceil(totalCount / pageSize) > 1;
   const hasActions = Boolean(onAccept || onDecline);
   return (
@@ -137,7 +137,7 @@ function RequestsTableBody({
   registerAcceptTrigger?: (id: string) => Ref<HTMLButtonElement>;
   registerDeclineTrigger?: (id: string) => Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('requestsTableTab');
+  const m = useMessages('organizationProfile').members.requests;
   return (
     <Table.Body
       items={requests}
@@ -218,7 +218,7 @@ function RequestActions({
   registerAcceptTrigger?: (id: string) => Ref<HTMLButtonElement>;
   registerDeclineTrigger?: (id: string) => Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('requestsTableTab');
+  const m = useMessages('organizationProfile').members.requests;
   const [acceptRef] = useState(() => registerAcceptTrigger?.(request.id));
   const [declineRef] = useState(() => registerDeclineTrigger?.(request.id));
   const actions = usePendingAction<'accept' | 'decline'>();
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-name.dialog.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-name.dialog.tsx
index 8e11c7f0f0e..e5d4d2b80d8 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-name.dialog.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-name.dialog.tsx
@@ -28,7 +28,7 @@ export function OrganizationProfileEditNameDialog({
   trigger,
   form,
 }: OrganizationProfileEditNameDialogProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const inputRef = useRef<HTMLInputElement>(null);
   const { feedback } = form.fields.name;
   const { ref, ...control } = form.register('name');
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-slug.dialog.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-slug.dialog.tsx
index ca444513091..4cb4539ffed 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-slug.dialog.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-edit-slug.dialog.tsx
@@ -28,7 +28,7 @@ export function OrganizationProfileEditSlugDialog({
   trigger,
   form,
 }: OrganizationProfileEditSlugDialogProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const inputRef = useRef<HTMLInputElement>(null);
   const { feedback } = form.fields.slug;
   const { ref, ...control } = form.register('slug');
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-logo-row.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-logo-row.view.tsx
index a49f0c9d279..8e676251729 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-logo-row.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-logo-row.view.tsx
@@ -39,7 +39,7 @@ export function OrganizationProfileLogoRowView({
   onReject,
   onRemove,
 }: OrganizationProfileLogoRowViewProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const errorText = useErrorText();
   const logo = useOrganizationProfileLogoController({ onChange, onRemove });
   const [rejection, setRejection] = useState<LocalizableError>();
@@ -115,7 +115,7 @@ function LogoActions({
   canChange: boolean;
   onRemove?: () => Promise<void>;
 }) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const { openFilePicker } = FileUpload.useFileUpload();
   const actions: ActionMenuAction[] = [];
 
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-name-row.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-name-row.view.tsx
index ed3d8cec645..2e2ff3f2a4f 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-name-row.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-name-row.view.tsx
@@ -10,7 +10,7 @@ interface OrganizationProfileNameRowViewProps {
 }
 
 export function OrganizationProfileNameRowView({ name, onSubmit }: OrganizationProfileNameRowViewProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   return (
     <Section.Row>
       <Section.Item>
@@ -32,7 +32,7 @@ export function OrganizationProfileNameRowView({ name, onSubmit }: OrganizationP
 }
 
 function EditName({ name, onSubmit }: { name: string; onSubmit: (name: string) => Promise<void> }) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const controller = useOrganizationProfileEditNameController({ name, onSubmit });
 
   return (
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-profile-section.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-profile-section.view.tsx
index 2c014df664f..3199d0dba9e 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-profile-section.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-profile-section.view.tsx
@@ -28,7 +28,7 @@ export function OrganizationProfileProfileSectionView({
   onSubmitName,
   onSubmitSlug,
 }: OrganizationProfileProfileSectionViewProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
 
   return (
     <Section.Root>
diff --git a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-slug-row.view.tsx b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-slug-row.view.tsx
index 4c8cf81670c..1febaa52376 100644
--- a/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-slug-row.view.tsx
+++ b/packages/mosaic/src/features/organization-profile/organization-profile-profile-section/organization-profile-slug-row.view.tsx
@@ -15,7 +15,7 @@ interface OrganizationProfileSlugRowViewProps {
 }
 
 export function OrganizationProfileSlugRowView({ slug, onSubmit }: OrganizationProfileSlugRowViewProps) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   return (
     <Section.Row>
       <Section.Item>
@@ -52,7 +52,7 @@ export function OrganizationProfileSlugRowView({ slug, onSubmit }: OrganizationP
 }
 
 function EditSlug({ slug, onSubmit }: { slug: string; onSubmit: (slug: string) => Promise<void> }) {
-  const m = useMessages('organizationProfileProfileSection');
+  const m = useMessages('organizationProfile').profile;
   const controller = useOrganizationProfileEditSlugController({ slug, onSubmit });
 
   return (
diff --git a/packages/mosaic/src/features/reverification/__tests__/reverification.feature.test.tsx b/packages/mosaic/src/features/reverification/__tests__/reverification.feature.test.tsx
index 6aa155725c9..8b750370d0e 100644
--- a/packages/mosaic/src/features/reverification/__tests__/reverification.feature.test.tsx
+++ b/packages/mosaic/src/features/reverification/__tests__/reverification.feature.test.tsx
@@ -1666,7 +1666,7 @@ describe('Reverification', () => {
         guardedAction(),
         verificationSeed({ firstFactors: [passwordFactor] }),
         {
-          messages: { 'reverification.unstable__errors__generic': 'Something custom went wrong' },
+          messages: { 'reverification.attemptFailed': 'Something custom went wrong' },
         },
       );
       const user = await startVerification();
diff --git a/packages/mosaic/src/features/reverification/reverification.controller.ts b/packages/mosaic/src/features/reverification/reverification.controller.ts
index 1fb1d62677c..65d6fef9f1f 100644
--- a/packages/mosaic/src/features/reverification/reverification.controller.ts
+++ b/packages/mosaic/src/features/reverification/reverification.controller.ts
@@ -495,7 +495,7 @@ function useReverificationState(model: ReverificationModel): ReverificationContr
       direction: context.direction,
       value: context.inputValue,
       onValueChange: (value: string) => send({ type: 'TYPE', value }),
-      errorMessage: context.error ? (context.error.detail ?? m.unstable__errors__generic) : undefined,
+      errorMessage: context.error ? (context.error.detail ?? m.attemptFailed) : undefined,
       isPending: pendingStates.has(state),
       onSubmit: () => send({ type: 'SUBMIT' }),
       onShowMethods: () => send({ type: 'SHOW_METHODS' }),
diff --git a/packages/mosaic/src/features/reverification/reverification.messages.ts b/packages/mosaic/src/features/reverification/reverification.messages.ts
index 1df87ac6755..2a6fe36547d 100644
--- a/packages/mosaic/src/features/reverification/reverification.messages.ts
+++ b/packages/mosaic/src/features/reverification/reverification.messages.ts
@@ -1,93 +1,79 @@
 export const reverificationMessages = {
-  alternativeMethods: {
-    actionLink: 'Get help',
-    actionText: 'Don’t have any of these?',
-    blockButton__backupCode: 'Use a backup code',
-    blockButton__emailCode: 'Email code to {identifier}',
-    blockButton__passkey: 'Use your passkey',
-    blockButton__password: 'Continue with your password',
-    blockButton__phoneCode: 'Send SMS code to {identifier}',
-    blockButton__totp: 'Use your authenticator app',
-    getHelp: {
-      blockButton__emailSupport: 'Email support',
-      description:
-        'If you have trouble verifying your account, email us and we will work with you to restore access as soon as possible.',
-      title: 'Get help',
-    },
-    description: 'Facing issues? You can use any of these methods for verification.',
-    title: 'Use another method',
-  },
-  backupCodeMfa: {
-    description: 'Enter the backup code you received when setting up two-step authentication',
-    title: 'Enter a backup code',
-  },
   loading: {
     title: 'Verification required',
   },
-  emailCode: {
-    description: 'Enter the code sent to your email to continue',
-    formTitle: 'Verification code',
-    resendButton: 'Resend',
-    resendCountdown: 'Resend ({seconds})',
-    resendText: 'Didn’t receive a code?',
+  password: {
     title: 'Verification required',
+    description: 'Enter your current password to continue',
+    label: 'Password',
+    placeholder: 'Enter your password',
+    showPassword: 'Show password',
+    hidePassword: 'Hide password',
   },
   passkey: {
-    blockButton__passkey: 'Use your passkey',
+    title: 'Use your passkey',
     description:
       'Using your passkey confirms your identity. Your device may ask for your fingerprint, face, or screen lock.',
-    title: 'Use your passkey',
   },
-  password: {
-    actionLink: 'Use another method',
-    description: 'Enter your current password to continue',
+  emailCode: {
     title: 'Verification required',
+    description: 'Enter the code sent to your email to continue',
+    label: 'Verification code',
+    resendText: 'Didn’t receive a code?',
+    resend: 'Resend',
+    resendCountdown: 'Resend ({seconds})',
   },
   phoneCode: {
-    description: 'Enter the code sent to your phone to continue',
-    formTitle: 'Verification code',
-    resendButton: 'Resend',
-    resendCountdown: 'Resend ({seconds})',
-    resendText: 'Didn’t receive a code?',
     title: 'Verification required',
-  },
-  phoneCodeMfa: {
     description: 'Enter the code sent to your phone to continue',
-    formTitle: 'Verification code',
-    resendButton: 'Resend',
-    resendCountdown: 'Resend ({seconds})',
+    label: 'Verification code',
     resendText: 'Didn’t receive a code?',
+    resend: 'Resend',
+    resendCountdown: 'Resend ({seconds})',
+  },
+  totp: {
     title: 'Verification required',
+    description: 'Enter the code generated by your authenticator app to continue',
+    label: 'Verification code',
+  },
+  backupCode: {
+    title: 'Enter a backup code',
+    description: 'Enter the backup code you received when setting up two-step authentication',
+    label: 'Backup code',
+  },
+  methods: {
+    title: 'Use another method',
+    description: 'Facing issues? You can use any of these methods for verification.',
+    password: 'Continue with your password',
+    passkey: 'Use your passkey',
+    emailCode: 'Email code to {identifier}',
+    phoneCode: 'Send SMS code to {identifier}',
+    totp: 'Use your authenticator app',
+    backupCode: 'Use a backup code',
+    helpText: 'Don’t have any of these?',
+    help: 'Get help',
+  },
+  help: {
+    title: 'Get help',
+    description:
+      'If you have trouble verifying your account, email us and we will work with you to restore access as soon as possible.',
+    emailSupport: 'Email support',
   },
   error: {
-    closeButton: 'Close',
+    close: 'Close',
     generic: {
-      description: 'Please try again.',
       title: 'Something went wrong',
+      description: 'Please try again.',
     },
     noFactors: {
-      description: 'Cannot proceed with verification. No suitable authentication factor is configured.',
       title: 'Cannot verify your account',
+      description: 'Cannot proceed with verification. No suitable authentication factor is configured.',
     },
   },
-  totpMfa: {
-    description: 'Enter the code generated by your authenticator app to continue',
-    formTitle: 'Verification code',
-    title: 'Verification required',
-  },
-  backButton: 'Back',
-  footerActionLink__useAnotherMethod: 'Use another method',
-  formButtonPrimary: 'Continue',
-  formButtonReset: 'Cancel',
-  formFieldAction__hidePassword: 'Hide password',
-  formFieldAction__showPassword: 'Show password',
-  formFieldInputPlaceholder__password: 'Enter your password',
-  formFieldLabel__backupCode: 'Backup code',
-  formFieldLabel__password: 'Password',
-  identityPreviewEditButton__emailAddress: 'Edit email address',
-  identityPreviewEditButton__identifier: 'Edit identifier',
-  identityPreviewEditButton__phoneNumber: 'Edit phone number',
-  unstable__errors__generic: 'Something went wrong. Please try again.',
+  continue: 'Continue',
+  useAnotherMethod: 'Use another method',
+  back: 'Back',
+  attemptFailed: 'Something went wrong. Please try again.',
   /** Announced while an attempt is in flight; the button's own label stays visible. */
   verifying: 'Verifying',
 } as const;
diff --git a/packages/mosaic/src/features/reverification/reverification.view.tsx b/packages/mosaic/src/features/reverification/reverification.view.tsx
index 863a17448b6..6493eb40caa 100644
--- a/packages/mosaic/src/features/reverification/reverification.view.tsx
+++ b/packages/mosaic/src/features/reverification/reverification.view.tsx
@@ -42,17 +42,17 @@ function methodLabel(method: ReverificationMethod, m: Messages): string {
   const identifier = 'identifier' in method ? method.identifier : '';
   switch (method.strategy) {
     case 'password':
-      return m.alternativeMethods.blockButton__password;
+      return m.methods.password;
     case 'passkey':
-      return m.alternativeMethods.blockButton__passkey;
+      return m.methods.passkey;
     case 'email_code':
-      return fill(m.alternativeMethods.blockButton__emailCode, { identifier });
+      return fill(m.methods.emailCode, { identifier });
     case 'phone_code':
-      return fill(m.alternativeMethods.blockButton__phoneCode, { identifier });
+      return fill(m.methods.phoneCode, { identifier });
     case 'totp':
-      return m.alternativeMethods.blockButton__totp;
+      return m.methods.totp;
     case 'backup_code':
-      return m.alternativeMethods.blockButton__backupCode;
+      return m.methods.backupCode;
   }
 }
 
@@ -76,7 +76,7 @@ export function ReverificationError({ reason, onClose }: { reason: Reverificatio
             fullWidth
             onClick={onClose}
           >
-            {m.error.closeButton}
+            {m.error.close}
           </Button>
         </Card.Footer>
       ) : null}
@@ -105,7 +105,7 @@ export function ReverificationPending() {
           disabled
           xstyle={styles.pendingAction}
         >
-          {m.formButtonPrimary}
+          {m.continue}
         </Button>
       </Card.Footer>
     </>
@@ -119,7 +119,7 @@ function otpCopy(channel: ReverificationOtpChannel | undefined, m: Messages) {
   if (channel === 'phone') {
     return m.phoneCode;
   }
-  return m.totpMfa;
+  return m.totp;
 }
 
 export function ReverificationView({
@@ -147,8 +147,8 @@ export function ReverificationView({
 
   const otp = otpCopy(otpChannel, m);
   const actions = {
-    secondaryActionLabel: m.footerActionLink__useAnotherMethod,
-    primaryActionLabel: m.formButtonPrimary,
+    secondaryActionLabel: m.useAnotherMethod,
+    primaryActionLabel: m.continue,
     pendingLabel: m.verifying,
   };
   const hasAlternatives = methods.length > 0;
@@ -166,7 +166,7 @@ export function ReverificationView({
               })}
             </span>
           ) : (
-            resendCopy.resendButton
+            resendCopy.resend
           ),
           disabled: !canResend || isPending,
           onClick: onResend,
@@ -187,10 +187,10 @@ export function ReverificationView({
               messages={{
                 title: m.password.title,
                 description: m.password.description,
-                fieldLabel: m.formFieldLabel__password,
-                fieldPlaceholder: m.formFieldInputPlaceholder__password,
-                showPasswordLabel: m.formFieldAction__showPassword,
-                hidePasswordLabel: m.formFieldAction__hidePassword,
+                fieldLabel: m.password.label,
+                fieldPlaceholder: m.password.placeholder,
+                showPasswordLabel: m.password.showPassword,
+                hidePasswordLabel: m.password.hidePassword,
                 ...actions,
               }}
               value={value}
@@ -223,7 +223,7 @@ export function ReverificationView({
               messages={{
                 title: otp.title,
                 description: otp.description,
-                fieldLabel: otp.formTitle,
+                fieldLabel: otp.label,
                 ...actions,
               }}
               value={value}
@@ -244,9 +244,9 @@ export function ReverificationView({
             <ReverificationBackupCode
               focusRef={focusRef}
               messages={{
-                title: m.backupCodeMfa.title,
-                description: m.backupCodeMfa.description,
-                fieldLabel: m.formFieldLabel__backupCode,
+                title: m.backupCode.title,
+                description: m.backupCode.description,
+                fieldLabel: m.backupCode.label,
                 ...actions,
               }}
               value={value}
@@ -262,11 +262,11 @@ export function ReverificationView({
             <ReverificationMethodPicker
               focusRef={focusRef}
               messages={{
-                title: m.alternativeMethods.title,
-                description: m.alternativeMethods.description,
-                backButton: m.backButton,
-                helpText: m.alternativeMethods.actionText,
-                helpButton: m.alternativeMethods.actionLink,
+                title: m.methods.title,
+                description: m.methods.description,
+                backButton: m.back,
+                helpText: m.methods.helpText,
+                helpButton: m.methods.help,
               }}
               methods={methods.map(method => ({
                 id: method.id,
@@ -283,10 +283,10 @@ export function ReverificationView({
           <Flow.Step ids={['help']}>
             <ReverificationHelp
               messages={{
-                title: m.alternativeMethods.getHelp.title,
-                description: m.alternativeMethods.getHelp.description,
-                backButton: m.backButton,
-                supportButton: m.alternativeMethods.getHelp.blockButton__emailSupport,
+                title: m.help.title,
+                description: m.help.description,
+                backButton: m.back,
+                supportButton: m.help.emailSupport,
               }}
               onEmailSupport={onEmailSupport}
               onBack={onBack}
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/__tests__/user-profile-active-devices-section.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/__tests__/user-profile-active-devices-section.feature.test.tsx
index fd42ecf450d..da0ef7e1f9c 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/__tests__/user-profile-active-devices-section.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/__tests__/user-profile-active-devices-section.feature.test.tsx
@@ -405,7 +405,7 @@ describe('Active devices', () => {
       ),
     );
     const messages = {
-      userProfileActiveDevices: { detailsDialog: { signOutError: 'Erreur de déconnexion.' } },
+      userProfile: { activeDevices: { detailsDialog: { signOutError: 'Erreur de déconnexion.' } } },
       errors: { invalid_action_for_session: 'Cet appareil est indisponible.' },
     };
     await renderWithClerk(
@@ -602,7 +602,7 @@ describe('Active devices', () => {
       <MosaicLocalizationProvider
         value={resolveLocalization({
           locale: 'fr-FR',
-          messages: { userProfileActiveDevices: { lastSeen: 'Vu {date}', deviceName: '{browser} sur {device}' } },
+          messages: { userProfile: { activeDevices: { lastSeen: 'Vu {date}', deviceName: '{browser} sur {device}' } } },
         })}
       >
         <MosaicNowProvider value={now}>
@@ -795,10 +795,12 @@ describe('Change language while viewing device details', () => {
             messages:
               locale === 'fr-FR'
                 ? {
-                    userProfileActiveDevices: {
-                      deviceName: '{browser} sur {device}',
-                      lastSeen: 'Vu {date}',
-                      detailsDialog: { lastActive: 'Dernière activité {lastActive}', signOut: 'Déconnecter' },
+                    userProfile: {
+                      activeDevices: {
+                        deviceName: '{browser} sur {device}',
+                        lastSeen: 'Vu {date}',
+                        detailsDialog: { lastActive: 'Dernière activité {lastActive}', signOut: 'Déconnecter' },
+                      },
                     },
                   }
                 : undefined,
@@ -890,7 +892,7 @@ describe('Sign out an unavailable device', () => {
           locale,
           messages: {
             errors: locale === 'fr-FR' ? { active_device_unavailable: expectedMessage } : undefined,
-            userProfileActiveDevices: { detailsDialog: { signOutError: 'Unexpected device failure.' } },
+            userProfile: { activeDevices: { detailsDialog: { signOutError: 'Unexpected device failure.' } } },
           },
         })}
       >
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.controller.ts
index 3bfcff4a8ec..40b9b1f7df8 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.controller.ts
@@ -38,7 +38,7 @@ export function useUserProfileActiveDevicesController({
   revokeAll,
   reverification,
 }: UserProfileActiveDevicesControllerOptions): UserProfileActiveDevicesController {
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   const [removedIds, setRemovedIds] = useState<string[]>([]);
   const visibleDevices = devices.filter(device => !removedIds.includes(device.id));
   const currentDeviceTriggerRef = useRef<HTMLButtonElement>(null);
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.model.ts b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.model.ts
index 92fb3eaefed..93b7bda5c21 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.model.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.model.ts
@@ -42,7 +42,7 @@ export function useUserProfileActiveDevicesModel(): UserProfileActiveDevicesMode
   const { isLoaded: isSessionLoaded, session } = useSession();
   const now = useNow({ updateInterval: 60_000 });
   const locale = useLocale();
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   const userId = user?.id;
   const sessionId = session?.id;
   const [revokeSession, reverification] = useReverificationFlow((target: SessionWithActivitiesResource) =>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.skeleton.tsx b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.skeleton.tsx
index 6beda8adfcf..fc16ebac172 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.skeleton.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.skeleton.tsx
@@ -12,7 +12,7 @@ const PLACEHOLDER_DEVICES: UserProfileDevice[] = [
 ];
 
 export function UserProfileActiveDevicesSectionSkeleton() {
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   return (
     <>
       <VisuallyHidden role='status'>{m.loading}</VisuallyHidden>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.view.tsx
index 1ed4e72c410..f95b6830764 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-active-devices-section.view.tsx
@@ -32,7 +32,7 @@ export function UserProfileActiveDevicesSectionView({
   signOutAll,
   signOutAllFinalFocus,
 }: UserProfileActiveDevicesSectionViewProps) {
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   const locale = useLocale();
   const currentDevices = devices.filter(device => device.isCurrent);
   const otherDevices = devices.filter(device => !device.isCurrent);
@@ -123,7 +123,7 @@ export function UserProfileActiveDevicesSectionView({
   );
 }
 
-function deviceBadges(device: UserProfileDevice, m: MosaicMessages['userProfileActiveDevices']): string[] {
+function deviceBadges(device: UserProfileDevice, m: MosaicMessages['userProfile']['activeDevices']): string[] {
   const labels: (string | null)[] = [
     device.isCurrent ? m.thisDevice : null,
     device.isUserDevice ? m.userDevice : null,
@@ -143,7 +143,7 @@ function DeviceItem({
   onViewDetails: (device: UserProfileDevice) => void;
   onSignOut?: (device: UserProfileDevice) => void;
 }) {
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   const actions: ActionMenuAction[] = [{ label: m.viewDetails, onClick: () => onViewDetails(device) }];
 
   if (onSignOut) {
diff --git a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-device-details.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-device-details.dialog.tsx
index 8a066cf2660..aadc6f9c539 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-device-details.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-active-devices-section/user-profile-device-details.dialog.tsx
@@ -96,7 +96,7 @@ function DeviceDetails({
   isSigningOut: boolean;
   errorMessage: string | undefined;
 }) {
-  const m = useMessages('userProfileActiveDevices');
+  const m = useMessages('userProfile').activeDevices;
   const fields: { label: string; value: string | undefined }[] = [
     { label: m.detailsDialog.model, value: device.model },
     { label: m.detailsDialog.browser, value: device.browser },
diff --git a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/__tests__/user-profile-connected-accounts.connect.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/__tests__/user-profile-connected-accounts.connect.feature.test.tsx
index 2595e112eaf..05a25dfb7de 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/__tests__/user-profile-connected-accounts.connect.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/__tests__/user-profile-connected-accounts.connect.feature.test.tsx
@@ -565,7 +565,7 @@ describe('connected accounts', () => {
     serveFapi(signedIn([]));
     await renderWithClerk(
       <MosaicProvider
-        localization={{ overrides: { 'userProfileConnectedAccounts.errors.generic': 'Try the connection again.' } }}
+        localization={{ overrides: { 'userProfile.connectedAccounts.errors.generic': 'Try the connection again.' } }}
       >
         <UserProfileConnectedAccountsSection />
       </MosaicProvider>,
diff --git a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-account-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-account-row.view.tsx
index cd82e7776e2..75288f5e092 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-account-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-account-row.view.tsx
@@ -30,7 +30,7 @@ export function UserProfileConnectProviderRowView({
   onConnect: (id: string) => void;
   triggerRef?: Ref<HTMLButtonElement>;
 }) {
-  const m = useMessages('userProfileConnectedAccounts');
+  const m = useMessages('userProfile').connectedAccounts;
   return (
     <Section.Row xstyle={styles.connectRow}>
       <Section.Item>
@@ -89,7 +89,7 @@ export function UserProfileConnectedAccountRowView({
   onReconnect?: (id: string) => void;
   onRemove?: (account: UserProfileConnectedAccount) => void;
 }) {
-  const m = useMessages('userProfileConnectedAccounts');
+  const m = useMessages('userProfile').connectedAccounts;
   const actions: ActionMenuAction[] = [];
   if ((account.status === 'reconnect' || account.status === 'error') && onReconnect && !isDisabled) {
     actions.push({
diff --git a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.controller.ts
index 09a243bf42c..e8295ee1a13 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.controller.ts
@@ -54,7 +54,7 @@ export function useUserProfileConnectedAccountsController({
   reconnectReverification,
   connectReverification,
 }: UserProfileConnectedAccountsControllerOptions): UserProfileConnectedAccountsController {
-  const messages = useMessages('userProfileConnectedAccounts');
+  const messages = useMessages('userProfile').connectedAccounts;
   const actions = usePendingAction({ errorFallback: messages.errors.generic });
   const sectionRef = useRef<HTMLDivElement>(null);
   const panelTitle = usePanelTitle();
diff --git a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.view.tsx
index ea65ed6c7e9..0ce9ea67d93 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-connected-accounts-section/user-profile-connected-accounts-section.view.tsx
@@ -29,7 +29,7 @@ export function UserProfileConnectedAccountsSectionView({
   connectReverification,
   connectFinalFocus,
 }: UserProfileConnectedAccountsSectionViewProps) {
-  const m = useMessages('userProfileConnectedAccounts');
+  const m = useMessages('userProfile').connectedAccounts;
   const hasRows = accounts.length > 0 || (availableProviders.length > 0 && Boolean(onConnect));
   const isBusy = pendingId !== undefined;
 
diff --git a/packages/mosaic/src/features/user-profile/user-profile-contact-list-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-contact-list-row.view.tsx
index 46e05dfc421..84098de9650 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-contact-list-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-contact-list-row.view.tsx
@@ -42,8 +42,9 @@ export function UserProfileContactListRowView({
   triggerRef,
   children,
 }: UserProfileContactListRowViewProps) {
-  const m = useMessages('userProfileContact');
-  const emptyDescription = m[kind].empty;
+  const messages = useMessages('userProfile');
+  const m = messages.contact;
+  const nouns = messages[kind];
 
   return (
     <Section.Group
@@ -59,7 +60,7 @@ export function UserProfileContactListRowView({
         ) : onAdd ? (
           <Section.Actions>
             <Button
-              aria-label={m[kind].add}
+              aria-label={nouns.add}
               color='neutral'
               size='sm'
               variant='outline'
@@ -80,7 +81,7 @@ export function UserProfileContactListRowView({
           {items.length === 0 ? (
             <Section.Item>
               <Section.Content>
-                <Section.Description>{emptyDescription}</Section.Description>
+                <Section.Description>{nouns.empty}</Section.Description>
               </Section.Content>
             </Section.Item>
           ) : (
@@ -89,7 +90,7 @@ export function UserProfileContactListRowView({
 
               if (!item.isVerified && onVerify) {
                 actions.push({
-                  label: item.isDefault ? m.completeVerification : m[kind].verify,
+                  label: item.isDefault ? m.completeVerification : nouns.verify,
                   onClick: () => onVerify(item.id),
                   status: pendingVerifyId === item.id ? 'pending' : 'idle',
                 });
@@ -99,7 +100,7 @@ export function UserProfileContactListRowView({
 
               if (onRemove) {
                 actions.push({
-                  label: m[kind].remove,
+                  label: nouns.remove,
                   color: 'negative',
                   onClick: () => onRemove(item),
                 });
diff --git a/packages/mosaic/src/features/user-profile/user-profile-contact.messages.ts b/packages/mosaic/src/features/user-profile/user-profile-contact.messages.ts
index 0ab5a633b04..ff766cd7f38 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-contact.messages.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-contact.messages.ts
@@ -1,6 +1,6 @@
 /**
- * Email and phone keep separate keys rather than sharing one templated string: a locale that
- * inflects around the noun cannot build either from the other.
+ * Copy that names the contact kind lives in the email and phone section messages rather than in one
+ * templated string here: a locale that inflects around the noun cannot build either from the other.
  */
 export const userProfileContactMessages = {
   primary: 'Primary',
@@ -8,34 +8,5 @@ export const userProfileContactMessages = {
   add: 'Add',
   setPrimary: 'Set as primary',
   completeVerification: 'Complete verification',
-
   manageValue: 'Manage {value}',
-  email: {
-    label: 'Email',
-    empty: 'No email addresses added',
-    add: 'Add email',
-    verify: 'Verify',
-    remove: 'Remove email',
-    removeDialog: {
-      title: 'Remove email address?',
-      description: '{emailAddress} will be removed from your account.',
-      verifiedDescription: '{emailAddress} will be removed from your account. You won’t be able to use it to sign in.',
-      confirm: 'Remove',
-      cancel: 'Cancel',
-    },
-  },
-  phone: {
-    label: 'Phone',
-    empty: 'No phone numbers added',
-    add: 'Add phone number',
-    verify: 'Verify phone number',
-    remove: 'Remove phone number',
-    removeDialog: {
-      title: 'Remove phone number?',
-      description: '{phoneNumber} will be removed from your account.',
-      verifiedDescription: '{phoneNumber} will be removed from your account. You won’t be able to use it to sign in.',
-      confirm: 'Remove',
-      cancel: 'Cancel',
-    },
-  },
 } as const;
diff --git a/packages/mosaic/src/features/user-profile/user-profile-danger-section/user-profile-danger-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-danger-section/user-profile-danger-section.view.tsx
index e238cc92561..13153cb85f1 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-danger-section/user-profile-danger-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-danger-section/user-profile-danger-section.view.tsx
@@ -9,7 +9,7 @@ export interface UserProfileDangerSectionViewProps {
 }
 
 export function UserProfileDangerSectionView({ controller }: UserProfileDangerSectionViewProps) {
-  const m = useMessages('userProfileDangerSection');
+  const m = useMessages('userProfile').danger;
 
   return (
     <Section.Root>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-add-email.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-add-email.dialog.tsx
index a54f6f89993..5c21748f209 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-add-email.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-add-email.dialog.tsx
@@ -144,7 +144,7 @@ interface EnterEmailStepProps {
 }
 
 function EnterEmailStep(props: EnterEmailStepProps) {
-  const m = useMessages('userProfileAddEmail');
+  const m = useMessages('userProfile').email.addDialog;
   const emailFormId = useId();
   const inputRef = useMergeRefs([props.inputRef, useFlowAutoFocus<HTMLInputElement>()]);
 
@@ -217,7 +217,7 @@ interface VerifyEmailStepProps {
 }
 
 function VerifyEmailStep(props: VerifyEmailStepProps) {
-  const m = useMessages('userProfileAddEmail');
+  const m = useMessages('userProfile').email.addDialog;
   const verifyFormId = useId();
   const inputRef = useMergeRefs([props.inputRef, useFlowAutoFocus<HTMLInputElement>()]);
 
@@ -303,7 +303,7 @@ interface VerifyLinkStepProps {
 }
 
 function VerifyLinkStep(props: VerifyLinkStepProps) {
-  const m = useMessages('userProfileAddEmail');
+  const m = useMessages('userProfile').email.addDialog;
 
   return (
     <>
@@ -351,7 +351,7 @@ interface VerifySsoStepProps {
 }
 
 function VerifySsoStep(props: VerifySsoStepProps) {
-  const m = useMessages('userProfileAddEmail');
+  const m = useMessages('userProfile').email.addDialog;
   const domain = props.emailAddress.split('@')[1] ?? props.emailAddress;
 
   return (
diff --git a/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.messages.ts b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.messages.ts
new file mode 100644
index 00000000000..f9fc9f655b1
--- /dev/null
+++ b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.messages.ts
@@ -0,0 +1,14 @@
+export const userProfileEmailSectionMessages = {
+  label: 'Email',
+  empty: 'No email addresses added',
+  add: 'Add email',
+  verify: 'Verify',
+  remove: 'Remove email',
+  removeDialog: {
+    title: 'Remove email address?',
+    description: '{emailAddress} will be removed from your account.',
+    verifiedDescription: '{emailAddress} will be removed from your account. You won’t be able to use it to sign in.',
+    confirm: 'Remove',
+    cancel: 'Cancel',
+  },
+} as const;
diff --git a/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.view.tsx
index 2e3de1fd1ce..c110e120037 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-email-section/user-profile-email-section.view.tsx
@@ -25,13 +25,14 @@ export function UserProfileEmailSectionView({
   onVerify,
   onSetPrimary,
 }: UserProfileEmailSectionViewProps) {
-  const m = useMessages('userProfileContact');
+  const messages = useMessages('userProfile');
+  const m = messages.email;
   const addEmailAction = canAdd ? (
     <Dialog.Trigger
       handle={verification.handle}
       render={
         <Button
-          aria-label={m.email.add}
+          aria-label={m.add}
           color='neutral'
           size='sm'
           variant='outline'
@@ -43,7 +44,7 @@ export function UserProfileEmailSectionView({
         placement='inline-start'
         size='sm'
       />
-      {m.add}
+      {messages.contact.add}
     </Dialog.Trigger>
   ) : undefined;
 
@@ -54,7 +55,7 @@ export function UserProfileEmailSectionView({
         triggerRef={registerTrigger}
         items={emails}
         kind='email'
-        label={m.email.label}
+        label={m.label}
         addAction={addEmailAction}
         onRemove={remove ? email => remove.open(email) : undefined}
         onSetPrimary={onSetPrimary}
@@ -74,14 +75,14 @@ export function UserProfileEmailSectionView({
       {remove ? (
         <Confirmation
           controller={remove}
-          title={m.email.removeDialog.title}
+          title={m.removeDialog.title}
           description={email =>
-            fill(email.isVerified ? m.email.removeDialog.verifiedDescription : m.email.removeDialog.description, {
+            fill(email.isVerified ? m.removeDialog.verifiedDescription : m.removeDialog.description, {
               emailAddress: email.value,
             })
           }
-          actionLabel={m.email.removeDialog.confirm}
-          cancelLabel={m.email.removeDialog.cancel}
+          actionLabel={m.removeDialog.confirm}
+          cancelLabel={m.removeDialog.cancel}
           finalFocus={finalFocus}
         />
       ) : null}
diff --git a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/__tests__/user-profile-enterprise-accounts.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/__tests__/user-profile-enterprise-accounts.feature.test.tsx
index c439ee6409c..47f72a409ef 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/__tests__/user-profile-enterprise-accounts.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/__tests__/user-profile-enterprise-accounts.feature.test.tsx
@@ -402,7 +402,7 @@ describe('enterprise accounts', () => {
           locale: 'fr-FR',
           overrides: {
             'errors.generic': 'Erreur globale.',
-            'userProfileEnterpriseAccountsSection.errors.generic': 'La connexion a échoué. Réessayez.',
+            'userProfile.enterpriseAccounts.errors.generic': 'La connexion a échoué. Réessayez.',
           },
         }}
       >
diff --git a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-account-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-account-row.view.tsx
index 16b35002c0c..7908a8f2b0c 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-account-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-account-row.view.tsx
@@ -22,7 +22,7 @@ export function UserProfileEnterpriseAccountRowView({
   isPending?: boolean;
   disabled?: boolean;
 }) {
-  const m = useMessages('userProfileEnterpriseAccountsSection');
+  const m = useMessages('userProfile').enterpriseAccounts;
   return (
     <Section.Row xstyle={onConnect && styles.connectRow}>
       <Section.Item>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.tsx b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.tsx
index 294802d4ac3..c8a8a35aec3 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.tsx
@@ -27,7 +27,7 @@ export function UserProfileEnterpriseAccountsSection({ fallback }: UserProfileEn
 }
 
 function EnterpriseAccounts({ model }: { model: Extract<UserProfileEnterpriseAccountsModel, { status: 'ready' }> }) {
-  const m = useMessages('userProfileEnterpriseAccountsSection');
+  const m = useMessages('userProfile').enterpriseAccounts;
   const controller = useUserProfileEnterpriseAccountsController({
     accounts: model.accounts,
     connections: model.connections,
diff --git a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.view.tsx
index aee7c4d995e..ca9ba722029 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.view.tsx
@@ -23,7 +23,7 @@ export function UserProfileEnterpriseAccountsSectionView({
   onConnect,
   connectReverification,
 }: UserProfileEnterpriseAccountsSectionViewProps) {
-  const m = useMessages('userProfileEnterpriseAccountsSection');
+  const m = useMessages('userProfile').enterpriseAccounts;
   if (accounts.length === 0 && (connections.length === 0 || !onConnect)) {
     return null;
   }
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-authenticator.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-authenticator.view.tsx
index 0f03eaf342d..3a8a0d5c6b3 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-authenticator.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-authenticator.view.tsx
@@ -29,7 +29,7 @@ export function UserProfileAddAuthenticatorView({
   isPending = false,
   errorMessage,
 }: UserProfileAddAuthenticatorViewProps) {
-  const m = useMessages('userProfileAddAuthenticator');
+  const m = useMessages('userProfile').mfa.addAuthenticator;
   const formId = useId();
   const actionRef = useFlowAutoFocus<HTMLButtonElement>();
   const inputRef = useFlowAutoFocus<HTMLInputElement>();
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.dialog.tsx
index d236e6fed57..edffc390f4a 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.dialog.tsx
@@ -31,7 +31,7 @@ export function UserProfileAddMfaDialog({
   showCloseButton = true,
   triggerRef: triggerRefProp,
 }: UserProfileAddMfaDialogProps) {
-  const m = useMessages('userProfileMfa');
+  const m = useMessages('userProfile').mfa;
   const addButtonRef = useRef<HTMLButtonElement>(null);
   const triggerRef = useMergeRefs([triggerRefProp, addButtonRef]);
   return (
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.view.tsx
index bcfae640950..13f5b9d7fb3 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-mfa.view.tsx
@@ -24,7 +24,7 @@ const icons = {
 } as const;
 
 export function UserProfileAddMfaView({ methods, onSelect, pendingMethod, errorMessage }: UserProfileAddMfaViewProps) {
-  const m = useMessages('userProfileMfa');
+  const m = useMessages('userProfile').mfa;
   const firstMethodRef = useFlowAutoFocus<HTMLDivElement>();
   return (
     <>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-sms.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-sms.view.tsx
index 526a813115f..1958a79f8d6 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-sms.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-add-sms.view.tsx
@@ -33,7 +33,7 @@ export interface UserProfileAddSmsViewProps {
 }
 
 export function UserProfileAddSmsView(props: UserProfileAddSmsViewProps) {
-  const m = useMessages('userProfileAddSms');
+  const m = useMessages('userProfile').mfa.addSms;
   const selectRef = useFlowAutoFocus<HTMLButtonElement>();
   const phoneRef = useFlowAutoFocus<HTMLInputElement>();
   return (
@@ -96,7 +96,7 @@ export function UserProfileAddSmsView(props: UserProfileAddSmsViewProps) {
 }
 
 function SelectPhoneStep(props: UserProfileAddSmsViewProps & { inputRef?: Ref<HTMLButtonElement> }) {
-  const m = useMessages('userProfileAddSms');
+  const m = useMessages('userProfile').mfa.addSms;
   const formId = useId();
   const inputRef = useMergeRefs([props.inputRef, useFlowAutoFocus<HTMLButtonElement>()]);
   return (
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-authenticator-setup.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-authenticator-setup.view.tsx
index 2a137e6c2e6..5de6ac483a9 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-authenticator-setup.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-authenticator-setup.view.tsx
@@ -16,7 +16,7 @@ export interface UserProfileAuthenticatorSetupViewProps {
 }
 
 export function UserProfileAuthenticatorSetupView({ secret, uri }: UserProfileAuthenticatorSetupViewProps) {
-  const m = useMessages('userProfileAuthenticatorSetup');
+  const m = useMessages('userProfile').mfa.authenticatorSetup;
   const [showSetupKey, setShowSetupKey] = useState(false);
 
   return (
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-backup-codes.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-backup-codes.view.tsx
index 3d2d519b03f..b064ab5e121 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-backup-codes.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-backup-codes.view.tsx
@@ -38,7 +38,7 @@ export function UserProfileBackupCodesView({
   pendingAction,
   errorMessage,
 }: UserProfileBackupCodesViewProps) {
-  const m = useMessages('userProfileBackupCodes');
+  const m = useMessages('userProfile').mfa.backupCodes;
   const actionRef = useFlowAutoFocus<HTMLButtonElement>();
   const hasCodes = codes.length > 0 && pendingAction !== 'generate';
   const showSaveActions = hasCodes || pendingAction === 'generate';
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-row.view.tsx
index a4496159858..cffe0b4ebdf 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-row.view.tsx
@@ -21,7 +21,7 @@ export function UserProfileMfaRowView({
   onRemove?: () => void;
   onSetDefault?: (id: string) => void;
 }) {
-  const m = useMessages('userProfileMfa');
+  const m = useMessages('userProfile').mfa;
   const label = method.label ?? m.methods[method.type];
   const description =
     method.type === 'sms' && method.description ? stringToFormattedPhoneString(method.description) : method.description;
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section-leaf.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section-leaf.controller.ts
index 73419056fa2..3060b919457 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section-leaf.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section-leaf.controller.ts
@@ -14,7 +14,7 @@ export function useUserProfileMfaSectionLeafController({
   onSetDefault,
   removeReverification,
 }: UserProfileMfaSectionViewProps) {
-  const m = useMessages('userProfileMfa');
+  const m = useMessages('userProfile').mfa;
   const sectionRef = useRef<HTMLDivElement>(null);
   const removalFocus = useListRemovalFocus({
     ids: methods.map(method => method.id),
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.controller.ts
index d6311ba4808..aa7cc25fb31 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.controller.ts
@@ -349,7 +349,7 @@ function createBackupCodeActions(
   flow: MfaFlow,
   run: RunMfaAction,
   send: MfaSend,
-  m: MosaicMessages['userProfileBackupCodes'],
+  m: MosaicMessages['userProfile']['mfa']['backupCodes'],
 ) {
   const fileValues = { applicationName: model.applicationName, identifier: model.identifier };
   const generateBackupCodes = () => {
@@ -505,7 +505,7 @@ function createSetupProps(
 
 export function useUserProfileMfaController(model: ReadyModel) {
   const errorText = useErrorText();
-  const backupCodeMessages = useMessages('userProfileBackupCodes');
+  const backupCodeMessages = useMessages('userProfile').mfa.backupCodes;
   const [{ context, value }, send] = useMachine(mfaMachine);
   const isBusy = value === 'busy';
   const run: RunMfaAction = (key, action) => {
diff --git a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.view.tsx
index a5048a26df8..e4609cf442b 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-mfa-section/user-profile-mfa-section.view.tsx
@@ -40,7 +40,7 @@ export function UserProfileMfaSectionView({
   removeReverification,
   setDefaultReverification,
 }: UserProfileMfaSectionViewProps) {
-  const m = useMessages('userProfileMfa');
+  const m = useMessages('userProfile').mfa;
   const controller = useUserProfileMfaSectionLeafController({
     methods,
     onAdd,
@@ -104,7 +104,7 @@ export function UserProfileMfaSectionView({
   );
 }
 
-function describeMethodRemoval(method: UserProfileMfaMethod, m: MosaicMessages['userProfileMfa']) {
+function describeMethodRemoval(method: UserProfileMfaMethod, m: MosaicMessages['userProfile']['mfa']) {
   if (method.type === 'sms') {
     return method.description
       ? fill(m.removeDialog.smsDescription, { phoneNumber: stringToFormattedPhoneString(method.description) })
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-lifecycle.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-lifecycle.feature.test.tsx
index b9a90d0db3b..eaf72a15ba6 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-lifecycle.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-lifecycle.feature.test.tsx
@@ -56,7 +56,7 @@ describe('Passkey action errors', () => {
     serveAccounts();
     const view = await renderWithClerk(
       <MosaicProvider
-        localization={{ messages: { userProfilePasskeys: { saveError: 'Could not add this passkey.' } } }}
+        localization={{ messages: { userProfile: { passkeys: { saveError: 'Could not add this passkey.' } } } }}
       >
         <UserProfilePasskeysSection />
       </MosaicProvider>,
@@ -71,7 +71,7 @@ describe('Passkey action errors', () => {
     expect(screen.queryByText('Private authenticator details')).toBeNull();
     view.rerender(
       <MosaicProvider
-        localization={{ messages: { userProfilePasskeys: { saveError: 'Impossible de créer cette clé.' } } }}
+        localization={{ messages: { userProfile: { passkeys: { saveError: 'Impossible de créer cette clé.' } } } }}
       >
         <UserProfilePasskeysSection />
       </MosaicProvider>,
@@ -399,7 +399,7 @@ describe('Replacing instance policy while editing', () => {
         localization={{
           locale: 'fr-FR',
           messages: {
-            userProfilePasskeys: { accountUnavailableError: 'Ce compte ne permet plus cette action.' },
+            userProfile: { passkeys: { accountUnavailableError: 'Ce compte ne permet plus cette action.' } },
             form: { error: 'Erreur générique du formulaire.' },
           },
         }}
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-section.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-section.feature.test.tsx
index 46008130173..09c27196c39 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-section.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/__tests__/user-profile-passkeys-section.feature.test.tsx
@@ -92,21 +92,23 @@ describe('Seeing passkeys', () => {
       <MosaicProvider
         localization={{
           messages: {
-            userProfilePasskeys: {
-              label: 'Clés d’accès',
-              add: 'Ajouter',
-              addLabel: 'Ajouter une clé',
-              manage: 'Gérer {name}',
-              rename: 'Renommer',
-              renameTitle: 'Renommer la clé',
-              renameDescription: 'Choisissez un nouveau nom.',
-              nameLabel: 'Nom de la clé',
-              save: 'Enregistrer',
-              cancel: 'Annuler',
-              removeAction: 'Supprimer la clé',
-              removeTitle: 'Supprimer la clé',
-              removeDescription: '{name} sera supprimée de ce compte.',
-              remove: 'Supprimer',
+            userProfile: {
+              passkeys: {
+                label: 'Clés d’accès',
+                add: 'Ajouter',
+                addLabel: 'Ajouter une clé',
+                manage: 'Gérer {name}',
+                rename: 'Renommer',
+                renameTitle: 'Renommer la clé',
+                renameDescription: 'Choisissez un nouveau nom.',
+                nameLabel: 'Nom de la clé',
+                save: 'Enregistrer',
+                cancel: 'Annuler',
+                removeAction: 'Supprimer la clé',
+                removeTitle: 'Supprimer la clé',
+                removeDescription: '{name} sera supprimée de ce compte.',
+                remove: 'Supprimer',
+              },
             },
           },
         }}
@@ -157,15 +159,17 @@ describe('Seeing passkeys', () => {
         localization={{
           locale: 'de-DE',
           messages: {
-            userProfilePasskeys: {
-              createdAt: 'Erstellt: {date}',
-              lastUsedAt: 'Zuletzt verwendet: {date}',
-              dates: {
-                sameDay: 'Heute um {time}',
-                lastDay: 'Gestern um {time}',
-                nextDay: 'Morgen um {time}',
-                previous6Days: 'Letzten {weekday} um {time}',
-                next6Days: '{weekday} um {time}',
+            userProfile: {
+              passkeys: {
+                createdAt: 'Erstellt: {date}',
+                lastUsedAt: 'Zuletzt verwendet: {date}',
+                dates: {
+                  sameDay: 'Heute um {time}',
+                  lastDay: 'Gestern um {time}',
+                  nextDay: 'Morgen um {time}',
+                  previous6Days: 'Letzten {weekday} um {time}',
+                  next6Days: '{weekday} um {time}',
+                },
               },
             },
           },
@@ -344,7 +348,7 @@ describe('Adding a passkey', () => {
     );
     await renderWithClerk(
       <MosaicProvider
-        localization={{ messages: { userProfilePasskeys: { saveError: 'Impossible de créer la clé.' } } }}
+        localization={{ messages: { userProfile: { passkeys: { saveError: 'Impossible de créer la clé.' } } } }}
       >
         <UserProfilePasskeysSection />
       </MosaicProvider>,
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkey-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkey-row.view.tsx
index ace98b6abdc..2f3be1e3702 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkey-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkey-row.view.tsx
@@ -27,7 +27,7 @@ export function UserProfilePasskeyRowView({
   validateName?: UserProfilePasskeyNameValidator;
   onRemove?: () => void;
 }) {
-  const m = useMessages('userProfilePasskeys');
+  const m = useMessages('userProfile').passkeys;
   const renameDialog = useMemo(() => Dialog.createHandle(), []);
   const controller = useUserProfileRenamePasskeyController({
     id: passkey.id,
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.controller.ts
index 1ddb2b5d271..7b5d91bf806 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.controller.ts
@@ -22,7 +22,7 @@ export function useUserProfilePasskeysSectionController({
   reverification,
   addReverification,
 }: PasskeysControllerInput): UserProfilePasskeysSectionViewProps {
-  const messages = useMessages('userProfilePasskeys');
+  const messages = useMessages('userProfile').passkeys;
   const add = usePendingAction<'add'>({ errorFallback: messages.saveError });
   const sectionRef = useRef<HTMLDivElement>(null);
   const addButtonRef = useRef<HTMLButtonElement>(null);
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.model.ts b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.model.ts
index 3482651482e..a927281f3d1 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.model.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.model.ts
@@ -89,7 +89,7 @@ export function useUserProfilePasskeysModel(): UserProfilePasskeysModel {
   const environment = useMosaicEnvironment();
   const now = useNow({ updateInterval: 60_000 });
   const locale = useLocale();
-  const messages = useMessages('userProfilePasskeys');
+  const messages = useMessages('userProfile').passkeys;
   const [deletePasskey, reverification] = useReverificationFlow((passkey: PasskeyResource) => passkey.delete());
   const [createPasskey, addReverification] = useReverificationFlow((current: UserResource) => current.createPasskey());
   const validateName: UserProfilePasskeyNameValidator = name =>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.view.tsx
index d3425ae5af2..e6a6ffc5475 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.view.tsx
@@ -48,7 +48,7 @@ export function UserProfilePasskeysSectionView({
   addReverification,
   addFinalFocus,
 }: UserProfilePasskeysSectionViewProps) {
-  const m = useMessages('userProfilePasskeys');
+  const m = useMessages('userProfile').passkeys;
 
   return (
     <>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-rename-passkey.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-rename-passkey.dialog.tsx
index 1914ffee571..68b0a08a422 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-rename-passkey.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-passkeys-section/user-profile-rename-passkey.dialog.tsx
@@ -25,7 +25,7 @@ export function UserProfileRenamePasskeyDialog({
   onOpenChange,
   form,
 }: UserProfileRenamePasskeyDialogProps) {
-  const m = useMessages('userProfilePasskeys');
+  const m = useMessages('userProfile').passkeys;
   const inputRef = useRef<HTMLInputElement>(null);
   const { ref, ...control } = form.register('name');
   const mergedRef = useMergeRefs([ref, inputRef]);
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/__tests__/user-profile-password-feedback.test.ts b/packages/mosaic/src/features/user-profile/user-profile-password-section/__tests__/user-profile-password-feedback.test.ts
index 8e1983af9ee..c48cef3704a 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/__tests__/user-profile-password-feedback.test.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/__tests__/user-profile-password-feedback.test.ts
@@ -17,12 +17,14 @@ const localization = resolveLocalization({
       form_password_size_in_bytes_exceeded: 'Custom byte error.',
       form_password_incorrect__current_password: 'Le mot de passe actuel est incorrect.',
     },
-    userProfilePasswordSection: {
-      suggestions: { anotherWord: 'Custom suggestion.' },
+    userProfile: {
+      password: {
+        suggestions: { anotherWord: 'Custom suggestion.' },
+      },
     },
   },
 });
-const messages = localization.messages.userProfilePasswordSection;
+const messages = localization.messages.userProfile.password;
 function resolver(value = localization) {
   const wrapper = ({ children }: { children: ReactNode }) =>
     createElement(MosaicLocalizationProvider, { value }, children);
@@ -171,7 +173,7 @@ describe('password error feedback', () => {
       }),
       current,
       settings,
-      defaults.messages.userProfilePasswordSection,
+      defaults.messages.userProfile.password,
       defaults.locale,
       resolver(defaults),
     );
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.controller.ts
index 53aa56d49f4..03218c30e4f 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.controller.ts
@@ -43,7 +43,7 @@ export function useUserProfileEditPasswordController({
 }: UserProfileEditPasswordControllerOptions): UserProfileEditPasswordController {
   const requiresCurrentPassword = policy.requiresCurrentPassword;
   const validationError = useMessages('errors').generic;
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const [isOpen, setIsOpen] = useState(false);
 
   const form = useForm({
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.dialog.tsx
index d94a0e1e52c..50a2799d07a 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-edit-password.dialog.tsx
@@ -48,7 +48,7 @@ export function UserProfileEditPasswordDialog({
   reverification,
   step,
 }: UserProfileEditPasswordDialogProps) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const initialFocusRef = useRef<HTMLInputElement>(null);
   const showCurrentPassword = hasPassword && requiresCurrentPassword;
 
@@ -198,7 +198,7 @@ function PasswordField({
   name: UserProfileEditPasswordField;
   advisoryFeedback?: FieldFeedback;
 }) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const [visible, setVisible] = useState(false);
   const [focused, setFocused] = useState(false);
   const { feedback } = form.fields[name];
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-errors.ts b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-errors.ts
index f374dd7585f..beff9eb0f24 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-errors.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-errors.ts
@@ -9,7 +9,7 @@ import { toLocalizableError } from '../../../utils/errors';
 import { passwordComplexityMessage, passwordStrengthMessage } from './user-profile-password-feedback';
 import type { UserProfileEditPasswordValues } from './user-profile-password-section.types';
 
-type Messages = MosaicMessages['userProfilePasswordSection'];
+type Messages = MosaicMessages['userProfile']['password'];
 type Settings = Pick<PasswordSettingsData, 'min_length' | 'max_length'>;
 type ComplexityRule =
   | 'min_length'
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-feedback.ts b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-feedback.ts
index 12aca29b2d3..ec57bb5a438 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-feedback.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-feedback.ts
@@ -4,7 +4,7 @@ import type { FieldFeedback } from '../../../components/form';
 import type { MosaicMessages } from '../../../localization';
 import { fill } from '../../../localization';
 
-type Messages = MosaicMessages['userProfilePasswordSection'];
+type Messages = MosaicMessages['userProfile']['password'];
 type Settings = Pick<PasswordSettingsData, 'min_length' | 'max_length'>;
 
 const complexityMessageKeys = new Map<string, Exclude<keyof Messages['complexity'], 'sentence'>>([
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-row.view.tsx
index 024629edbe8..43c0b23fbf9 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-row.view.tsx
@@ -9,7 +9,7 @@ export function UserProfilePasswordRowView({
   hasPassword = false,
   managedBy,
 }: UserProfilePasswordSectionViewProps) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   return (
     <Section.Items>
       <Section.Item>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.model.ts b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.model.ts
index 0c3a7d01641..99e086d2509 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.model.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.model.ts
@@ -94,7 +94,7 @@ function getPasswordPolicy(
 
 export function useUserProfilePasswordModel(): UserProfilePasswordModel {
   const clerk = useClerk();
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const locale = useLocale();
   const errorText = useErrorText();
   const errorMessages = useMessages('errors');
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.tsx b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.tsx
index 43d990b05ae..23d3f995588 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.tsx
@@ -37,7 +37,7 @@ export function UserProfilePasswordSection({ fallback = null }: UserProfilePassw
 }
 
 function PasswordEditor({ model }: { model: Extract<UserProfilePasswordModel, { status: 'ready' }> }) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const hasPassword = model.mode === 'change';
   const controller = useUserProfileEditPasswordController({
     policy: model,
diff --git a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.view.tsx
index 37cf5301cf5..781a5722090 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-password-section/user-profile-password-section.view.tsx
@@ -16,7 +16,7 @@ export function UserProfilePasswordSectionView({
   hasPassword = false,
   managedBy,
 }: UserProfilePasswordSectionViewProps) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   if (!hasPassword && !managedBy && !action) {
     return null;
   }
diff --git a/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.messages.ts b/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.messages.ts
new file mode 100644
index 00000000000..f94496c050f
--- /dev/null
+++ b/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.messages.ts
@@ -0,0 +1,14 @@
+export const userProfilePhoneSectionMessages = {
+  label: 'Phone',
+  empty: 'No phone numbers added',
+  add: 'Add phone number',
+  verify: 'Verify phone number',
+  remove: 'Remove phone number',
+  removeDialog: {
+    title: 'Remove phone number?',
+    description: '{phoneNumber} will be removed from your account.',
+    verifiedDescription: '{phoneNumber} will be removed from your account. You won’t be able to use it to sign in.',
+    confirm: 'Remove',
+    cancel: 'Cancel',
+  },
+} as const;
diff --git a/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.view.tsx
index ffcfe7bf5dc..f5c0d37718b 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-phone-section/user-profile-phone-section.view.tsx
@@ -26,13 +26,14 @@ export function UserProfilePhoneSectionView({
   onVerify,
   onSetPrimary,
 }: UserProfilePhoneSectionViewProps) {
-  const m = useMessages('userProfileContact');
+  const messages = useMessages('userProfile');
+  const m = messages.phone;
   const addPhoneAction = canAdd ? (
     <Dialog.Trigger
       handle={verification.handle}
       render={
         <Button
-          aria-label={m.phone.add}
+          aria-label={m.add}
           color='neutral'
           size='sm'
           variant='outline'
@@ -44,7 +45,7 @@ export function UserProfilePhoneSectionView({
         placement='inline-start'
         size='sm'
       />
-      {m.add}
+      {messages.contact.add}
     </Dialog.Trigger>
   ) : undefined;
 
@@ -55,7 +56,7 @@ export function UserProfilePhoneSectionView({
         triggerRef={registerTrigger}
         items={phones}
         kind='phone'
-        label={m.phone.label}
+        label={m.label}
         addAction={addPhoneAction}
         onRemove={remove ? phone => remove.open(phone) : undefined}
         onSetPrimary={onSetPrimary}
@@ -76,14 +77,14 @@ export function UserProfilePhoneSectionView({
       {remove ? (
         <Confirmation
           controller={remove}
-          title={m.phone.removeDialog.title}
+          title={m.removeDialog.title}
           description={phone =>
-            fill(phone.isVerified ? m.phone.removeDialog.verifiedDescription : m.phone.removeDialog.description, {
+            fill(phone.isVerified ? m.removeDialog.verifiedDescription : m.removeDialog.description, {
               phoneNumber: phone.value,
             })
           }
-          actionLabel={m.phone.removeDialog.confirm}
-          cancelLabel={m.phone.removeDialog.cancel}
+          actionLabel={m.removeDialog.confirm}
+          cancelLabel={m.removeDialog.cancel}
           finalFocus={finalFocus}
         />
       ) : null}
diff --git a/packages/mosaic/src/features/user-profile/user-profile-phone.steps.tsx b/packages/mosaic/src/features/user-profile/user-profile-phone.steps.tsx
index ab058ded2b1..7767d37d58f 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-phone.steps.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-phone.steps.tsx
@@ -30,7 +30,7 @@ interface EnterPhoneStepProps {
 }
 
 export function EnterPhoneStep(props: EnterPhoneStepProps) {
-  const m = useMessages('userProfileAddPhone');
+  const m = useMessages('userProfile').phone.addDialog;
   const phoneFormId = useId();
   const inputRef = useMergeRefs([props.inputRef, useFlowAutoFocus<HTMLInputElement>()]);
   const canSubmit = props.phoneNumber !== '';
@@ -105,7 +105,7 @@ interface VerifyPhoneStepProps {
 }
 
 export function VerifyPhoneStep(props: VerifyPhoneStepProps) {
-  const m = useMessages('userProfileAddPhone');
+  const m = useMessages('userProfile').phone.addDialog;
   const verifyFormId = useId();
   const canSubmit = props.code.length === CODE_LENGTH;
 
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-name.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-name.dialog.tsx
index b5cbe7e46cf..07f10510048 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-name.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-name.dialog.tsx
@@ -46,7 +46,7 @@ export function UserProfileEditNameDialog({
   title,
   form,
 }: UserProfileEditNameDialogProps) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const initialFocusRef = useRef<HTMLInputElement>(null);
   const { enabled: showFirstName = true, required: firstNameRequired = false } = firstNameAttribute;
   const { enabled: showLastName = true, required: lastNameRequired = false } = lastNameAttribute;
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-username.dialog.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-username.dialog.tsx
index b8723d7d7d5..2f466e7b3e9 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-username.dialog.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-edit-username.dialog.tsx
@@ -40,7 +40,7 @@ export function UserProfileEditUsernameDialog({
   reverification,
   step,
 }: UserProfileEditUsernameDialogProps) {
-  const m = useMessages('userProfileProfileSection').username;
+  const m = useMessages('userProfile').profile.username;
   const usernameRef = useRef<HTMLInputElement>(null);
 
   const edit = (
@@ -143,7 +143,7 @@ function UsernameField({
   form: UseFormResult<UserProfileEditUsernameValue>;
   inputRef: RefObject<HTMLInputElement>;
 }) {
-  const m = useMessages('userProfileProfileSection').username;
+  const m = useMessages('userProfile').profile.username;
   const { feedback } = form.fields.username;
   const error = feedback?.type === 'error' ? feedback.message : undefined;
   const { ref, ...control } = form.register('username');
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-name-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-name-row.view.tsx
index 66ce55261dd..dc7939237da 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-name-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-name-row.view.tsx
@@ -12,7 +12,7 @@ export interface UserProfileNameRowViewProps {
 }
 
 export function UserProfileNameRowView({ name, managedBy, action }: UserProfileNameRowViewProps) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
 
   return (
     <Section.Row>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-picture-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-picture-row.view.tsx
index f8c05774bb1..644d9956990 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-picture-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-picture-row.view.tsx
@@ -28,7 +28,7 @@ export function UserProfilePictureRowView({
   onReject,
   onRemove,
 }: UserProfilePictureRowViewProps) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const initials = name
     .split(/\s+/)
     .map(part => part[0])
@@ -85,7 +85,7 @@ function ProfilePictureActions({
   canChange: boolean;
   onRemove?: () => void;
 }) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const { openFilePicker } = FileUpload.useFileUpload();
   const actions: ActionMenuAction[] = [];
 
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.tsx
index 498b5aff4ba..755b9459eed 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.tsx
@@ -78,7 +78,7 @@ function EditName({
   firstNameAttribute: UserProfileNameAttribute;
   lastNameAttribute: UserProfileNameAttribute;
 }) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const controller = useUserProfileEditNameController({
     ...options,
     firstNameRequired: firstNameAttribute.required,
@@ -107,7 +107,7 @@ function EditName({
 }
 
 function EditUsername(options: UserProfileEditUsernameControllerOptions) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const controller = useUserProfileEditUsernameController(options);
   const isSet = Boolean(options.username);
 
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.view.tsx
index 92afdccf8b6..a0f02a863a6 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-profile-section.view.tsx
@@ -17,7 +17,7 @@ export function UserProfileProfileSectionView({
   usernameAction,
   picture,
 }: UserProfileProfileSectionViewProps) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
 
   return (
     <Section.Root>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-username-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-username-row.view.tsx
index 8bc64f35a08..95d406f1d8d 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-username-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-profile-section/user-profile-username-row.view.tsx
@@ -9,7 +9,7 @@ export interface UserProfileUsernameRowViewProps {
 }
 
 export function UserProfileUsernameRowView({ username, action }: UserProfileUsernameRowViewProps) {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
 
   return (
     <Section.Row>
diff --git a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/__tests__/user-profile-web3-wallets-section.feature.test.tsx b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/__tests__/user-profile-web3-wallets-section.feature.test.tsx
index cb9fc8857d2..7bf2d1ef0e7 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/__tests__/user-profile-web3-wallets-section.feature.test.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/__tests__/user-profile-web3-wallets-section.feature.test.tsx
@@ -234,7 +234,7 @@ describe('Web3 wallets', () => {
     });
     await renderWithClerk(
       <MosaicProvider
-        localization={{ messages: { userProfileWeb3Wallets: { errors: { generic: 'Connexion impossible.' } } } }}
+        localization={{ messages: { userProfile: { web3Wallets: { errors: { generic: 'Connexion impossible.' } } } } }}
       >
         <UserProfileWeb3WalletsSection />
       </MosaicProvider>,
@@ -756,10 +756,12 @@ describe('Web3 wallets', () => {
     const props = { onConnect: vi.fn() };
     const localization = {
       messages: {
-        userProfileWeb3Wallets: {
-          solanaDialog: {
-            loading: 'Recherche des portefeuilles…',
-            loadError: 'Chargement impossible.',
+        userProfile: {
+          web3Wallets: {
+            solanaDialog: {
+              loading: 'Recherche des portefeuilles…',
+              loadError: 'Chargement impossible.',
+            },
           },
         },
       },
diff --git a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-solana-wallet.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-solana-wallet.view.tsx
index 0a19e2499b8..ffb75b244bd 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-solana-wallet.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-solana-wallet.view.tsx
@@ -15,7 +15,7 @@ export function UserProfileSolanaWalletView({
   error?: string;
   onConnect: (walletName: string) => void;
 }) {
-  const m = useMessages('userProfileWeb3Wallets');
+  const m = useMessages('userProfile').web3Wallets;
   const pending = pendingWalletName !== undefined;
 
   return (
diff --git a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallet-row.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallet-row.view.tsx
index e788761c532..9b0618176aa 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallet-row.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallet-row.view.tsx
@@ -33,7 +33,7 @@ export function UserProfileWeb3WalletRowView({
   onSetPrimary?: (id: string) => void;
   onRemove?: (wallet: UserProfileWeb3Wallet) => void;
 }) {
-  const m = useMessages('userProfileWeb3Wallets');
+  const m = useMessages('userProfile').web3Wallets;
   const linkedWallet = 'address' in wallet ? wallet : undefined;
   const address = linkedWallet?.address;
   const shortAddress = address && (address.length <= 10 ? address : `${address.slice(0, 6)}...${address.slice(-4)}`);
diff --git a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.controller.ts b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.controller.ts
index 4fba28cb105..9d242b0b1ae 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.controller.ts
+++ b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.controller.ts
@@ -44,7 +44,7 @@ export function useUserProfileWeb3WalletsController({
   | 'setPrimaryReverification'
   | 'createReverification'
 >) {
-  const messages = useMessages('userProfileWeb3Wallets');
+  const messages = useMessages('userProfile').web3Wallets;
   const action = usePendingAction({ errorFallback: messages.errors.generic });
   const [picker, setPicker] = useState<SolanaPicker>({ open: false });
   const [owner, setOwner] = useState<WalletAction>();
diff --git a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.view.tsx b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.view.tsx
index bd259076163..aeab97de06c 100644
--- a/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.view.tsx
+++ b/packages/mosaic/src/features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets-section.view.tsx
@@ -23,7 +23,7 @@ export function UserProfileWeb3WalletsSectionView({
   createReverification,
   createFinalFocus,
 }: UserProfileWeb3WalletsSectionViewProps) {
-  const m = useMessages('userProfileWeb3Wallets');
+  const m = useMessages('userProfile').web3Wallets;
   const hasRows = wallets.length > 0 || (availableProviders.length > 0 && Boolean(onConnect)) || Boolean(error);
   const isBusy = pendingId !== undefined;
 
diff --git a/packages/mosaic/src/localization/__tests__/registry.test.ts b/packages/mosaic/src/localization/__tests__/registry.test.ts
new file mode 100644
index 00000000000..c0718ec0592
--- /dev/null
+++ b/packages/mosaic/src/localization/__tests__/registry.test.ts
@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest';
+
+import { mosaicMessages } from '../registry';
+
+const CAMEL_CASE = /^[a-z][a-zA-Z0-9]*$/;
+const ID_KEYED_MAPS = [
+  'errors',
+  'roles',
+  'userProfile.mfa.methods',
+  'userProfile.mfa.addDialog.methods',
+  'apiKeys.expirationOptions',
+];
+
+describe('mosaicMessages', () => {
+  it('names every key segment in camelCase', () => {
+    const malformed = keyPaths(mosaicMessages).filter(path => {
+      const named = namedSegments(path);
+      return path.length < 2 || named.some(segment => !CAMEL_CASE.test(segment));
+    });
+
+    expect(malformed.map(path => path.join('.'))).toEqual([]);
+  });
+});
+
+function namedSegments(path: string[]): string[] {
+  const joined = path.join('.');
+  const map = ID_KEYED_MAPS.find(prefix => joined.startsWith(`${prefix}.`));
+  return map === undefined ? path : map.split('.');
+}
+
+function keyPaths(value: unknown, prefix: string[] = []): string[][] {
+  if (typeof value !== 'object' || value === null || isPluralForms(value)) {
+    return [prefix];
+  }
+  return Object.entries(value).flatMap(([key, child]) => keyPaths(child, [...prefix, key]));
+}
+
+function isPluralForms(value: object): boolean {
+  return 'other' in value && typeof Reflect.get(value, 'other') === 'string';
+}
diff --git a/packages/mosaic/src/localization/registry.ts b/packages/mosaic/src/localization/registry.ts
index c458b3c2ff8..420df1eba8e 100644
--- a/packages/mosaic/src/localization/registry.ts
+++ b/packages/mosaic/src/localization/registry.ts
@@ -17,6 +17,7 @@ import { userProfileConnectedAccountsMessages } from '../features/user-profile/u
 import { userProfileContactMessages } from '../features/user-profile/user-profile-contact.messages';
 import { userProfileDangerSectionMessages } from '../features/user-profile/user-profile-danger-section/user-profile-danger-section.messages';
 import { userProfileAddEmailMessages } from '../features/user-profile/user-profile-email-section/user-profile-add-email.messages';
+import { userProfileEmailSectionMessages } from '../features/user-profile/user-profile-email-section/user-profile-email-section.messages';
 import { userProfileEnterpriseAccountsMessages } from '../features/user-profile/user-profile-enterprise-accounts-section/user-profile-enterprise-accounts-section.messages';
 import { userProfileAddAuthenticatorMessages } from '../features/user-profile/user-profile-mfa-section/user-profile-add-authenticator.messages';
 import { userProfileAddSmsMessages } from '../features/user-profile/user-profile-mfa-section/user-profile-add-sms.messages';
@@ -26,44 +27,53 @@ import { userProfileMfaMessages } from '../features/user-profile/user-profile-mf
 import { userProfilePasskeysMessages } from '../features/user-profile/user-profile-passkeys-section/user-profile-passkeys-section.messages';
 import { userProfilePasswordSectionMessages } from '../features/user-profile/user-profile-password-section/user-profile-password-section.messages';
 import { userProfileAddPhoneMessages } from '../features/user-profile/user-profile-phone-section/user-profile-add-phone.messages';
+import { userProfilePhoneSectionMessages } from '../features/user-profile/user-profile-phone-section/user-profile-phone-section.messages';
 import { userProfileProfileSectionMessages } from '../features/user-profile/user-profile-profile-section/user-profile-profile-section.messages';
 import { userProfileWeb3WalletsMessages } from '../features/user-profile/user-profile-web3-wallets-section/user-profile-web3-wallets.messages';
 import { errorMessages } from './errors.messages';
 import { roleMessages } from './roles.messages';
 
 export const mosaicMessages = {
-  apiKeysTable: apiKeysTableMessages,
-  errors: errorMessages,
-  roles: roleMessages,
-  form: formMessages,
-  membersTableTab: membersTableTabMessages,
-  invitationsTableTab: invitationsTableTabMessages,
-  requestsTableTab: requestsTableTabMessages,
-  organizationProfile: organizationProfileMessages,
+  userButton: userButtonMessages,
   organizationSwitcher: organizationSwitcherMessages,
-  organizationProfileDangerSection: organizationProfileDangerSectionMessages,
-  organizationProfileProfileSection: organizationProfileProfileSectionMessages,
-  organizationProfileInviteMembers: organizationProfileInviteMembersMessages,
-  profile: profileMessages,
+  userProfile: {
+    ...userProfileMessages,
+    profile: userProfileProfileSectionMessages,
+    contact: userProfileContactMessages,
+    email: { ...userProfileEmailSectionMessages, addDialog: userProfileAddEmailMessages },
+    phone: { ...userProfilePhoneSectionMessages, addDialog: userProfileAddPhoneMessages },
+    connectedAccounts: userProfileConnectedAccountsMessages,
+    enterpriseAccounts: userProfileEnterpriseAccountsMessages,
+    web3Wallets: userProfileWeb3WalletsMessages,
+    password: userProfilePasswordSectionMessages,
+    passkeys: userProfilePasskeysMessages,
+    mfa: {
+      ...userProfileMfaMessages,
+      addSms: userProfileAddSmsMessages,
+      addAuthenticator: userProfileAddAuthenticatorMessages,
+      authenticatorSetup: userProfileAuthenticatorSetupMessages,
+      backupCodes: userProfileBackupCodesMessages,
+    },
+    activeDevices: userProfileActiveDevicesMessages,
+    danger: userProfileDangerSectionMessages,
+  },
+  organizationProfile: {
+    ...organizationProfileMessages,
+    profile: organizationProfileProfileSectionMessages,
+    members: {
+      list: membersTableTabMessages,
+      invitations: invitationsTableTabMessages,
+      requests: requestsTableTabMessages,
+      invite: organizationProfileInviteMembersMessages,
+    },
+    danger: organizationProfileDangerSectionMessages,
+  },
+  apiKeys: apiKeysTableMessages,
   reverification: reverificationMessages,
-  userButton: userButtonMessages,
-  userProfile: userProfileMessages,
-  userProfileActiveDevices: userProfileActiveDevicesMessages,
-  userProfileAddEmail: userProfileAddEmailMessages,
-  userProfileAddPhone: userProfileAddPhoneMessages,
-  userProfileAddAuthenticator: userProfileAddAuthenticatorMessages,
-  userProfileAddSms: userProfileAddSmsMessages,
-  userProfileAuthenticatorSetup: userProfileAuthenticatorSetupMessages,
-  userProfileBackupCodes: userProfileBackupCodesMessages,
-  userProfileConnectedAccounts: userProfileConnectedAccountsMessages,
-  userProfileContact: userProfileContactMessages,
-  userProfileDangerSection: userProfileDangerSectionMessages,
-  userProfileEnterpriseAccountsSection: userProfileEnterpriseAccountsMessages,
-  userProfileMfa: userProfileMfaMessages,
-  userProfilePasskeys: userProfilePasskeysMessages,
-  userProfilePasswordSection: userProfilePasswordSectionMessages,
-  userProfileProfileSection: userProfileProfileSectionMessages,
-  userProfileWeb3Wallets: userProfileWeb3WalletsMessages,
+  profile: profileMessages,
+  form: formMessages,
+  errors: errorMessages,
+  roles: roleMessages,
 };
 
 export type MosaicMessages = typeof mosaicMessages;
diff --git a/packages/swingset/src/stories/fixtures/api-keys-table.tsx b/packages/swingset/src/stories/fixtures/api-keys-table.tsx
index 409f5156fa7..beec2b19415 100644
--- a/packages/swingset/src/stories/fixtures/api-keys-table.tsx
+++ b/packages/swingset/src/stories/fixtures/api-keys-table.tsx
@@ -74,7 +74,7 @@ export function useAPIKeysTableFixture({
   showDescription?: boolean;
 } = {}): APIKeysTableViewProps {
   const locale = useLocale();
-  const messages = resolveAPIKeysTableMessages(useMessages('apiKeysTable'), subjectKind);
+  const messages = resolveAPIKeysTableMessages(useMessages('apiKeys'), subjectKind);
   const seed = useChaosFixture(initialKeys, items =>
     chaosRows(items).map((key, index) => ({ ...key, name: chaosPick(chaosAPIKeyNames, index) })),
   );
diff --git a/packages/swingset/src/stories/fixtures/organization-profile-invite-members.ts b/packages/swingset/src/stories/fixtures/organization-profile-invite-members.ts
index 081cee9dcff..a8647d14662 100644
--- a/packages/swingset/src/stories/fixtures/organization-profile-invite-members.ts
+++ b/packages/swingset/src/stories/fixtures/organization-profile-invite-members.ts
@@ -18,7 +18,7 @@ export function useInviteMembersFixture(): {
   onInvite: (event: MouseEvent<HTMLButtonElement>) => void;
   inviteDialog: OrganizationProfileInviteMembersDialogProps;
 } {
-  const m = useMessages('organizationProfileInviteMembers');
+  const m = useMessages('organizationProfile').members.invite;
   const locale = useLocale();
   const roles = useChaosFixture(exampleRoles, items => items.map((role, index) => ({ ...role, ...chaosRole(index) })));
   const toast = useToastManager();
diff --git a/packages/swingset/src/stories/fixtures/user-profile-edit-password.tsx b/packages/swingset/src/stories/fixtures/user-profile-edit-password.tsx
index c4344428ccc..5440b810f52 100644
--- a/packages/swingset/src/stories/fixtures/user-profile-edit-password.tsx
+++ b/packages/swingset/src/stories/fixtures/user-profile-edit-password.tsx
@@ -24,7 +24,7 @@ export function useUserProfileEditPasswordFixture({
   latency = 800,
   failWith,
 }: UserProfileEditPasswordFixtureOptions = {}) {
-  const m = useMessages('userProfilePasswordSection');
+  const m = useMessages('userProfile').password;
   const [hasPassword, setHasPassword] = useState(initialHasPassword);
   const [hasFailed, setHasFailed] = useState(false);
   const policy: UserProfilePasswordPolicy = hasPassword
diff --git a/packages/swingset/src/stories/fixtures/user-profile-mfa-example.test.tsx b/packages/swingset/src/stories/fixtures/user-profile-mfa-example.test.tsx
index 43d4b1a753e..9a0f1e9ef71 100644
--- a/packages/swingset/src/stories/fixtures/user-profile-mfa-example.test.tsx
+++ b/packages/swingset/src/stories/fixtures/user-profile-mfa-example.test.tsx
@@ -43,7 +43,9 @@ describe('Profile MFA flows', () => {
     'returns from %s to the method picker without closing the dialog',
     async method => {
       const user = userEvent.setup();
-      render(<ProfileExample localization={{ messages: { userProfileMfa: { addLabel: 'Add a second factor' } } }} />);
+      render(
+        <ProfileExample localization={{ messages: { userProfile: { mfa: { addLabel: 'Add a second factor' } } } }} />,
+      );
       const add = screen.getByRole('button', { name: 'Add a second factor' });
       await user.click(add);
       const dialog = screen.getByRole('dialog', { name: 'Add 2-step verification' });
diff --git a/packages/swingset/src/stories/fixtures/user-profile-profile.tsx b/packages/swingset/src/stories/fixtures/user-profile-profile.tsx
index 7546181de9e..4069d2f2a39 100644
--- a/packages/swingset/src/stories/fixtures/user-profile-profile.tsx
+++ b/packages/swingset/src/stories/fixtures/user-profile-profile.tsx
@@ -39,7 +39,7 @@ export function useUserProfileProfileFixture({
   nameFailWith,
   usernameFailWith,
 }: UserProfileProfileFixtureOptions = {}): UserProfileProfileSectionViewProps {
-  const m = useMessages('userProfileProfileSection');
+  const m = useMessages('userProfile').profile;
   const seed = useChaosFixture({ firstName: initialFirstName, lastName: initialLastName }, () => chaosPerson(0));
   const [value, setValue] = useState<UserProfileEditNameValue>(seed);
   const usernameSeed = useChaosFixture(initialUsername, () => chaosUsername(0));
diff --git a/packages/swingset/src/stories/localization.mdx b/packages/swingset/src/stories/localization.mdx
index c7506aa97cb..81f512ea2c3 100644
--- a/packages/swingset/src/stories/localization.mdx
+++ b/packages/swingset/src/stories/localization.mdx
@@ -90,8 +90,12 @@ is left unused, and a placeholder the values do not cover is rendered literally.
       "members": { "one": "{count} miembro", "other": "{count} miembros" }
     }
   },
-  "userProfileAddEmail": {
-    "link": { "resendCountdown": "¿No recibiste el enlace? Reenviar ({seconds})" }
+  "userProfile": {
+    "email": {
+      "addDialog": {
+        "link": { "resendCountdown": "¿No recibiste el enlace? Reenviar ({seconds})" }
+      }
+    }
   }
 }
 ```
diff --git a/packages/swingset/src/stories/localization.stories.tsx b/packages/swingset/src/stories/localization.stories.tsx
index 1b025e1aa12..bd09e7498e4 100644
--- a/packages/swingset/src/stories/localization.stories.tsx
+++ b/packages/swingset/src/stories/localization.stories.tsx
@@ -129,7 +129,7 @@ function Rows({ rows }: { rows: Array<[string, ReactNode]> }) {
 // helper its placeholders call for.
 function Strings() {
   const m = useMessages('userButton');
-  const link = useMessages('userProfileAddEmail');
+  const link = useMessages('userProfile').email.addDialog;
   const locale = useLocale();
   return (
     <Rows